code review 4433065: runtime: correct out of memory error

runtime: correct out of memory error

Fixes issue 1511.

[rsc, 2011-04-23 14:40:15]

Hello golang-dev (cc: golang-dev@googlegroups.com),

I'd like you to review this change to
https://go.googlecode.com/hg/

[iant2, 2011-04-23 19:05:35]

LGTM

rsc@golang.org writes:

> Reviewers: golang-dev_googlegroups.com,
>
> Message:
> Hello golang-dev (cc: golang-dev@googlegroups.com),
>
> I'd like you to review this change to
> https://go.googlecode.com/hg/
>
>
> Description:
> runtime: correct out of memory error
>
> Fixes issue 1511.
>
> Please review this at http://codereview.appspot.com/4433065/
>
> Affected files:
>   M src/pkg/runtime/darwin/mem.c
>   M src/pkg/runtime/freebsd/mem.c
>   M src/pkg/runtime/linux/mem.c
>
>
> Index: src/pkg/runtime/darwin/mem.c
> ===================================================================
> --- a/src/pkg/runtime/darwin/mem.c
> +++ b/src/pkg/runtime/darwin/mem.c
> @@ -36,6 +36,11 @@
>  	return runtime·mmap(v, n, PROT_NONE, MAP_ANON|MAP_PRIVATE, -1, 0);
>  }
>
> +enum
> +{
> +	ENOMEM = 12,
> +};
> +
>  void
>  runtime·SysMap(void *v, uintptr n)
>  {
> @@ -43,6 +48,8 @@
>  	
>  	mstats.sys += n;
>  	p = runtime·mmap(v, n, PROT_READ|PROT_WRITE|PROT_EXEC,
> MAP_ANON|MAP_FIXED|
> MAP_PRIVATE, -1, 0);
> +	if(p == (void*)-ENOMEM)
> +		runtime·throw("runtime: out of memory");
>  	if(p != v)
>  		runtime·throw("runtime: cannot map pages in arena address space");
>  }
> Index: src/pkg/runtime/freebsd/mem.c
> ===================================================================
> --- a/src/pkg/runtime/freebsd/mem.c
> +++ b/src/pkg/runtime/freebsd/mem.c
> @@ -42,6 +42,11 @@
>  	return runtime·mmap(v, n, PROT_NONE, MAP_ANON|MAP_PRIVATE, -1, 0);
>  }
>
> +enum
> +{
> +	ENOMEM = 12,
> +};
> +
>  void
>  runtime·SysMap(void *v, uintptr n)
>  {
> @@ -52,6 +57,8 @@
>  	// On 64-bit, we don't actually have v reserved, so tread carefully.
>  	if(sizeof(void*) == 8) {
>  		p = runtime·mmap(v, n, PROT_READ|PROT_WRITE|PROT_EXEC,
> MAP_ANON|
> MAP_PRIVATE, -1, 0);
> +		if(p == (void*)-ENOMEM)
> +			runtime·throw("runtime: out of memory");
>  		if(p != v) {
>  			runtime·printf("runtime: address space conflict: map(%p) = %p\n", v, p);
>  			runtime·throw("runtime: address space conflict");
> @@ -60,6 +67,8 @@
>  	}
>
>  	p = runtime·mmap(v, n, PROT_READ|PROT_WRITE|PROT_EXEC,
> MAP_ANON|MAP_FIXED|
> MAP_PRIVATE, -1, 0);
> +	if(p == (void*)-ENOMEM)
> +		runtime·throw("runtime: out of memory");
>  	if(p != v)
>  		runtime·throw("runtime: cannot map pages in arena address space");
>  }
> Index: src/pkg/runtime/linux/mem.c
> ===================================================================
> --- a/src/pkg/runtime/linux/mem.c
> +++ b/src/pkg/runtime/linux/mem.c
> @@ -48,6 +48,11 @@
>  	return runtime·mmap(v, n, PROT_NONE, MAP_ANON|MAP_PRIVATE, -1, 0);
>  }
>
> +enum
> +{
> +	ENOMEM = 12,
> +};
> +
>  void
>  runtime·SysMap(void *v, uintptr n)
>  {
> @@ -66,6 +71,8 @@
>  	}
>
>  	p = runtime·mmap(v, n, PROT_READ|PROT_WRITE|PROT_EXEC,
> MAP_ANON|MAP_FIXED|
> MAP_PRIVATE, -1, 0);
> +	if(p == (void*)-ENOMEM)
> +		runtime·throw("runtime: out of memory");
>  	if(p != v)
>  		runtime·throw("runtime: cannot map pages in arena address space");
>  }

[rsc, 2011-04-25 16:13:55]

*** Submitted as http://code.google.com/p/go/source/detail?r=74ed6afff840 ***

runtime: correct out of memory error

Fixes issue 1511.

R=golang-dev, iant2
CC=golang-dev
http://codereview.appspot.com/4433065