OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

libgo: Adjust deadlock avoidance. 

From-SVN: r169120
This commit is contained in:
Ian Lance Taylor 2011-01-22 02:15:01 +00:00
parent 2e8e58aa8a
commit 039868965d
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libgo/runtime/go-go.c
View File

@ -297,6 +297,15 @@ gc_stop_handler (int sig __attribute__ ((unused)))
{
struct M *pm = m;
if (__sync_bool_compare_and_swap (&pm->holds_finlock, 1, 1))
{
/* We can't interrupt the thread while it holds the finalizer
lock. Otherwise we can get into a deadlock when mark calls
runtime_walkfintab. */
__sync_bool_compare_and_swap (&pm->gcing_for_finlock, 0, 1);
return;
}
if (__sync_bool_compare_and_swap (&pm->mallocing, 1, 1))
{
/* m->mallocing was already non-zero. We can't interrupt the
@ -315,15 +324,6 @@ gc_stop_handler (int sig __attribute__ ((unused)))
return;
}
if (__sync_bool_compare_and_swap (&pm->holds_finlock, 1, 1))
{
/* Similarly, we can't interrupt the thread while it holds the
finalizer lock. Otherwise we can get into a deadlock when
mark calls runtime_walkfintab. */
__sync_bool_compare_and_swap (&pm->gcing_for_finlock, 0, 1);
return;
}
stop_for_gc ();
}