Changeset 19553

Timestamp:

Sep 15, 2008, 11:24:30 AM (18 years ago)

Author:

jhoblitt

Message:

add efence hooks

Location:

trunk/Nebulous/nebclient/src

Files:

• xmalloc.c (modified) (4 diffs)
• xmalloc.h (modified) (2 diffs)

trunk/Nebulous/nebclient/src/xmalloc.c

@@ -4 +4 @@
  * Copyright (C) 2003-2005  Joshua Hoblitt, 2003  Robert Lupton
  *
- * $Id: xmalloc.c,v 1.3 2005-07-30 02:45:31 jhoblitt Exp $
+ * $Id: xmalloc.c,v 1.4 2008-09-15 21:24:30 jhoblitt Exp $
  */
 
@@ -11 +11 @@
 #include "xmalloc.h"
 
+//#define USE_EFF 1
+#ifdef USE_EFF
+#include "efence.h"
+#endif
+
 /*****************************************************************************/
 /*
  * Wrappers for malloc/free.  xmalloc cannot fail.
  */
-void * xmalloc(size_t n)
+void * x_xmalloc(
+                const char *file,
+                unsigned int lineno,
+                const char *func,
+                size_t n)
 {
+#ifdef USE_EFF
+   void *ptr = _eff_malloc(n, file, lineno);
+#else
    void *ptr = malloc(n);
+#endif
     
    if (ptr == NULL) {
@@ -27 +40 @@
 }
 
-void * xrealloc(void *ptr, size_t size)
+void * x_xrealloc(
+                const char *file,
+                unsigned int lineno,
+                const char *func,
+                void *ptr,
+                size_t size)
 {
+#ifdef USE_EFF
+    void *newptr = _eff_realloc(ptr, size, file, lineno);
+#else
     void *newptr = realloc(ptr, size);
+#endif
 
     if (!newptr) {
@@ -39 +61 @@
 }
  
-void xfree(void *ptr)
+void x_xfree(
+            const char *file,
+            unsigned int lineno,
+            const char *func,
+            void *ptr)
 {
+#ifdef USE_EFF
+    _eff_free(ptr, file, lineno);
+#else
    free(ptr);
+#endif
 }

trunk/Nebulous/nebclient/src/xmalloc.h

@@ -4 +4 @@
  * Copyright (C) 2003-2005  Joshua Hoblitt, 2003  Robert Lupton
  *
- * $Id: xmalloc.h,v 1.4 2005-07-30 02:45:31 jhoblitt Exp $
+ * $Id: xmalloc.h,v 1.5 2008-09-15 21:24:30 jhoblitt Exp $
  */
 
@@ -10 +10 @@
 #define XMALLOC_H 1
 
-void * xmalloc(size_t n);
+#define xmalloc(size) \
+x_xmalloc(__FILE__, __LINE__, __func__, size)
 
-void * xrealloc(void *ptr, size_t size);
+void * x_xmalloc(
+    const char *file,                  ///< File of caller
+    unsigned int lineno,               ///< Line number of caller
+    const char *func,                  ///< Function name of caller
+    size_t n
+#ifdef __GNUC__
+) __attribute__((malloc));
+# else // ifdef __GNUC__
+);
+#endif // ifdef __GNUC__
+
+
+#define xrealloc(ptr, size) \
+x_xrealloc(__FILE__, __LINE__, __func__, ptr, size)
+
+void * x_xrealloc(
+    const char *file,                  ///< File of caller
+    unsigned int lineno,               ///< Line number of caller
+    const char *func,                  ///< Function name of caller
+    void *ptr,
+    size_t size
+#ifdef __GNUC__
+) __attribute__((malloc));
+# else // ifdef __GNUC__
+);
+#endif // ifdef __GNUC__
  
-void xfree(void *ptr);
+#define xfree(ptr) \
+x_xfree(__FILE__, __LINE__, __func__, ptr)
+
+void x_xfree(
+    const char *file,                  ///< File of caller
+    unsigned int lineno,               ///< Line number of caller
+    const char *func,                  ///< Function name of caller
+    void *ptr
+);
 
 #endif // XMALLOC_H