wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Avoid a lock/unlock pair for each call to |calltree|. (Bug 549561) r=bsmedberg a2.0=tests

Browse Source
This commit is contained in:
L. David Baron 2010-08-19 09:37:59 -04:00
parent 8bc3dafe3d
commit 301610bb9d
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tools/trace-malloc/lib/nsTraceMalloc.c
View File

@ -606,6 +606,10 @@ static PLHashTable *filenames = NULL;
/* Table mapping method names to logged 'N' record serial numbers. */
static PLHashTable *methods = NULL;
/*
* Presumes that its caller is holding tmlock, but may temporarily exit
* the lock.
*/
static callsite *
calltree(void **stack, size_t num_stack_entries, tm_thread *t)
{
@ -624,13 +628,6 @@ calltree(void **stack, size_t num_stack_entries, tm_thread *t)
nsCodeAddressDetails details;
nsresult rv;
/*
* FIXME bug 391749: We should really lock only the minimum amount
* that we need to in this function, because it makes some calls
* that could lock in the system's shared library loader.
*/
TM_ENTER_LOCK(t);
maxstack = (num_stack_entries > tmstats.calltree_maxstack);
if (maxstack) {
/* these two are the same, although that used to be less clear */
@ -893,11 +890,9 @@ calltree(void **stack, size_t num_stack_entries, tm_thread *t)
if (maxstack)
calltree_maxstack_top = site;
TM_EXIT_LOCK(t);
return site;
fail:
TM_EXIT_LOCK(t);
return NULL;
}
@ -977,9 +972,10 @@ backtrace(tm_thread *t, int skip, int *immediate_abort)
PR_ASSERT(info->entries * 2 == new_stack_buffer_size); /* same stack */
}
TM_ENTER_LOCK(t);
site = calltree(info->buffer, info->entries, t);
TM_ENTER_LOCK(t);
tmstats.backtrace_calls++;
if (!site) {
tmstats.backtrace_failures++;