Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Branch landing: Multithreading libmocha in mozilla.

Browse Source 
- Add JS_BeginRequest() and JS_EndRequest() to make sure contexts don't
   stomp on each other.


git-svn-id: svn://10.0.0.236/trunk@11085 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mlm%netscape.com
1998-09-25 22:07:48 +00:00
parent 48c90e8167
commit e8755f7471
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mozilla/modules/libhook/src/hk_hook.c
View File

@@ -70,11 +70,14 @@ hk_IsUnknownTagHook(void *extra)
return 0;
}
JS_BeginRequest(j_context);
if ((JS_GetProperty(j_context, HookObject, hook_func, &tmp_val))&&
(JS_TypeOfValue(j_context, tmp_val) == JSTYPE_FUNCTION))
{
JS_EndRequest(j_context);
return 1;
}
JS_EndRequest(j_context);
return 0;
}
@@ -128,12 +131,14 @@ HK_CallHook(int32 hook_id, void *extra, int32 window_id,
return 0;
}
JS_BeginRequest(j_context);
/*
* Check that there is a function to call.
*/
if ((!JS_GetProperty(j_context, HookObject, hook_func, &tmp_val))||
(JS_TypeOfValue(j_context, tmp_val) != JSTYPE_FUNCTION))
{
JS_EndRequest(j_context);
return 0;
}
@@ -143,6 +148,7 @@ HK_CallHook(int32 hook_id, void *extra, int32 window_id,
str = JS_NewStringCopyZ(j_context, hook_str);
if (str == NULL)
{
JS_EndRequest(j_context);
return 0;
}
argv[0] = STRING_TO_JSVAL(str);
@@ -150,6 +156,7 @@ HK_CallHook(int32 hook_id, void *extra, int32 window_id,
if (!JS_CallFunctionName(j_context, HookObject, hook_func, 2, argv,
&tmp_val))
{
JS_EndRequest(j_context);
return 0;
}
@@ -162,16 +169,19 @@ HK_CallHook(int32 hook_id, void *extra, int32 window_id,
str = JS_ValueToString(j_context, tmp_val);
if (str == NULL)
{
JS_EndRequest(j_context);
return 0;
}
result_str = JS_GetStringBytes(str);
return_str = XP_STRDUP(result_str);
if (return_str == NULL)
{
JS_EndRequest(j_context);
return 0;
}
*hook_ret = return_str;
}
JS_EndRequest(j_context);
return 1;
}

2
mozilla/modules/libhook/src/hk_init.c
View File

@@ -363,11 +363,13 @@ HK_Init(void)
return 0;
}
JS_BeginRequest(j_context);
hook_obj = JS_DefineObject(j_context, j_object,
"HookConfig",
&autoconf_class,
NULL,
JSPROP_ENUMERATE|JSPROP_READONLY|JSPROP_PERMANENT);
JS_EndRequest(j_context);
}
if (hook_obj == NULL)
{