Changeset 31259 in vbox for trunk/src/libs/xpcom18a4/ipc/ipcd/shared

Timestamp:

Jul 30, 2010 8:02:05 PM (15 years ago)

Author:

vboxsync

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

64275

Message:

xpcom: Use RTMem* for memory alloc so that we can more easily wrap direct it to the electric fence heap.

File:

• trunk/src/libs/xpcom18a4/ipc/ipcd/shared/src/ipcMessage.cpp (modified) (8 diffs)

trunk/src/libs/xpcom18a4/ipc/ipcd/shared/src/ipcMessage.cpp

@@ -40 +40 @@
 #include "prlog.h"
 #include "ipcMessage.h"
+#ifdef VBOX_USE_IPRT_IN_XPCOM
+# include <iprt/mem.h>
+#endif
 
 ipcMessage::~ipcMessage()
 {
     if (mMsgHdr)
+#ifdef VBOX_USE_IPRT_IN_XPCOM
+        RTMemFree(mMsgHdr);
+#else
         free(mMsgHdr);
+#endif
 }
 
@@ -51 +58 @@
 {
     if (mMsgHdr) {
+#ifdef VBOX_USE_IPRT_IN_XPCOM
+        RTMemFree(mMsgHdr);
+#else
         free(mMsgHdr);
+#endif
         mMsgHdr = NULL;
     }
@@ -68 +79 @@
     // copy buf if non-null
     if (mMsgHdr) {
+#ifdef VBOX_USE_IPRT_IN_XPCOM
+        clone->mMsgHdr = (ipcMessageHeader *) RTMemDup(mMsgHdr, mMsgHdr->mLen);
+#else
         clone->mMsgHdr = (ipcMessageHeader *) malloc(mMsgHdr->mLen);
         memcpy(clone->mMsgHdr, mMsgHdr, mMsgHdr->mLen);
+#endif
     }
     else
@@ -84 +99 @@
 {
     if (mMsgHdr)
+#ifdef VBOX_USE_IPRT_IN_XPCOM
+        RTMemFree(mMsgHdr);
+#else
         free(mMsgHdr);
+#endif
     mMsgComplete = PR_FALSE;
 
     // allocate message data
     PRUint32 msgLen = IPC_MSG_HEADER_SIZE + dataLen;
+#ifdef VBOX_USE_IPRT_IN_XPCOM
+    mMsgHdr = (ipcMessageHeader *) RTMemAlloc(msgLen);
+#else
     mMsgHdr = (ipcMessageHeader *) malloc(msgLen);
+#endif
     if (!mMsgHdr) {
         mMsgHdr = NULL;
@@ -123 +146 @@
 ipcMessage::Equals(const nsID &target, const char *data, PRUint32 dataLen) const
 {
-    return mMsgComplete && 
+    return mMsgComplete &&
            mMsgHdr->mTarget.Equals(target) &&
            DataLen() == dataLen &&
@@ -199 +222 @@
                 bufLen -= count;
                 *bytesRead = count;
-                
+
                 if (MsgLen() > IPC_MSG_GUESSED_SIZE) {
                     // realloc message buffer to the correct size
+#ifdef VBOX_USE_IPRT_IN_XPCOM
+                    mMsgHdr = (ipcMessageHeader *) RTMemRealloc(mMsgHdr, MsgLen());
+#else
                     mMsgHdr = (ipcMessageHeader *) realloc(mMsgHdr, MsgLen());
+#endif
                 }
             }
@@ -212 +239 @@
             // allocate a partial buffer
             PRUint32 msgLen = IPC_MSG_GUESSED_SIZE;
+#ifdef VBOX_USE_IPRT_IN_XPCOM
+            mMsgHdr = (ipcMessageHeader *) RTMemAlloc(msgLen);
+#else
             mMsgHdr = (ipcMessageHeader *) malloc(msgLen);
+#endif
             if (!mMsgHdr)
                 return PR_FAILURE;
@@ -223 +254 @@
         else {
             PRUint32 msgLen = *(PRUint32 *) buf;
+#ifdef VBOX_USE_IPRT_IN_XPCOM
+            mMsgHdr = (ipcMessageHeader *) RTMemAlloc(msgLen);
+#else
             mMsgHdr = (ipcMessageHeader *) malloc(msgLen);
+#endif
             if (!mMsgHdr)
                 return PR_FAILURE;