Changeset 36597 in vbox for trunk/src/VBox/Runtime/r3

Timestamp:

Apr 6, 2011 7:46:15 PM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

71042

Message:

IPRT: Implemented the memory tracker.

Location:

trunk/src/VBox/Runtime/r3

Files:

• alloc.cpp (modified) (4 diffs)
• posix/fileio-posix.cpp (modified) (1 diff)
• win/fileio-win.cpp (modified) (4 diffs)

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

@@ -34 +34 @@
 #endif
 
+/*#define RTMEMALLOC_USE_TRACKER*/
+/* Don't enable the tracker when building the minimal IPRT. */
+#ifdef RT_MINI
+# undef RTMEMALLOC_USE_TRACKER
+#endif
+
 
 /*******************************************************************************
@@ -73 +79 @@
 #undef RTMemDupExTag
 
+#undef RTALLOC_USE_EFENCE
+
 
 RTDECL(void *)  RTMemTmpAllocTag(size_t cb, const char *pszTag) RT_NO_THROW
@@ -178 +186 @@
 #else /* !RTALLOC_USE_EFENCE */
 
-# ifdef RTALLOC_USE_TRACKER
-    void *pv;
-    if (!pvOld)
-    {
-        if (cbNew)
-            pv = RTMemTrackerHdrAlloc(realloc(pvOld, cbNew + sizeof(RTMEMTRACKERHDR)), cbNew,
-                                      pszTag, RTMEMTRACKERMETHOD_REALLOC);
-        else
-            pv = NULL;
-    }
-    else
-    {
-        RTMemTrackerHdrReallocPrep(pvOld, 0, pszTag, RTMEMTRACKERMETHOD_REALLOC);
-        pv = RTMemTrackerHdrRealloc(realloc(pvOld, cbNew + sizeof(RTMEMTRACKERHDR)), cbNew, pvOld,
-                                    pszTag, RTMEMTRACKERMETHOD_REALLOC);
-    }
+# ifdef RTMEMALLOC_USE_TRACKER
+    void *pvRealOld  = RTMemTrackerHdrReallocPrep(pvOld, 0, pszTag);
+    size_t cbRealNew = cbNew || !pvRealOld ? cbNew + sizeof(RTMEMTRACKERHDR) : 0;
+    void *pvNew      = realloc(pvRealOld, cbRealNew);
+    void *pv         = RTMemTrackerHdrReallocDone(pvNew, cbNew, pvOld, pszTag);
 # else
     void *pv = realloc(pvOld, cbNew);
@@ -213 +210 @@
         rtR3MemFree("Free", RTMEMTYPE_RTMEMFREE, pv, ASMReturnAddress(), NULL, 0, NULL);
 #else
-# ifdef RTALLOC_USE_TRACKER
+# ifdef RTMEMALLOC_USE_TRACKER
         pv = RTMemTrackerHdrFree(pv, 0, NULL, RTMEMTRACKERMETHOD_FREE);
 # endif

trunk/src/VBox/Runtime/r3/posix/fileio-posix.cpp

@@ -376 +376 @@
 
 
+RTFILE rtFileGetStandard(RTHANDLESTD enmStdHandle)
+{
+    int fd;
+    switch (enmStdHandle)
+    {
+        case RTHANDLESTD_INPUT:  fd = 0; break;
+        case RTHANDLESTD_OUTPUT: fd = 1; break;
+        case RTHANDLESTD_ERROR:  fd = 2; break;
+            break;
+        default:
+            AssertFailedReturn(NIL_RTFILE);
+    }
+
+    struct stat st;
+    int rc = fstat(fd, &st);
+    if (rc == -1)
+        return NIL_RTFILE;
+    return (RTFILE)fd;
+}
+
+
 RTR3DECL(int)  RTFileDelete(const char *pszFilename)
 {

trunk/src/VBox/Runtime/r3/win/fileio-win.cpp

@@ -349 +349 @@
 
 
+RTFILE rtFileGetStandard(RTHANDLESTD enmStdHandle)
+{
+    DWORD dwStdHandle;
+    switch (enmStdHandle)
+    {
+        case RTHANDLESTD_INPUT:     dwStdHandle = STD_INPUT_HANDLE;  break;
+        case RTHANDLESTD_OUTPUT:    dwStdHandle = STD_OUTPUT_HANDLE; break;
+        case RTHANDLESTD_ERROR:     dwStdHandle = STD_ERROR_HANDLE;  break;
+            break;
+        default:
+            AssertFailedReturn(NIL_RTFILE);
+    }
+
+    HANDLE hHandle = GetStdHandle(dwStdHandle);
+    if (hNative == INVALID_HANDLE_VALUE)
+        return NIL_RTFILE;
+
+    RTFILE hFile = (RTFILE)(uintptr_t)hHandle;
+    AssertReturn((HANDLE)(uintptr_t)hFile == hHandle, NIL_RTFILE);
+    return hFile;
+}
+
+
 RTR3DECL(int)  RTFileSeek(RTFILE File, int64_t offSeek, unsigned uMethod, uint64_t *poffActual)
 {
@@ -405 +428 @@
     }
 
-    /* 
-     * If it's a console, we might bump into out of memory conditions in the 
-     * ReadConsole call.  
+    /*
+     * If it's a console, we might bump into out of memory conditions in the
+     * ReadConsole call.
      */
     DWORD dwErr = GetLastError();
@@ -450 +473 @@
         return VINF_SUCCESS;
     }
-    
+
     return RTErrConvertFromWin32(dwErr);
 }
@@ -491 +514 @@
     }
 
-    /* 
-     * If it's a console, we might bump into out of memory conditions in the 
-     * WriteConsole call.  
+    /*
+     * If it's a console, we might bump into out of memory conditions in the
+     * WriteConsole call.
      */
     DWORD dwErr = GetLastError();