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

@ -12,12 +12,12 @@
**
** 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.
** 04-June-97 AGarcia removed the Test_Result function. Regress tool has been updated to
** recognize the return code from tha main program.
** recognize the return code from tha main program.
***********************************************************************/
/***********************************************************************
@ -57,10 +57,10 @@ clientThreadFunc(void *arg)
PR_snprintf(buf, sizeof(buf), "%hu", addr.inet.port);
for (i = 0; i < 5; i++) {
sock = PR_NewTCPSocket();
sock = PR_NewTCPSocket();
PR_Connect(sock, &addr, PR_INTERVAL_NO_TIMEOUT);
PR_Write(sock, buf, sizeof(buf));
PR_Close(sock);
PR_Write(sock, buf, sizeof(buf));
PR_Close(sock);
}
}
@ -77,120 +77,124 @@ int main(int argc, char **argv)
PRInt32 retVal;
PRIntn i, j;
/* 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
*/
PLOptStatus os;
PLOptState *opt = PL_CreateOptState(argc, argv, "d:");
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
*/
PLOptStatus os;
PLOptState *opt = PL_CreateOptState(argc, argv, "d:");
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;
default:
break;
case 'd': /* debug mode */
debug_mode = 1;
break;
default:
break;
}
}
PL_DestroyOptState(opt);
PL_DestroyOptState(opt);
/* main test */
/* main test */
PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 0);
PR_STDIO_INIT();
if (debug_mode) {
printf("This program tests PR_Select with sockets. \n");
printf(" Normal operation are tested.\n\n");
}
printf("This program tests PR_Select with sockets. \n");
printf(" Normal operation are tested.\n\n");
}
/* Create two listening sockets */
if ((listenSock1 = PR_NewTCPSocket()) == NULL) {
fprintf(stderr, "Can't create a new TCP socket\n");
failed_already=1;
goto exit_now;
fprintf(stderr, "Can't create a new TCP socket\n");
failed_already=1;
goto exit_now;
}
addr.inet.family = PR_AF_INET;
addr.inet.ip = PR_htonl(PR_INADDR_ANY);
addr.inet.port = PR_htons(0);
if (PR_Bind(listenSock1, &addr) == PR_FAILURE) {
fprintf(stderr, "Can't bind socket\n");
failed_already=1;
goto exit_now;
fprintf(stderr, "Can't bind socket\n");
failed_already=1;
goto exit_now;
}
if (PR_GetSockName(listenSock1, &addr) == PR_FAILURE) {
fprintf(stderr, "PR_GetSockName failed\n");
failed_already=1;
goto exit_now;
fprintf(stderr, "PR_GetSockName failed\n");
failed_already=1;
goto exit_now;
}
listenPort1 = PR_ntohs(addr.inet.port);
if (PR_Listen(listenSock1, 5) == PR_FAILURE) {
fprintf(stderr, "Can't listen on a socket\n");
failed_already=1;
goto exit_now;
fprintf(stderr, "Can't listen on a socket\n");
failed_already=1;
goto exit_now;
}
if ((listenSock2 = PR_NewTCPSocket()) == NULL) {
fprintf(stderr, "Can't create a new TCP socket\n");
failed_already=1;
goto exit_now;
fprintf(stderr, "Can't create a new TCP socket\n");
failed_already=1;
goto exit_now;
}
addr.inet.family = PR_AF_INET;
addr.inet.ip = PR_htonl(PR_INADDR_ANY);
addr.inet.port = PR_htons(0);
if (PR_Bind(listenSock2, &addr) == PR_FAILURE) {
fprintf(stderr, "Can't bind socket\n");
failed_already=1;
goto exit_now;
fprintf(stderr, "Can't bind socket\n");
failed_already=1;
goto exit_now;
}
if (PR_GetSockName(listenSock2, &addr) == PR_FAILURE) {
fprintf(stderr, "PR_GetSockName failed\n");
failed_already=1;
goto exit_now;
fprintf(stderr, "PR_GetSockName failed\n");
failed_already=1;
goto exit_now;
}
listenPort2 = PR_ntohs(addr.inet.port);
if (PR_Listen(listenSock2, 5) == PR_FAILURE) {
fprintf(stderr, "Can't listen on a socket\n");
failed_already=1;
goto exit_now;
fprintf(stderr, "Can't listen on a socket\n");
failed_already=1;
goto exit_now;
}
PR_snprintf(buf, sizeof(buf),
"The server thread is listening on ports %hu and %hu\n\n",
listenPort1, listenPort2);
if (debug_mode) printf("%s", buf);
clientThread = PR_CreateThread(PR_USER_THREAD,
clientThreadFunc, (void *) listenPort1,
PR_PRIORITY_NORMAL, PR_LOCAL_THREAD,
PR_UNJOINABLE_THREAD, 0);
if (clientThread == NULL) {
fprintf(stderr, "can't create thread\n");
failed_already=1;
goto exit_now;
"The server thread is listening on ports %hu and %hu\n\n",
listenPort1, listenPort2);
if (debug_mode) {
printf("%s", buf);
}
clientThread = PR_CreateThread(PR_USER_THREAD,
clientThreadFunc, (void *) listenPort2,
PR_PRIORITY_NORMAL, PR_LOCAL_THREAD,
PR_UNJOINABLE_THREAD, 0);
clientThreadFunc, (void *) listenPort1,
PR_PRIORITY_NORMAL, PR_LOCAL_THREAD,
PR_UNJOINABLE_THREAD, 0);
if (clientThread == NULL) {
fprintf(stderr, "can't create thread\n");
failed_already=1;
goto exit_now;
fprintf(stderr, "can't create thread\n");
failed_already=1;
goto exit_now;
}
clientThread = PR_CreateThread(PR_USER_THREAD,
clientThreadFunc, (void *) listenPort2,
PR_PRIORITY_NORMAL, PR_LOCAL_THREAD,
PR_UNJOINABLE_THREAD, 0);
if (clientThread == NULL) {
fprintf(stderr, "can't create thread\n");
failed_already=1;
goto exit_now;
}
if (debug_mode) {
printf("Two client threads are created. Each of them will\n");
printf("send data to one of the two ports the server is listening on.\n");
printf("The data they send is the port number. Each of them send\n");
printf("the data five times, so you should see ten lines below,\n");
printf("interleaved in an arbitrary order.\n");
}
printf("Two client threads are created. Each of them will\n");
printf("send data to one of the two ports the server is listening on.\n");
printf("The data they send is the port number. Each of them send\n");
printf("the data five times, so you should see ten lines below,\n");
printf("interleaved in an arbitrary order.\n");
}
/* set up the fd array */
fds = fds0;
other_fds = fds1;
@ -205,80 +209,86 @@ failed_already=1;
/* 20 events total */
i = 0;
while (i < 20) {
PRFileDesc **tmp;
int nextIndex;
int nEvents = 0;
PRFileDesc **tmp;
int nextIndex;
int nEvents = 0;
retVal = PR_Select(0 /* unused */, &readFdSet, NULL, NULL,
PR_INTERVAL_NO_TIMEOUT);
PR_ASSERT(retVal != 0); /* no timeout */
if (retVal == -1) {
fprintf(stderr, "PR_Select failed (%d, %d)\n", PR_GetError(),
PR_GetOSError());
failed_already=1;
goto exit_now;
}
retVal = PR_Select(0 /* unused */, &readFdSet, NULL, NULL,
PR_INTERVAL_NO_TIMEOUT);
PR_ASSERT(retVal != 0); /* no timeout */
if (retVal == -1) {
fprintf(stderr, "PR_Select failed (%d, %d)\n", PR_GetError(),
PR_GetOSError());
failed_already=1;
goto exit_now;
}
nextIndex = 2;
/* the two listening sockets */
for (j = 0; j < 2; j++) {
other_fds[j] = fds[j];
if (PR_FD_ISSET(fds[j], &readFdSet)) {
PRFileDesc *sock;
nextIndex = 2;
/* the two listening sockets */
for (j = 0; j < 2; j++) {
other_fds[j] = fds[j];
if (PR_FD_ISSET(fds[j], &readFdSet)) {
PRFileDesc *sock;
nEvents++;
sock = PR_Accept(fds[j], NULL, PR_INTERVAL_NO_TIMEOUT);
if (sock == NULL) {
fprintf(stderr, "PR_Accept() failed\n");
failed_already=1;
goto exit_now;
}
other_fds[nextIndex] = sock;
PR_FD_SET(sock, &readFdSet);
nextIndex++;
}
PR_FD_SET(fds[j], &readFdSet);
}
nEvents++;
sock = PR_Accept(fds[j], NULL, PR_INTERVAL_NO_TIMEOUT);
if (sock == NULL) {
fprintf(stderr, "PR_Accept() failed\n");
failed_already=1;
goto exit_now;
}
other_fds[nextIndex] = sock;
PR_FD_SET(sock, &readFdSet);
nextIndex++;
}
PR_FD_SET(fds[j], &readFdSet);
}
for (j = 2; j < nfds; j++) {
if (PR_FD_ISSET(fds[j], &readFdSet)) {
PRInt32 nBytes;
for (j = 2; j < nfds; j++) {
if (PR_FD_ISSET(fds[j], &readFdSet)) {
PRInt32 nBytes;
PR_FD_CLR(fds[j], &readFdSet);
nEvents++;
nBytes = PR_Read(fds[j], buf, sizeof(buf));
if (nBytes == -1) {
fprintf(stderr, "PR_Read() failed\n");
failed_already=1;
goto exit_now;
}
/* Just to be safe */
buf[127] = '\0';
PR_Close(fds[j]);
if (debug_mode) printf("The server received \"%s\" from a client\n", buf);
} else {
PR_FD_SET(fds[j], &readFdSet);
other_fds[nextIndex] = fds[j];
nextIndex++;
}
}
PR_FD_CLR(fds[j], &readFdSet);
nEvents++;
nBytes = PR_Read(fds[j], buf, sizeof(buf));
if (nBytes == -1) {
fprintf(stderr, "PR_Read() failed\n");
failed_already=1;
goto exit_now;
}
/* Just to be safe */
buf[127] = '\0';
PR_Close(fds[j]);
if (debug_mode) {
printf("The server received \"%s\" from a client\n", buf);
}
} else {
PR_FD_SET(fds[j], &readFdSet);
other_fds[nextIndex] = fds[j];
nextIndex++;
}
}
PR_ASSERT(retVal == nEvents);
/* swap */
tmp = fds;
fds = other_fds;
other_fds = tmp;
nfds = nextIndex;
i += nEvents;
PR_ASSERT(retVal == nEvents);
/* swap */
tmp = fds;
fds = other_fds;
other_fds = tmp;
nfds = nextIndex;
i += nEvents;
}
if (debug_mode) printf("Test passed\n");
if (debug_mode) {
printf("Test passed\n");
}
PR_Cleanup();
goto exit_now;
goto exit_now;
exit_now:
if(failed_already)
return 1;
else
return 0;
if(failed_already) {
return 1;
}
else {
return 0;
}
}