Changeset 3123 in vbox for trunk/src/VBox/Runtime

Timestamp:

Jun 15, 2007 2:46:16 PM (18 years ago)

Author:

vboxsync

Message:

Made VBOX_LOG_FLAGS=msprog work in GC.

Location:

trunk/src/VBox/Runtime

Files:

• Makefile.kmk (modified) (2 diffs)
• include/internal/time.h (modified) (1 diff)
• log.cpp (modified) (1 diff)
• r3/init.cpp (modified) (2 diffs)
• timeprog.cpp (modified) (3 diffs)

trunk/src/VBox/Runtime/Makefile.kmk

@@ -834 +834 @@
 RuntimeGC_DEFS          = IN_RT_GC RT_WITH_VBOX
 RuntimeGC_SOURCES       = \
+        gc/initterm-gc.cpp \
         misc/sanity-cpp.cpp \
         misc/sanity-c.c \
@@ -856 +857 @@
         VBox/strformat-vbox.cpp \
         timesup.cpp \
+        timeprog.cpp \
         string/memchr.cpp \
         string/memcmp.cpp \

trunk/src/VBox/Runtime/include/internal/time.h

@@ -27 +27 @@
 __BEGIN_DECLS
 
-#ifdef IN_RING3
+#if defined(IN_RING3) || defined(IN_GC)
 
 extern uint64_t g_u64ProgramStartNanoTS;
+extern uint64_t g_u64ProgramStartMicroTS;
 extern uint64_t g_u64ProgramStartMilliTS;
 

trunk/src/VBox/Runtime/log.cpp

@@ -1928 +1928 @@
                 if (pLogger->fFlags & RTLOGFLAGS_PREFIX_MS_PROG)
                 {
-#ifdef IN_RING3
+#if defined(IN_RING3) || defined(IN_GC)
                     uint64_t u64 = RTTimeProgramMilliTS();
 #else

trunk/src/VBox/Runtime/r3/init.cpp

@@ -66 +66 @@
  */
 uint64_t    g_u64ProgramStartNanoTS;
+
+/**
+ * Program start microsecond TS.
+ */
+uint64_t    g_u64ProgramStartMicroTS;
 
 /**
@@ -146 +151 @@
      */
     g_u64ProgramStartNanoTS = RTTimeNanoTS();
-    g_u64ProgramStartMilliTS = RTTimeMilliTS();
+    g_u64ProgramStartMicroTS = g_u64ProgramStartNanoTS / 1000;
+    g_u64ProgramStartMilliTS = g_u64ProgramStartNanoTS / 1000000;
 
 #ifndef IN_GUEST

trunk/src/VBox/Runtime/timeprog.cpp

@@ -35 +35 @@
  * @returns Timestamp relative to program startup.
  */
-RTR3DECL(uint64_t)  RTTimeProgramNanoTS(void)
+RTDECL(uint64_t)  RTTimeProgramNanoTS(void)
 {
-    AssertMsg(g_u64ProgramStartNanoTS, ("RTR3Init hasn't been called!\n"));
     return RTTimeNanoTS() - g_u64ProgramStartNanoTS;
+}
+
+
+/**
+ * Get the microsecond timestamp relative to program startup.
+ *
+ * @returns Timestamp relative to program startup.
+ */
+RTDECL(uint64_t)  RTTimeProgramMicroTS(void)
+{
+    return RTTimeProgramNanoTS() / 1000;
 }
 
@@ -47 +57 @@
  * @returns Timestamp relative to program startup.
  */
-RTR3DECL(uint64_t)  RTTimeProgramMilliTS(void)
+RTDECL(uint64_t)  RTTimeProgramMilliTS(void)
 {
-/*    AssertMsg(g_u64ProgramStartMilliTS, ("RTR3Init hasn't been called!\n")); */
     return RTTimeMilliTS() - g_u64ProgramStartMilliTS;
 }
@@ -59 +68 @@
  * @returns Timestamp relative to program startup.
  */
-RTR3DECL(uint32_t)  RTTimeProgramSecTS(void)
+RTDECL(uint32_t)  RTTimeProgramSecTS(void)
 {
     AssertMsg(g_u64ProgramStartMilliTS, ("RTR3Init hasn't been called!\n"));
     return (uint32_t)(RTTimeProgramMilliTS() / 1000);
 }
+
+
+/**
+ * Get the RTTimeNanoTS() of when the program started.
+ *
+ * @returns Program startup timestamp.
+ */
+RTDECL(uint64_t) RTTimeProgramStartNanoTS(void)
+{
+    return g_u64ProgramStartNanoTS;
+}