mirror of
https://repo.dactyloidae.xyz/Dactyloidae/UXP.git
synced 2026-09-24 17:37:30 +09:00
update NSPR to 4.24 and keep NSPR Bug 1586070 and win64 patch intact.
This commit is contained in:
parent
dd094ae552
commit
0b9855b841
487 changed files with 42933 additions and 48679 deletions
|
|
@ -37,34 +37,36 @@ hrtime_t ihrtime;
|
|||
void
|
||||
ftime_init()
|
||||
{
|
||||
itime = time(NULL);
|
||||
ihrtime = gethrtime();
|
||||
itime = time(NULL);
|
||||
ihrtime = gethrtime();
|
||||
}
|
||||
|
||||
time_t
|
||||
ftime()
|
||||
{
|
||||
hrtime_t now = gethrtime();
|
||||
hrtime_t now = gethrtime();
|
||||
|
||||
return itime + ((now - ihrtime) / 1000000000ll);
|
||||
return itime + ((now - ihrtime) / 1000000000ll);
|
||||
}
|
||||
|
||||
static void timeTime(void)
|
||||
{
|
||||
PRInt32 index = count;
|
||||
time_t rv;
|
||||
|
||||
for (;index--;)
|
||||
|
||||
for (; index--;) {
|
||||
rv = time(NULL);
|
||||
}
|
||||
}
|
||||
|
||||
static void timeGethrtime(void)
|
||||
{
|
||||
PRInt32 index = count;
|
||||
time_t rv;
|
||||
|
||||
for (;index--;)
|
||||
|
||||
for (; index--;) {
|
||||
rv = ftime();
|
||||
}
|
||||
}
|
||||
|
||||
static void timeGettimeofday(void)
|
||||
|
|
@ -72,9 +74,10 @@ static void timeGettimeofday(void)
|
|||
PRInt32 index = count;
|
||||
time_t rv;
|
||||
struct timeval tp;
|
||||
|
||||
for (;index--;)
|
||||
|
||||
for (; index--;) {
|
||||
rv = gettimeofday(&tp, NULL);
|
||||
}
|
||||
}
|
||||
|
||||
static void timePRTime32(void)
|
||||
|
|
@ -85,8 +88,8 @@ static void timePRTime32(void)
|
|||
PRTime rv;
|
||||
|
||||
LL_I2L(q, 1000000);
|
||||
|
||||
for (;index--;) {
|
||||
|
||||
for (; index--;) {
|
||||
rv = PR_Now();
|
||||
LL_DIV(rv, rv, q);
|
||||
LL_L2I(rv32, rv);
|
||||
|
|
@ -97,9 +100,10 @@ static void timePRTime64(void)
|
|||
{
|
||||
PRInt32 index = count;
|
||||
PRTime rv;
|
||||
|
||||
for (;index--;)
|
||||
|
||||
for (; index--;) {
|
||||
rv = PR_Now();
|
||||
}
|
||||
}
|
||||
|
||||
/************************************************************************/
|
||||
|
|
@ -117,40 +121,44 @@ static void Measure(void (*func)(void), const char *msg)
|
|||
d = (double)PR_IntervalToMicroseconds(stop - start);
|
||||
tot = PR_IntervalToMilliseconds(stop-start);
|
||||
|
||||
if (debug_mode) printf("%40s: %6.2f usec avg, %d msec total\n", msg, d / count, tot);
|
||||
if (debug_mode) {
|
||||
printf("%40s: %6.2f usec avg, %d msec total\n", msg, d / count, tot);
|
||||
}
|
||||
}
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
/* 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);
|
||||
|
||||
PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 0);
|
||||
PR_STDIO_INIT();
|
||||
|
||||
if (argc > 1) {
|
||||
count = atoi(argv[1]);
|
||||
count = atoi(argv[1]);
|
||||
} else {
|
||||
count = DEFAULT_COUNT;
|
||||
count = DEFAULT_COUNT;
|
||||
}
|
||||
|
||||
ftime_init();
|
||||
|
|
@ -161,8 +169,8 @@ int main(int argc, char **argv)
|
|||
Measure(timePRTime32, "time to get time with PR_Time() (32bit)");
|
||||
Measure(timePRTime64, "time to get time with PR_Time() (64bit)");
|
||||
|
||||
PR_Cleanup();
|
||||
return 0;
|
||||
PR_Cleanup();
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue