vbox的更動 13832 路徑 trunk/src/VBox/Runtime/common

時間撮記:

2008-11-5 上午02:01:12 (16 年 以前)

作者:

vboxsync

訊息:

IN_GC -> IN_RC.

位置:

trunk/src/VBox/Runtime/common

檔案:

• log/log.cpp (修改) (21 筆差異)
• log/logrel.cpp (修改) (4 筆差異)
• misc/sanity.h (修改) (3 筆差異)
• string/strformattype.cpp (修改) (3 筆差異)
• time/timesupA.asm (修改) (2 筆差異)
• time/timesupref.cpp (修改) (2 筆差異)

trunk/src/VBox/Runtime/common/log/log.cpp

@@ -34 +34 @@
 *******************************************************************************/
 #include <iprt/log.h>
-#ifndef IN_GC
+#ifndef IN_RC
 # include <iprt/alloc.h>
 # include <iprt/process.h>
@@ -80 +80 @@
 *   Internal Functions                                                         *
 *******************************************************************************/
-#ifndef IN_GC
+#ifndef IN_RC
 static unsigned rtlogGroupFlags(const char *psz);
 #endif
@@ -94 +94 @@
 *   Global Variables                                                           *
 *******************************************************************************/
-#ifdef IN_GC
+#ifdef IN_RC
 /** Default logger instance. */
 extern "C" DECLIMPORT(RTLOGGERRC)   g_Logger;
-#else /* !IN_GC */
+#else /* !IN_RC */
 /** Default logger instance. */
 static PRTLOGGER                    g_pLogger;
-#endif /* !IN_GC */
+#endif /* !IN_RC */
 #ifdef IN_RING3
 /** The RTThreadGetWriteLockCount() change caused by the logger mutex semaphore. */
@@ -140 +140 @@
 DECLINLINE(int) rtlogLock(PRTLOGGER pLogger)
 {
-#ifndef IN_GC
+#ifndef IN_RC
     if (pLogger->MutexSem != NIL_RTSEMFASTMUTEX)
     {
@@ -163 +163 @@
 DECLINLINE(void) rtlogUnlock(PRTLOGGER pLogger)
 {
-#ifndef IN_GC
+#ifndef IN_RC
     if (pLogger->MutexSem != NIL_RTSEMFASTMUTEX)
         RTSemFastMutexRelease(pLogger->MutexSem);
@@ -171 +171 @@
 
 
-#ifndef IN_GC
+#ifndef IN_RC
 /**
  * Create a logger instance, comprehensive version.
@@ -1212 +1212 @@
 }
 
-#endif /* !IN_GC */
+#endif /* !IN_RC */
 
 
@@ -1356 +1356 @@
     if (!pLogger)
     {
-#ifdef IN_GC
+#ifdef IN_RC
         pLogger = &g_Logger;
 #else
@@ -1370 +1370 @@
     if (pLogger->offScratch)
     {
-#ifndef IN_GC
+#ifndef IN_RC
         /*
          * Acquire logger instance sem.
@@ -1383 +1383 @@
         rtlogFlush(pLogger);
 
-#ifndef IN_GC
+#ifndef IN_RC
         /*
          * Release the semaphore.
@@ -1401 +1401 @@
 RTDECL(PRTLOGGER)   RTLogDefaultInstance(void)
 {
-#ifdef IN_GC
+#ifdef IN_RC
     return &g_Logger;
 
-#else /* !IN_GC */
+#else /* !IN_RC */
 # ifdef IN_RING0
     /*
@@ -1425 +1425 @@
         g_pLogger = RTLogDefaultInit();
     return g_pLogger;
-#endif /* !IN_GC */
-}
-
-
-#ifndef IN_GC
+#endif /* !IN_RC */
+}
+
+
+#ifndef IN_RC
 /**
  * Sets the default logger instance.
@@ -1440 +1440 @@
     return (PRTLOGGER)ASMAtomicXchgPtr((void * volatile *)&g_pLogger, pLogger);
 }
-#endif /* !IN_GC */
+#endif /* !IN_RC */
 
 
@@ -1580 +1580 @@
      */
     if (    (pLogger->fFlags & RTLOGFLAGS_DISABLED)
-#ifndef IN_GC
+#ifndef IN_RC
         || !pLogger->fDestFlags
 #endif
@@ -1771 +1771 @@
 static void rtlogFlush(PRTLOGGER pLogger)
 {
-#ifndef IN_GC
+#ifndef IN_RC
     if (pLogger->fDestFlags & RTLOGDEST_USER)
         RTLogWriteUser(pLogger->achScratch, pLogger->offScratch);
@@ -1789 +1789 @@
         RTLogWriteStdErr(pLogger->achScratch, pLogger->offScratch);
 
-# if (defined(IN_RING0) || defined(IN_GC)) && !defined(LOG_NO_COM)
+# if (defined(IN_RING0) || defined(IN_RC)) && !defined(LOG_NO_COM)
     if (pLogger->fDestFlags & RTLOGDEST_COM)
         RTLogWriteCom(pLogger->achScratch, pLogger->offScratch);
 # endif
-#endif /* !IN_GC */
+#endif /* !IN_RC */
 
     if (pLogger->pfnFlush)
@@ -1916 +1916 @@
                 if (pLogger->fFlags & RTLOGFLAGS_PREFIX_TS)
                 {
-#if defined(IN_RING3) || defined(IN_GC)
+#if defined(IN_RING3) || defined(IN_RC)
                     uint64_t u64 = RTTimeNanoTS();
 #else
@@ -1968 +1968 @@
                 if (pLogger->fFlags & RTLOGFLAGS_PREFIX_MS_PROG)
                 {
-#if defined(IN_RING3) || defined(IN_GC)
+#if defined(IN_RING3) || defined(IN_RC)
                     uint64_t u64 = RTTimeProgramMilliTS();
 #else
@@ -2029 +2029 @@
                 if (pLogger->fFlags & RTLOGFLAGS_PREFIX_PID)
                 {
-#ifndef IN_GC
+#ifndef IN_RC
                     RTPROCESS Process = RTProcSelf();
 #else
@@ -2039 +2039 @@
                 if (pLogger->fFlags & RTLOGFLAGS_PREFIX_TID)
                 {
-#ifndef IN_GC
+#ifndef IN_RC
                     RTNATIVETHREAD Thread = RTThreadNativeSelf();
 #else
@@ -2051 +2051 @@
 #ifdef IN_RING3
                     const char *pszName = RTThreadSelfName();
-#elif defined IN_GC
+#elif defined IN_RC
                     const char *pszName = "EMT-GC";
 #else

trunk/src/VBox/Runtime/common/log/logrel.cpp

@@ -34 +34 @@
 *******************************************************************************/
 #include <iprt/log.h>
-#ifndef IN_GC
+#ifndef IN_RC
 # include <iprt/alloc.h>
 # include <iprt/process.h>
@@ -63 +63 @@
 *   Global Variables                                                           *
 *******************************************************************************/
-#ifdef IN_GC
+#ifdef IN_RC
 /** Default relese logger instance. */
 extern "C" DECLIMPORT(RTLOGGERRC)   g_RelLogger;
-#else /* !IN_GC */
+#else /* !IN_RC */
 /** Default release logger instance. */
 static PRTLOGGER                    g_pRelLogger;
-#endif /* !IN_GC */
+#endif /* !IN_RC */
 
 
@@ -80 +80 @@
 RTDECL(PRTLOGGER)   RTLogRelDefaultInstance(void)
 {
-#ifdef IN_GC
+#ifdef IN_RC
     return &g_RelLogger;
-#else /* !IN_GC */
+#else /* !IN_RC */
     return g_pRelLogger;
-#endif /* !IN_GC */
+#endif /* !IN_RC */
 }
 
 
-#ifndef IN_GC
+#ifndef IN_RC
 /**
  * Sets the default logger instance.
@@ -99 +99 @@
     return (PRTLOGGER)ASMAtomicXchgPtr((void * volatile *)&g_pRelLogger, pLogger);
 }
-#endif /* !IN_GC */
+#endif /* !IN_RC */
 
 

trunk/src/VBox/Runtime/common/misc/sanity.h

@@ -46 +46 @@
 # error "defined(IN_RING0) && ARCH_BITS != R0_ARCH_BITS"
 #endif
-#if defined(IN_GC) && ARCH_BITS != 32
-# error "defined(IN_GC) && ARCH_BITS != 32"
+#if defined(IN_RC) && ARCH_BITS != 32
+# error "defined(IN_RC) && ARCH_BITS != 32"
 #endif
 #if (defined(IN_RING0) || defined(IN_RING3)) && HC_ARCH_BITS != ARCH_BITS
 # error "(defined(IN_RING0) || defined(IN_RING3)) && HC_ARCH_BITS != ARCH_BITS"
 #endif
-#if defined(IN_GC) && GC_ARCH_BITS != 64 && GC_ARCH_BITS != ARCH_BITS
-# error "defined(IN_GC) && GC_ARCH_BITS != ARCH_BITS"
+#if defined(IN_RC) && GC_ARCH_BITS != 64 && GC_ARCH_BITS != ARCH_BITS
+# error "defined(IN_RC) && GC_ARCH_BITS != ARCH_BITS"
 #endif
 
@@ -131 +131 @@
 AssertCompileSize(RTGCUINTREG, 8);
 
-# ifdef IN_GC
+# ifdef IN_RC
 /*AssertCompileSize(RTCCINTREG, 8);*/
 /* Hack alert: there is no such thing as a GC context when GC_ARCH_BITS == 64; it's still 32 bits */
@@ -146 +146 @@
 AssertCompileSize(RTGCUINTREG, 4);
 
-# ifdef IN_GC
+# ifdef IN_RC
 /*AssertCompileSize(RTCCINTREG, 4);*/
 AssertCompileSize(RTCCUINTREG, 4);

trunk/src/VBox/Runtime/common/string/strformattype.cpp

@@ -71 +71 @@
      * In GC the offset is relative to g_aTypes[0], so that &g_aTypes[0] + offHandler
      * gives the actual address. */
-#ifdef IN_GC
+#ifdef IN_RC
     int32_t             offHandler;
 #else
@@ -298 +298 @@
             g_aTypes[i].cchType = (uint8_t)cchType;
             g_aTypes[i].pvUser = pvUser;
-#ifdef IN_GC
+#ifdef IN_RC
             g_aTypes[i].offHandler = (intptr_t)pfnHandler - (intptr_t)&g_aTypes[0];
 #else
@@ -448 +448 @@
     if (RT_LIKELY(i >= 0))
     {
-#ifdef IN_GC
+#ifdef IN_RC
         PFNRTSTRFORMATTYPE pfnHandler = (PFNRTSTRFORMATTYPE)((intptr_t)&g_aTypes[0] + g_aTypes[i].offHandler);
 #else

trunk/src/VBox/Runtime/common/time/timesupA.asm

@@ -93 +93 @@
 
 %define ASYNC_GIP
-%ifdef IN_GC
+%ifdef IN_RC
  %undef NEED_TRANSACTION_ID
 %endif
@@ -110 +110 @@
 
 %define ASYNC_GIP
-%ifdef IN_GC
+%ifdef IN_RC
  %undef NEED_TRANSACTION_ID
 %endif

trunk/src/VBox/Runtime/common/time/timesupref.cpp

@@ -50 +50 @@
 
 #define ASYNC_GIP
-#ifdef IN_GC
+#ifdef IN_RC
 # undef NEED_TRANSACTION_ID
 #endif
@@ -70 +70 @@
 
 #define ASYNC_GIP
-#ifdef IN_GC
+#ifdef IN_RC
 # undef NEED_TRANSACTION_ID
 #endif