Issue 462043: code review 462043: runtime: lock finalizer table accesses

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

Issue 462043: code review 462043: runtime: lock finalizer table accesses (Closed)

Can't Edit
Can't Publish+Mail
Start Review

Created:
14 years, 9 months ago by rsc

Modified:
14 years, 9 months ago

Reviewers:

CC:
r, golang-dev

Visibility:
Public.

Description

runtime: lock finalizer table accesses

Patch Set 1 #

Patch Set 2 : code review 462043: runtime: lock finalizer table accesses #

Patch Set 3 : code review 462043: runtime: lock finalizer table accesses #

Created: 14 years, 9 months ago

Download [raw] [tar.bz2]

		Unified diffs	Side-by-side diffs	Delta from patch set	Stats (+18 lines, -4 lines)			Patch
	M	src/pkg/runtime/mfinal.c	View		4 chunks	+18 lines, -4 lines	0 comments	Download

Messages

Total messages: 3

Expand All Messages | Collapse All Messages

rsc

Hello r (cc: golang-dev@googlegroups.com), I'd like you to review this change.

14 years, 9 months ago (2010-03-13 01:49:00 UTC) #1

LGTM On Mar 12, 2010, at 5:49 PM, rsc@golang.org wrote: > Reviewers: r, > > ...

14 years, 9 months ago (2010-03-13 01:53:22 UTC) #2

LGTM

On Mar 12, 2010, at 5:49 PM, rsc@golang.org wrote:

> Reviewers: r,
>
> Message:
> Hello r (cc: golang-dev@googlegroups.com),
>
> I'd like you to review this change.
>
>
> Description:
> runtime: lock finalizer table accesses
>
> Please review this at http://codereview.appspot.com/462043/show
>
> Affected files:
>  M src/pkg/runtime/mfinal.c
>
>
> Index: src/pkg/runtime/mfinal.c
> ===================================================================
> --- a/src/pkg/runtime/mfinal.c
> +++ b/src/pkg/runtime/mfinal.c
> @@ -5,6 +5,8 @@
> #include "runtime.h"
> #include "malloc.h"
>
> +Lock finlock;
> +
> // Finalizer hash table.  Direct hash, linear scan, at most 3/4 full.
> // Table size is power of 3 so that hash can be key % max.
> // Key[i] == (void*)-1 denotes free but formerly occupied entry
> @@ -97,18 +99,24 @@
> 	uint32 *ref;
> 	byte *base;
>
> -	if(!mlookup(p, &base, nil, nil, &ref) || p != base)
> +	lock(&finlock);
> +	if(!mlookup(p, &base, nil, nil, &ref) || p != base) {
> +		unlock(&finlock);
> 		throw("addfinalizer on invalid pointer");
> +	}
> 	if(f == nil) {
> 		if(*ref & RefHasFinalizer) {
> -			getfinalizer(p, 1, nil);
> +			lookfintab(&fintab, p, 1, nil);
> 			*ref &= ~RefHasFinalizer;
> 		}
> +		unlock(&finlock);
> 		return;
> 	}
>
> -	if(*ref & RefHasFinalizer)
> +	if(*ref & RefHasFinalizer) {
> +		unlock(&finlock);
> 		throw("double finalizer");
> +	}
> 	*ref |= RefHasFinalizer;
>
> 	if(fintab.nkey >= fintab.max/2+fintab.max/4) {
> @@ -141,6 +149,7 @@
> 	}
>
> 	addfintab(&fintab, p, f, nret);
> +	unlock(&finlock);
> }
>
> // get finalizer; if del, delete finalizer.
> @@ -148,5 +157,10 @@
> void*
> getfinalizer(void *p, bool del, int32 *nret)
> {
> -	return lookfintab(&fintab, p, del, nret);
> +	void *f;
> +	
> +	lock(&finlock);
> +	f = lookfintab(&fintab, p, del, nret);
> +	unlock(&finlock);
> +	return f;
> }
>
>

rsc

14 years, 9 months ago (2010-03-16 03:29:20 UTC) #3

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

runtime: lock finalizer table accesses

R=r
CC=golang-dev
http://codereview.appspot.com/462043

Expand All Messages | Collapse All Messages