roytam1/palemoon27
1
0
Fork 0
mirror of https://github.com/roytam1/palemoon27.git synced 2026-05-26 05:11:03 +00:00
Code Issues Projects Releases Wiki Activity

import changes from UXP:

Browse Source 
- [NSPR] Lock access to PRCallOnceType members in PR_CallOnce* for thread safety. (361743b22)
This commit is contained in:
roytam1
2021-07-16 10:38:12 +08:00
parent 7a02eeddb8
commit 619c191e44
1 changed files with 32 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nsprpub/pr/src/misc/prinit.c
+32 -14
View File
@@ -771,10 +771,15 @@ PR_IMPLEMENT(PRStatus) PR_CallOnce(
_PR_ImplicitInitialization();
}
if (!once->initialized) {
PR_Lock(mod_init.ml);
PRIntn initialized = once->initialized;
PRStatus status = once->status;
PR_Unlock(mod_init.ml);
if (!initialized) {
if (PR_ATOMIC_SET(&once->inProgress, 1) == 0) {
once->status = (*func)();
status = (*func)();
PR_Lock(mod_init.ml);
once->status = status;
once->initialized = 1;
PR_NotifyAllCondVar(mod_init.cv);
PR_Unlock(mod_init.ml);
@@ -783,14 +788,18 @@ PR_IMPLEMENT(PRStatus) PR_CallOnce(
while (!once->initialized) {
PR_WaitCondVar(mod_init.cv, PR_INTERVAL_NO_TIMEOUT);
}
status = once->status;
PR_Unlock(mod_init.ml);
if (PR_SUCCESS != status) {
PR_SetError(PR_CALL_ONCE_ERROR, 0);
}
}
} else {
if (PR_SUCCESS != once->status) {
PR_SetError(PR_CALL_ONCE_ERROR, 0);
}
return status;
}
return once->status;
if (PR_SUCCESS != status) {
PR_SetError(PR_CALL_ONCE_ERROR, 0);
}
return status;
}
PR_IMPLEMENT(PRStatus) PR_CallOnceWithArg(
@@ -802,10 +811,15 @@ PR_IMPLEMENT(PRStatus) PR_CallOnceWithArg(
_PR_ImplicitInitialization();
}
if (!once->initialized) {
PR_Lock(mod_init.ml);
PRIntn initialized = once->initialized;
PRStatus status = once->status;
PR_Unlock(mod_init.ml);
if (!initialized) {
if (PR_ATOMIC_SET(&once->inProgress, 1) == 0) {
once->status = (*func)(arg);
status = (*func)(arg);
PR_Lock(mod_init.ml);
once->status = status;
once->initialized = 1;
PR_NotifyAllCondVar(mod_init.cv);
PR_Unlock(mod_init.ml);
@@ -814,14 +828,18 @@ PR_IMPLEMENT(PRStatus) PR_CallOnceWithArg(
while (!once->initialized) {
PR_WaitCondVar(mod_init.cv, PR_INTERVAL_NO_TIMEOUT);
}
status = once->status;
PR_Unlock(mod_init.ml);
if (PR_SUCCESS != status) {
PR_SetError(PR_CALL_ONCE_ERROR, 0);
}
}
} else {
if (PR_SUCCESS != once->status) {
PR_SetError(PR_CALL_ONCE_ERROR, 0);
}
return status;
}
return once->status;
if (PR_SUCCESS != status) {
PR_SetError(PR_CALL_ONCE_ERROR, 0);
}
return status;
}
PRBool _PR_Obsolete(const char *obsolete, const char *preferred)