summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwtchang%redhat.com <devnull@localhost>2005-01-25 22:26:04 +0000
committerwtchang%redhat.com <devnull@localhost>2005-01-25 22:26:04 +0000
commit296697fab02e2004bb44f97b77d73fa183135486 (patch)
treeb3249651a28f572ff197b67aa89fc404c692f977
parent695b707f70a35545f5e81c85373c13a9d3445ed3 (diff)
downloadnspr-hg-296697fab02e2004bb44f97b77d73fa183135486.tar.gz
Bugzilla Bug 277514: added an environment variable NSPR_OS2_NO_HIRES_TIMER
that a user can set to disable the use of high-resolution timer DosTmrQueryTime(). The patch is contributed by Michael Kaply <mkaply@us.ibm.com>. r=wtc. Tag: NSPRPUB_PRE_4_2_CLIENT_BRANCH
-rw-r--r--pr/src/md/os2/os2inrval.c13
1 files changed, 11 insertions, 2 deletions
diff --git a/pr/src/md/os2/os2inrval.c b/pr/src/md/os2/os2inrval.c
index aa928ed3..4006f5f2 100644
--- a/pr/src/md/os2/os2inrval.c
+++ b/pr/src/md/os2/os2inrval.c
@@ -50,8 +50,17 @@ PRInt32 _os2_highMask = 0;
void
_PR_MD_INTERVAL_INIT()
{
- ULONG timerFreq = 0; /* OS/2 high-resolution timer frequency in Hz */
- APIRET rc = DosTmrQueryFreq(&timerFreq);
+ char *envp;
+ ULONG timerFreq;
+ APIRET rc;
+
+ if ((envp = getenv("NSPR_OS2_NO_HIRES_TIMER")) != NULL) {
+ if (atoi(envp) == 1)
+ return;
+ }
+
+ timerFreq = 0; /* OS/2 high-resolution timer frequency in Hz */
+ rc = DosTmrQueryFreq(&timerFreq);
if (NO_ERROR == rc) {
useHighResTimer = PR_TRUE;
PR_ASSERT(timerFreq != 0);