update NSPR to 4.24 and keep NSPR Bug 1586070 and win64 patch intact.

This commit is contained in:
Roy Tam 2020-01-03 13:34:04 +08:00
commit 0b9855b841
487 changed files with 42933 additions and 48679 deletions

View file

@ -11,10 +11,10 @@
**
** Modification History:
** 14-May-97 AGarcia- Converted the test to accomodate the debug_mode flag.
** The debug mode will print all of the printfs associated with this test.
** The regress mode will be the default mode. Since the regress tool limits
** The debug mode will print all of the printfs associated with this test.
** The regress mode will be the default mode. Since the regress tool limits
** the output to a one line status:PASS or FAIL,all of the printf statements
** have been handled with an if (debug_mode) statement.
** have been handled with an if (debug_mode) statement.
***********************************************************************/
/***********************************************************************
** Includes
@ -40,11 +40,11 @@ typedef struct threadInfo {
PRIntn failed_already = 0;
PRIntn debug_mode = 0;
#define LOCAL_SCOPE_STRING "LOCAL scope"
#define GLOBAL_SCOPE_STRING "GLOBAL scope"
#define GLOBAL_BOUND_SCOPE_STRING "GLOBAL_BOUND scope"
#define LOCAL_SCOPE_STRING "LOCAL scope"
#define GLOBAL_SCOPE_STRING "GLOBAL scope"
#define GLOBAL_BOUND_SCOPE_STRING "GLOBAL_BOUND scope"
void
void
thread_main(void *_info)
{
threadInfo *info = (threadInfo *)_info;
@ -53,94 +53,100 @@ thread_main(void *_info)
PRFileDesc *listenSock = NULL;
PRFileDesc *clientSock;
PRStatus rv;
PRThreadScope tscope;
char *scope_str;
PRThreadScope tscope;
char *scope_str;
if (debug_mode)
printf("thread %d is alive\n", info->id);
tscope = PR_GetThreadScope(PR_GetCurrentThread());
switch(tscope) {
case PR_LOCAL_THREAD:
scope_str = LOCAL_SCOPE_STRING;
break;
case PR_GLOBAL_THREAD:
scope_str = GLOBAL_SCOPE_STRING;
break;
case PR_GLOBAL_BOUND_THREAD:
scope_str = GLOBAL_BOUND_SCOPE_STRING;
break;
default:
PR_NOT_REACHED("Invalid thread scope");
break;
}
printf("thread id %d, scope %s\n", info->id, scope_str);
if (debug_mode) {
printf("thread %d is alive\n", info->id);
}
tscope = PR_GetThreadScope(PR_GetCurrentThread());
switch(tscope) {
case PR_LOCAL_THREAD:
scope_str = LOCAL_SCOPE_STRING;
break;
case PR_GLOBAL_THREAD:
scope_str = GLOBAL_SCOPE_STRING;
break;
case PR_GLOBAL_BOUND_THREAD:
scope_str = GLOBAL_BOUND_SCOPE_STRING;
break;
default:
PR_NOT_REACHED("Invalid thread scope");
break;
}
printf("thread id %d, scope %s\n", info->id, scope_str);
listenSock = PR_NewTCPSocket();
if (!listenSock) {
if (debug_mode)
printf("unable to create listen socket\n");
failed_already=1;
if (debug_mode) {
printf("unable to create listen socket\n");
}
failed_already=1;
goto dead;
}
listenAddr.inet.family = PR_AF_INET;
listenAddr.inet.port = PR_htons(BASE_PORT + info->id);
listenAddr.inet.ip = PR_htonl(PR_INADDR_ANY);
rv = PR_Bind(listenSock, &listenAddr);
if (rv == PR_FAILURE) {
if (debug_mode)
printf("unable to bind\n");
failed_already=1;
if (debug_mode) {
printf("unable to bind\n");
}
failed_already=1;
goto dead;
}
rv = PR_Listen(listenSock, 4);
if (rv == PR_FAILURE) {
if (debug_mode)
printf("unable to listen\n");
failed_already=1;
if (debug_mode) {
printf("unable to listen\n");
}
failed_already=1;
goto dead;
}
if (debug_mode)
printf("thread %d going into accept for %d seconds\n",
info->id, info->accept_timeout + info->id);
if (debug_mode)
printf("thread %d going into accept for %d seconds\n",
info->id, info->accept_timeout + info->id);
clientSock = PR_Accept(listenSock, &clientAddr, PR_SecondsToInterval(info->accept_timeout +info->id));
if (clientSock == NULL) {
if (PR_GetError() == PR_IO_TIMEOUT_ERROR) {
if (debug_mode) {
printf("PR_Accept() timeout worked!\n");
printf("TEST PASSED! PR_Accept() returned error %d\n",
PR_IO_TIMEOUT_ERROR);
}
} else {
if (debug_mode)
printf("TEST FAILED! PR_Accept() returned error %d\n",
PR_GetError());
failed_already=1;
}
if (debug_mode) {
printf("PR_Accept() timeout worked!\n");
printf("TEST PASSED! PR_Accept() returned error %d\n",
PR_IO_TIMEOUT_ERROR);
}
} else {
if (debug_mode)
printf("TEST FAILED! PR_Accept() returned error %d\n",
PR_GetError());
failed_already=1;
}
} else {
if (debug_mode)
printf ("TEST FAILED! PR_Accept() succeeded?\n");
failed_already=1;
PR_Close(clientSock);
if (debug_mode) {
printf ("TEST FAILED! PR_Accept() succeeded?\n");
}
failed_already=1;
PR_Close(clientSock);
}
dead:
if (listenSock) {
PR_Close(listenSock);
PR_Close(listenSock);
}
PR_Lock(info->dead_lock);
(*info->alive)--;
PR_NotifyCondVar(info->dead_cv);
PR_Unlock(info->dead_lock);
if (debug_mode)
printf("thread %d is dead\n", info->id);
if (debug_mode) {
printf("thread %d is dead\n", info->id);
}
PR_Free(info);
}
@ -154,13 +160,14 @@ thread_test(PRThreadScope scope, PRInt32 num_threads)
PRCondVar *dead_cv;
PRInt32 alive;
if (debug_mode)
printf("IO Timeout test started with %d threads\n", num_threads);
if (debug_mode) {
printf("IO Timeout test started with %d threads\n", num_threads);
}
dead_lock = PR_NewLock();
dead_cv = PR_NewCondVar(dead_lock);
alive = num_threads;
for (index = 0; index < num_threads; index++) {
threadInfo *info = (threadInfo *)PR_Malloc(sizeof(threadInfo));
@ -169,7 +176,7 @@ thread_test(PRThreadScope scope, PRInt32 num_threads)
info->dead_cv = dead_cv;
info->alive = &alive;
info->accept_timeout = DEFAULT_ACCEPT_TIMEOUT;
thr = PR_CreateThread( PR_USER_THREAD,
thread_main,
(void *)info,
@ -179,9 +186,9 @@ thread_test(PRThreadScope scope, PRInt32 num_threads)
0);
if (!thr) {
printf("Failed to create thread, error = %d(%d)\n",
PR_GetError(), PR_GetOSError());
failed_already=1;
printf("Failed to create thread, error = %d(%d)\n",
PR_GetError(), PR_GetOSError());
failed_already=1;
PR_Lock(dead_lock);
alive--;
@ -191,8 +198,9 @@ thread_test(PRThreadScope scope, PRInt32 num_threads)
PR_Lock(dead_lock);
while(alive) {
if (debug_mode)
printf("main loop awake; alive = %d\n", alive);
if (debug_mode) {
printf("main loop awake; alive = %d\n", alive);
}
PR_WaitCondVar(dead_cv, PR_INTERVAL_NO_TIMEOUT);
}
PR_Unlock(dead_lock);
@ -205,35 +213,38 @@ int main(int argc, char **argv)
{
PRInt32 num_threads = 0;
/* The command line argument: -d is used to determine if the test is being run
in debug mode. The regress tool requires only one line output:PASS or FAIL.
All of the printfs associated with this test has been handled with a if (debug_mode)
test.
Usage: test_name [-d] [-t <threads>]
*/
PLOptStatus os;
PLOptState *opt = PL_CreateOptState(argc, argv, "dt:");
while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
/* The command line argument: -d is used to determine if the test is being run
in debug mode. The regress tool requires only one line output:PASS or FAIL.
All of the printfs associated with this test has been handled with a if (debug_mode)
test.
Usage: test_name [-d] [-t <threads>]
*/
PLOptStatus os;
PLOptState *opt = PL_CreateOptState(argc, argv, "dt:");
while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
{
if (PL_OPT_BAD == os) continue;
if (PL_OPT_BAD == os) {
continue;
}
switch (opt->option)
{
case 'd': /* debug mode */
debug_mode = 1;
break;
case 't': /* threads to involve */
num_threads = atoi(opt->value);
break;
default:
break;
case 'd': /* debug mode */
debug_mode = 1;
break;
case 't': /* threads to involve */
num_threads = atoi(opt->value);
break;
default:
break;
}
}
PL_DestroyOptState(opt);
PL_DestroyOptState(opt);
/* main test */
if (0 == num_threads)
/* main test */
if (0 == num_threads) {
num_threads = NUM_THREADS;
}
PR_Init(PR_USER_THREAD, PR_PRIORITY_LOW, 0);
PR_STDIO_INIT();
@ -249,8 +260,10 @@ int main(int argc, char **argv)
PR_Cleanup();
if (failed_already)
return 1;
else
return 0;
if (failed_already) {
return 1;
}
else {
return 0;
}
}