Changeset 53684 in vbox

Timestamp:

Jan 2, 2015 12:40:26 PM (10 years ago)

Author:

vboxsync

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

97461

Message:

VBoxDTrace: RTMemAllocEx doesn't support RTMEMALLOCEX_FLAGS_ANY_CTX on windows. Lets try without it ... scary. (r61)

File:

• trunk/src/VBox/ExtPacks/VBoxDTrace/VBoxDTraceR0/VBoxDTraceR0.cpp (modified) (5 diffs)

trunk/src/VBox/ExtPacks/VBoxDTrace/VBoxDTraceR0/VBoxDTraceR0.cpp

@@ -53 +53 @@
 #include <VBox/VBoxTpG.h>
 
+
+/*******************************************************************************
+*   Defined Constants And Macros                                               *
+*******************************************************************************/
+#if !defined(RT_OS_WINDOWS) && !defined(RT_OS_OS2)
+# define HAVE_RTMEMALLOCEX_FEATURES
+#endif
 
 
@@ -643 +650 @@
     {
         struct VBoxDtCred *pCred;
+#ifdef HAVE_RTMEMALLOCEX_FEATURES
         int rc = RTMemAllocEx(sizeof(*pCred), 0, RTMEMALLOCEX_FLAGS_ANY_CTX, (void **)&pCred);
+#else
+        int rc = RTMemAllocEx(sizeof(*pCred), 0, 0, (void **)&pCred);
+#endif
         AssertFatalRC(rc);
         pCred->cr_refs  = 1;
@@ -1123 +1134 @@
 void *VBoxDtKMemAlloc(size_t cbMem, uint32_t fFlags)
 {
-    void *pvMem;
-    int rc = RTMemAllocEx(cbMem, 0, fFlags & KM_NOSLEEP ? RTMEMALLOCEX_FLAGS_ANY_CTX : 0, &pvMem);
+    void    *pvMem;
+#ifdef HAVE_RTMEMALLOCEX_FEATURES
+    uint32_t fMemAllocFlags = fFlags & KM_NOSLEEP ? RTMEMALLOCEX_FLAGS_ANY_CTX : 0;
+#else
+    uint32_t fMemAllocFlags = 0;
+#endif
+    int rc = RTMemAllocEx(cbMem, 0, fMemAllocFlags, &pvMem);
     AssertRCReturn(rc, NULL);
     AssertPtr(pvMem);
@@ -1134 +1150 @@
 void *VBoxDtKMemAllocZ(size_t cbMem, uint32_t fFlags)
 {
-    void *pvMem;
-    int rc = RTMemAllocEx(cbMem, 0,
-                          (fFlags & KM_NOSLEEP ? RTMEMALLOCEX_FLAGS_ANY_CTX : 0) | RTMEMALLOCEX_FLAGS_ZEROED,
-                          &pvMem);
+    void    *pvMem;
+#ifdef HAVE_RTMEMALLOCEX_FEATURES
+    uint32_t fMemAllocFlags = (fFlags & KM_NOSLEEP ? RTMEMALLOCEX_FLAGS_ANY_CTX : 0) | RTMEMALLOCEX_FLAGS_ZEROED;
+#else
+    uint32_t fMemAllocFlags = RTMEMALLOCEX_FLAGS_ZEROED;
+#endif
+    int rc = RTMemAllocEx(cbMem, 0, fMemAllocFlags, &pvMem);
     AssertRCReturn(rc, NULL);
     AssertPtr(pvMem);
@@ -1204 +1223 @@
 void *VBoxDtKMemCacheAlloc(struct VBoxDtMemCache *pThis, uint32_t fFlags)
 {
-    void *pvMem;
-    int rc = RTMemAllocEx(pThis->cbBuf,
-                          pThis->cbAlign,
-                          (fFlags & KM_NOSLEEP ? RTMEMALLOCEX_FLAGS_ANY_CTX : 0) | RTMEMALLOCEX_FLAGS_ZEROED,
-                          &pvMem);
+    void    *pvMem;
+#ifdef HAVE_RTMEMALLOCEX_FEATURES
+    uint32_t fMemAllocFlags = (fFlags & KM_NOSLEEP ? RTMEMALLOCEX_FLAGS_ANY_CTX : 0) | RTMEMALLOCEX_FLAGS_ZEROED;
+#else
+    uint32_t fMemAllocFlags = RTMEMALLOCEX_FLAGS_ZEROED;
+#endif
+    int rc = RTMemAllocEx(pThis->cbBuf, pThis->cbAlign, fMemAllocFlags, &pvMem);
     AssertRCReturn(rc, NULL);
     AssertPtr(pvMem);