SF.net SVN: jikesrvm:[15696] rvmroot/trunk/tools/bootImageRunner/sys.C

View: New views
1 Messages — Rating Filter:   Alert me  

SF.net SVN: jikesrvm:[15696] rvmroot/trunk/tools/bootImageRunner/sys.C

by pizlo :: Rate this Message:

Reply to Author | View Threaded | Show Only this Message

Revision: 15696
          http://jikesrvm.svn.sourceforge.net/jikesrvm/?rev=15696&view=rev
Author:   pizlo
Date:     2009-05-25 22:26:02 +0000 (Mon, 25 May 2009)

Log Message:
-----------
Fix threading logic on Mac OS X.  The problem was that our sysNanoTime() implementation was using a different notion of time than pthread_cond_timedwait.  This is now fixed.

Modified Paths:
--------------
    rvmroot/trunk/tools/bootImageRunner/sys.C

Modified: rvmroot/trunk/tools/bootImageRunner/sys.C
===================================================================
--- rvmroot/trunk/tools/bootImageRunner/sys.C 2009-05-25 02:37:12 UTC (rev 15695)
+++ rvmroot/trunk/tools/bootImageRunner/sys.C 2009-05-25 22:26:02 UTC (rev 15696)
@@ -774,20 +774,15 @@
  retVal = (((long long) tp.tv_sec) * 1000000000) + tp.tv_nsec;
  }
 #else
-        Nanoseconds nanoTime;
- unsigned long long high;
- unsigned long long low;
+        struct timeval tv;
 
- low = mach_absolute_time();
+        gettimeofday(&tv,NULL);
 
- high = low >> 32;
- low &= 0xffffffff;
-
- high *= timebaseInfo.numer;
- low *= timebaseInfo.numer;
-
- retVal = (high / timebaseInfo.denom) << 32;
- retVal += (low + ((high % timebaseInfo.denom) << 32)) / timebaseInfo.denom;
+        retVal=tv.tv_sec;
+        retVal*=1000;
+        retVal*=1000;
+        retVal+=tv.tv_usec;
+        retVal*=1000;
 #endif
     return retVal;
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Register Now for Creativity and Technology (CaT), June 3rd, NYC. CaT
is a gathering of tech-side developers & brand creativity professionals. Meet
the minds behind Google Creative Lab, Visual Complexity, Processing, &
iPhoneDevCamp asthey present alongside digital heavyweights like Barbarian
Group, R/GA, & Big Spaceship. http://www.creativitycat.com 
_______________________________________________
Jikesrvm-commits mailing list
Jikesrvm-commits@...
https://lists.sourceforge.net/lists/listinfo/jikesrvm-commits