-
Notifications
You must be signed in to change notification settings - Fork 103
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Remove patch adding syscall.Dup2() for SunOS, software should be us…
…ing unix.Dup2() instead. https://github.com/joyent/pkgsrc/pull/492 * Improve handling of low-memory situations on Illumos. https://github.com/joyent/pkgsrc/pull/493
- Loading branch information
fhajny
committed
May 2, 2017
1 parent
e4a0f87
commit 88a30ff
Showing
4 changed files
with
29 additions
and
24 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
$NetBSD: patch-src_runtime_mem__bsd.go,v 1.1 2017/05/02 17:15:31 fhajny Exp $ | ||
|
||
Improve handling of low-memory situations on Illumos. | ||
https://github.com/joyent/pkgsrc/pull/493 | ||
|
||
--- src/runtime/mem_bsd.go.orig 2017-04-28 12:14:22.000000000 -0700 | ||
+++ src/runtime/mem_bsd.go 2017-04-28 12:14:31.000000000 -0700 | ||
@@ -76,7 +76,7 @@ | ||
flags |= _MAP_FIXED | ||
} | ||
p := mmap(v, n, _PROT_READ|_PROT_WRITE, flags, -1, 0) | ||
- if uintptr(p) == _ENOMEM { | ||
+ if uintptr(p) == _ENOMEM || (GOOS == "solaris" && uintptr(p) == _EAGAIN) { | ||
throw("runtime: out of memory") | ||
} | ||
if p != v { | ||
@@ -87,7 +87,7 @@ | ||
} | ||
|
||
p := mmap(v, n, _PROT_READ|_PROT_WRITE, _MAP_ANON|_MAP_FIXED|_MAP_PRIVATE, -1, 0) | ||
- if uintptr(p) == _ENOMEM { | ||
+ if uintptr(p) == _ENOMEM || (GOOS == "solaris" && uintptr(p) == _EAGAIN) { | ||
throw("runtime: out of memory") | ||
} | ||
if p != v { |
This file was deleted.
Oops, something went wrong.