remove da log printing from probe_memory

diff --git a/probe_memory/da_memory.h b/probe_memory/da_memory.h
index 3e6a06c..05a6da4 100644 (file)
--- a/probe_memory/da_memory.h
+++ b/probe_memory/da_memory.h
@@ -43,17 +43,4 @@
  * 
  ********************************************************************/
 
-#define POST_PROBEBLOCK_MIDDLE_MEM(SIZE, APITYPE, ADDR)        \
-       log.length += sprintf(log.data + log.length,            \
-                       "`,%u`,%d`,%p", SIZE, APITYPE, ADDR)
-
-#define POST_PROBEBLOCK_BEGIN_MEM(LCTYPE, APINAME, RETTYPE, RETVALUE, INPUTFORMAT, ...)        \
-       newerrno = errno;                                                                                                                                       \
-       if(postBlockBegin(blockresult)) {                                                                                                       \
-               INIT_LOG;                                                                                                                                               \
-               APPEND_LOG_BASIC_NAME(LCTYPE, APINAME);                                                                                 \
-               APPEND_LOG_INPUT(INPUTFORMAT, __VA_ARGS__);                                                                             \
-               APPEND_LOG_RESULT(RETTYPE, RETVALUE);                                                                                   \
-               APPEND_LOG_CALLER()
-
 #endif // __DA_MEMORY_H__

diff --git a/probe_memory/libdamemalloc.c b/probe_memory/libdamemalloc.c
index 5f47686..2f126dd 100755 (executable)
--- a/probe_memory/libdamemalloc.c
+++ b/probe_memory/libdamemalloc.c
@@ -51,7 +51,7 @@ static enum DaOptions _sopt = OPT_ALLOC;
 void *malloc(size_t size)
 {
        static void*(*mallocp)(size_t size);
-       DECLARE_VARIABLE_STANDARD; log_t log;
+       DECLARE_VARIABLE_STANDARD;
        void *pret;
 
        GET_REAL_FUNC_RTLD_NEXT(malloc);
@@ -66,9 +66,7 @@ void *malloc(size_t size)
                add_memory_hash(pret, size);
        }
 
-       POST_PROBEBLOCK_BEGIN(LC_MEMORY, VT_PTR, pret, "%u", size);
-       POST_PROBEBLOCK_MIDDLE_MEM(size, MEMORY_API_ALLOC, pret);
-       APPEND_LOG_CALLSTACK();
+       POST_PACK_PROBEBLOCK_BEGIN();
        
        PREPARE_LOCAL_BUF();
        PACK_COMMON_BEGIN(MSG_PROBE_MEMORY, LC_MEMORY, "x", size);
@@ -76,7 +74,7 @@ void *malloc(size_t size)
        PACK_MEMORY(size, MEMORY_API_ALLOC, pret);
        FLUSH_LOCAL_BUF();
        
-       POST_PROBEBLOCK_END();
+       POST_PACK_PROBEBLOCK_END();
 
        return pret;
 }
@@ -84,7 +82,7 @@ void *malloc(size_t size)
 void free(void *ptr)
 {
        static void (*freep)(void *);
-       DECLARE_VARIABLE_STANDARD; log_t log;
+       DECLARE_VARIABLE_STANDARD;
 
        GET_REAL_FUNC_RTLD_NEXT(free);
 
@@ -98,9 +96,7 @@ void free(void *ptr)
 
        freep(ptr);
 
-       POST_PROBEBLOCK_BEGIN(LC_MEMORY, VT_NULL, NULL, "%p", ptr);
-       POST_PROBEBLOCK_MIDDLE_MEM(0, MEMORY_API_FREE, ptr);
-       POST_PROBEBLOCK_CALLSTACK();
+       POST_PACK_PROBEBLOCK_BEGIN();
        
        PREPARE_LOCAL_BUF();
        PACK_COMMON_BEGIN(MSG_PROBE_MEMORY, LC_MEMORY, "p", ptr);
@@ -108,7 +104,7 @@ void free(void *ptr)
        PACK_MEMORY(0, MEMORY_API_FREE, ptr);
        FLUSH_LOCAL_BUF();
        
-       POST_PROBEBLOCK_END();
+       POST_PACK_PROBEBLOCK_END();
 }
 
 /*     calloc's helper fucntion
@@ -134,7 +130,7 @@ void *temp_calloc(size_t nelem, size_t elsize)
 void *calloc(size_t nelem, size_t elsize)
 {
        static void *(*callocp)(size_t,size_t);
-       DECLARE_VARIABLE_STANDARD; log_t log;
+       DECLARE_VARIABLE_STANDARD;
        void *pret;
 
        if(!callocp) {
@@ -159,9 +155,7 @@ void *calloc(size_t nelem, size_t elsize)
                add_memory_hash(pret, nelem * elsize);
        }
 
-       POST_PROBEBLOCK_BEGIN(LC_MEMORY, VT_PTR, pret, "%u, %u", nelem, elsize);
-       POST_PROBEBLOCK_MIDDLE_MEM(nelem * elsize, MEMORY_API_ALLOC, pret);
-       APPEND_LOG_CALLSTACK();
+       POST_PACK_PROBEBLOCK_BEGIN();
        
        PREPARE_LOCAL_BUF();
        PACK_COMMON_BEGIN(MSG_PROBE_MEMORY, LC_MEMORY, "xx", nelem, elsize);
@@ -169,7 +163,7 @@ void *calloc(size_t nelem, size_t elsize)
        PACK_MEMORY(elsize, MEMORY_API_ALLOC, pret);
        FLUSH_LOCAL_BUF();
        
-       POST_PROBEBLOCK_END();
+       POST_PACK_PROBEBLOCK_END();
 
        return pret;
 }
@@ -177,7 +171,7 @@ void *calloc(size_t nelem, size_t elsize)
 void *realloc(void *memblock, size_t size)
 {
        static void *(*reallocp)(void *,size_t);
-       DECLARE_VARIABLE_STANDARD; log_t log;
+       DECLARE_VARIABLE_STANDARD;
        void *pret;
 
        GET_REAL_FUNC_RTLD_NEXT(realloc);
@@ -197,9 +191,7 @@ void *realloc(void *memblock, size_t size)
                add_memory_hash(pret, size);
        }
 
-       POST_PROBEBLOCK_BEGIN(LC_MEMORY, VT_PTR, pret, "%p, %u", memblock, size);
-       POST_PROBEBLOCK_MIDDLE_MEM(size, MEMORY_API_ALLOC, pret);
-       APPEND_LOG_CALLSTACK();
+       POST_PACK_PROBEBLOCK_BEGIN();
        
        PREPARE_LOCAL_BUF();
        PACK_COMMON_BEGIN(MSG_PROBE_MEMORY, LC_MEMORY, "px", memblock, size);
@@ -207,7 +199,7 @@ void *realloc(void *memblock, size_t size)
        PACK_MEMORY(size, MEMORY_API_ALLOC, pret);
        FLUSH_LOCAL_BUF();
        
-       POST_PROBEBLOCK_END();
+       POST_PACK_PROBEBLOCK_END();
 
        return pret;
 }

diff --git a/probe_memory/libdamemmanage.c b/probe_memory/libdamemmanage.c
index d1d1cad..48b6160 100644 (file)
--- a/probe_memory/libdamemmanage.c
+++ b/probe_memory/libdamemmanage.c
@@ -46,7 +46,7 @@ static enum DaOptions _sopt = OPT_ALLOC;
 void *memset(void *memblock, int c, size_t n)
 {
        static void *(*memsetp)(void *,int,size_t);
-       DECLARE_VARIABLE_STANDARD; log_t log;
+       DECLARE_VARIABLE_STANDARD;
        void *pret;
 
        GET_REAL_FUNC_RTLD_NEXT(memset);
@@ -55,9 +55,7 @@ void *memset(void *memblock, int c, size_t n)
 
        pret = memsetp(memblock, c, n);
 
-       POST_PROBEBLOCK_BEGIN(LC_MEMORY, VT_PTR, pret, "%p, %d, %u", memblock, c, n);
-       POST_PROBEBLOCK_MIDDLE_MEM(n, MEMORY_API_MANAGE, memblock);
-       POST_PROBEBLOCK_CALLSTACK();
+       POST_PACK_PROBEBLOCK_BEGIN();
                
        PREPARE_LOCAL_BUF();
        PACK_COMMON_BEGIN(MSG_PROBE_MEMORY, LC_MEMORY, "pdx", memblock, c, n);
@@ -65,7 +63,7 @@ void *memset(void *memblock, int c, size_t n)
        PACK_MEMORY(n, MEMORY_API_MANAGE, pret);
        FLUSH_LOCAL_BUF();
        
-       POST_PROBEBLOCK_END();
+       POST_PACK_PROBEBLOCK_END();
 
        return pret;
 }
@@ -73,7 +71,7 @@ void *memset(void *memblock, int c, size_t n)
 int memcmp(const void * ptr1, const void * ptr2, size_t num)
 {
        static int(*memcmpp)(const void *,const void *,size_t);
-       DECLARE_VARIABLE_STANDARD; log_t log;
+       DECLARE_VARIABLE_STANDARD;
 
        GET_REAL_FUNC_RTLD_NEXT(memcmp);
 
@@ -81,9 +79,7 @@ int memcmp(const void * ptr1, const void * ptr2, size_t num)
 
        ret = memcmpp(ptr1, ptr2, num);
 
-       POST_PROBEBLOCK_BEGIN(LC_MEMORY, VT_INT, ret, "%p, %p, %u", ptr1, ptr2, num);
-       POST_PROBEBLOCK_MIDDLE_MEM(num, MEMORY_API_MANAGE, ptr1);
-       POST_PROBEBLOCK_CALLSTACK();
+       POST_PACK_PROBEBLOCK_BEGIN();
                        
        PREPARE_LOCAL_BUF();
        PACK_COMMON_BEGIN(MSG_PROBE_MEMORY, LC_MEMORY, "ppx", ptr1, ptr2, num);
@@ -91,7 +87,7 @@ int memcmp(const void * ptr1, const void * ptr2, size_t num)
        PACK_MEMORY(num, MEMORY_API_MANAGE, ret);
        FLUSH_LOCAL_BUF();
        
-       POST_PROBEBLOCK_END();
+       POST_PACK_PROBEBLOCK_END();
 
        return ret;
 }
@@ -99,7 +95,7 @@ int memcmp(const void * ptr1, const void * ptr2, size_t num)
 void *memcpy(void * destination, const void * source, size_t num )
 {
        static void *(*memcpyp)(void *,const void *,size_t);
-       DECLARE_VARIABLE_STANDARD; log_t log;
+       DECLARE_VARIABLE_STANDARD;
        void *pret;
 
        GET_REAL_FUNC_RTLD_NEXT(memcpy);
@@ -108,9 +104,7 @@ void *memcpy(void * destination, const void * source, size_t num )
 
        pret = memcpyp(destination, source, num);
 
-       POST_PROBEBLOCK_BEGIN(LC_MEMORY, VT_PTR, pret, "%p, %p, %u", destination, source, num);
-       POST_PROBEBLOCK_MIDDLE_MEM(num, MEMORY_API_MANAGE, destination);
-       POST_PROBEBLOCK_CALLSTACK();
+       POST_PACK_PROBEBLOCK_BEGIN();
        
        PREPARE_LOCAL_BUF();
        PACK_COMMON_BEGIN(MSG_PROBE_MEMORY, LC_MEMORY, "ppx", destination, source, num);
@@ -118,7 +112,7 @@ void *memcpy(void * destination, const void * source, size_t num )
        PACK_MEMORY(num, MEMORY_API_MANAGE, pret);
        FLUSH_LOCAL_BUF();
        
-       POST_PROBEBLOCK_END();
+       POST_PACK_PROBEBLOCK_END();
 
        return pret;
 }

diff --git a/probe_memory/libdanew.cpp b/probe_memory/libdanew.cpp
index ffc3a49..f145f91 100644 (file)
--- a/probe_memory/libdanew.cpp
+++ b/probe_memory/libdanew.cpp
@@ -49,7 +49,7 @@ static enum DaOptions _sopt = OPT_ALLOC;
 void *operator new(std::size_t size) throw (std::bad_alloc)
 {
        static void*(*newp)(std::size_t size);
-       DECLARE_VARIABLE_STANDARD; log_t log;
+       DECLARE_VARIABLE_STANDARD;
        void *pret;
 
        GET_REAL_FUNCP_RTLD_NEXT_CPP(_Znwj,newp);
@@ -64,9 +64,7 @@ void *operator new(std::size_t size) throw (std::bad_alloc)
                add_memory_hash(pret, size);
        }
 
-       POST_PROBEBLOCK_BEGIN_MEM(LC_MEMORY, "new", VT_PTR, pret, "%u", size);
-       POST_PROBEBLOCK_MIDDLE_MEM(size, MEMORY_API_ALLOC, pret);
-       APPEND_LOG_CALLSTACK();
+       POST_PACK_PROBEBLOCK_BEGIN();
 
        PREPARE_LOCAL_BUF();
        PACK_COMMON_BEGIN(MSG_PROBE_MEMORY, LC_MEMORY, "x", size);
@@ -74,7 +72,7 @@ void *operator new(std::size_t size) throw (std::bad_alloc)
        PACK_MEMORY(size, MEMORY_API_ALLOC, pret);
        FLUSH_LOCAL_BUF();
 
-       POST_PROBEBLOCK_END();
+       POST_PACK_PROBEBLOCK_END();
 
        return pret;
 }
@@ -82,7 +80,7 @@ void *operator new(std::size_t size) throw (std::bad_alloc)
 void *operator new[](std::size_t size) throw (std::bad_alloc)
 {
        static void*(*newp)(std::size_t size);
-       DECLARE_VARIABLE_STANDARD; log_t log;
+       DECLARE_VARIABLE_STANDARD;
        void *pret;
 
        GET_REAL_FUNCP_RTLD_NEXT_CPP(_Znaj, newp);
@@ -97,9 +95,7 @@ void *operator new[](std::size_t size) throw (std::bad_alloc)
                add_memory_hash(pret, size);
        }
 
-       POST_PROBEBLOCK_BEGIN_MEM(LC_MEMORY, "new", VT_PTR, pret, "%u", size);
-       POST_PROBEBLOCK_MIDDLE_MEM(size, MEMORY_API_ALLOC, pret);
-       APPEND_LOG_CALLSTACK();
+       POST_PACK_PROBEBLOCK_BEGIN();
        
        PREPARE_LOCAL_BUF();
        PACK_COMMON_BEGIN(MSG_PROBE_MEMORY, LC_MEMORY, "x", size);
@@ -107,7 +103,7 @@ void *operator new[](std::size_t size) throw (std::bad_alloc)
        PACK_MEMORY(size, MEMORY_API_ALLOC, pret);
        FLUSH_LOCAL_BUF();
        
-       POST_PROBEBLOCK_END();
+       POST_PACK_PROBEBLOCK_END();
 
        return pret;
 }
@@ -115,7 +111,7 @@ void *operator new[](std::size_t size) throw (std::bad_alloc)
 void operator delete(void *ptr) throw()
 {
        static void (*deletep)(void *ptr);
-       DECLARE_VARIABLE_STANDARD; log_t log;
+       DECLARE_VARIABLE_STANDARD;
 
        GET_REAL_FUNCP_RTLD_NEXT_CPP(_ZdlPv, deletep);
 
@@ -129,9 +125,7 @@ void operator delete(void *ptr) throw()
 
        deletep(ptr);
 
-       POST_PROBEBLOCK_BEGIN_MEM(LC_MEMORY, "delete", VT_NULL, NULL, "%p", ptr);
-       POST_PROBEBLOCK_MIDDLE_MEM(0, MEMORY_API_FREE, ptr);
-       POST_PROBEBLOCK_CALLSTACK();
+       POST_PACK_PROBEBLOCK_BEGIN();
        
        PREPARE_LOCAL_BUF();
        PACK_COMMON_BEGIN(MSG_PROBE_MEMORY, LC_MEMORY, "p", ptr);
@@ -139,13 +133,13 @@ void operator delete(void *ptr) throw()
        PACK_MEMORY(0, MEMORY_API_FREE, ptr);
        FLUSH_LOCAL_BUF();
        
-       POST_PROBEBLOCK_END();
+       POST_PACK_PROBEBLOCK_END();
 }
 
 void operator delete[](void *ptr) throw()
 {
        static void (*deletep)(void *ptr);
-       DECLARE_VARIABLE_STANDARD; log_t log;
+       DECLARE_VARIABLE_STANDARD;
 
        GET_REAL_FUNCP_RTLD_NEXT_CPP(_ZdaPv, deletep);
 
@@ -159,9 +153,7 @@ void operator delete[](void *ptr) throw()
 
        deletep(ptr);
 
-       POST_PROBEBLOCK_BEGIN_MEM(LC_MEMORY, "delete", VT_NULL, NULL, "%p", ptr);
-       POST_PROBEBLOCK_MIDDLE_MEM(0, MEMORY_API_FREE, ptr);
-       POST_PROBEBLOCK_CALLSTACK();
+       POST_PACK_PROBEBLOCK_BEGIN();
        
        PREPARE_LOCAL_BUF();
        PACK_COMMON_BEGIN(MSG_PROBE_MEMORY, LC_MEMORY, "p", ptr);
@@ -169,13 +161,13 @@ void operator delete[](void *ptr) throw()
        PACK_MEMORY(0, MEMORY_API_FREE, ptr);
        FLUSH_LOCAL_BUF();
        
-       POST_PROBEBLOCK_END();
+       POST_PACK_PROBEBLOCK_END();
 }
 
 void *operator new(std::size_t size, const std::nothrow_t& nothrow) throw()
 {
        static void*(*newp)(std::size_t size, const std::nothrow_t& nothrow);
-       DECLARE_VARIABLE_STANDARD; log_t log;
+       DECLARE_VARIABLE_STANDARD;
        void *pret;
 
        GET_REAL_FUNCP_RTLD_NEXT_CPP(_ZnwjRKSt9nothrow_t, newp);
@@ -190,9 +182,7 @@ void *operator new(std::size_t size, const std::nothrow_t& nothrow) throw()
                add_memory_hash(pret, size);
        }
 
-       POST_PROBEBLOCK_BEGIN_MEM(LC_MEMORY, "new", VT_PTR, pret, "%u", size);
-       POST_PROBEBLOCK_MIDDLE_MEM(size, MEMORY_API_ALLOC, pret);
-       APPEND_LOG_CALLSTACK();
+       POST_PACK_PROBEBLOCK_BEGIN();
        
        PREPARE_LOCAL_BUF();
        PACK_COMMON_BEGIN(MSG_PROBE_MEMORY, LC_MEMORY, "xp", size, &nothrow);
@@ -200,7 +190,7 @@ void *operator new(std::size_t size, const std::nothrow_t& nothrow) throw()
        PACK_MEMORY(size, MEMORY_API_ALLOC, pret);
        FLUSH_LOCAL_BUF();
        
-       POST_PROBEBLOCK_END();
+       POST_PACK_PROBEBLOCK_END();
 
        return pret;
 }
@@ -208,7 +198,7 @@ void *operator new(std::size_t size, const std::nothrow_t& nothrow) throw()
 void *operator new[](std::size_t size, const std::nothrow_t& nothrow) throw()
 {
        static void*(*newp)(std::size_t size, const std::nothrow_t& nothrow);
-       DECLARE_VARIABLE_STANDARD; log_t log;
+       DECLARE_VARIABLE_STANDARD;
        void *pret;
 
        GET_REAL_FUNCP_RTLD_NEXT_CPP(_ZnajRKSt9nothrow_t, newp);
@@ -223,9 +213,7 @@ void *operator new[](std::size_t size, const std::nothrow_t& nothrow) throw()
                add_memory_hash(pret, size);
        }
 
-       POST_PROBEBLOCK_BEGIN_MEM(LC_MEMORY, "new", VT_PTR, pret, "%u", size);
-       POST_PROBEBLOCK_MIDDLE_MEM(size, MEMORY_API_ALLOC, pret);
-       APPEND_LOG_CALLSTACK();
+       POST_PACK_PROBEBLOCK_BEGIN();
        
        PREPARE_LOCAL_BUF();
        PACK_COMMON_BEGIN(MSG_PROBE_MEMORY, LC_MEMORY, "xp", size, &nothrow);
@@ -233,7 +221,7 @@ void *operator new[](std::size_t size, const std::nothrow_t& nothrow) throw()
        PACK_MEMORY(size, MEMORY_API_ALLOC, pret);
        FLUSH_LOCAL_BUF();
        
-       POST_PROBEBLOCK_END();
+       POST_PACK_PROBEBLOCK_END();
 
        return pret;
 }
@@ -241,7 +229,7 @@ void *operator new[](std::size_t size, const std::nothrow_t& nothrow) throw()
 void operator delete(void *ptr, const std::nothrow_t& nothrow) throw()
 {
        static void (*deletep)(void *ptr, const std::nothrow_t& nothrow);
-       DECLARE_VARIABLE_STANDARD; log_t log;
+       DECLARE_VARIABLE_STANDARD;
 
        GET_REAL_FUNCP_RTLD_NEXT_CPP(_ZdlPvRKSt9nothrow_t, deletep);
 
@@ -255,9 +243,7 @@ void operator delete(void *ptr, const std::nothrow_t& nothrow) throw()
 
        deletep(ptr, nothrow);
 
-       POST_PROBEBLOCK_BEGIN_MEM(LC_MEMORY, "delete", VT_NULL, NULL, "%p", ptr);
-       POST_PROBEBLOCK_MIDDLE_MEM(0, MEMORY_API_FREE, ptr);
-       POST_PROBEBLOCK_CALLSTACK();
+       POST_PACK_PROBEBLOCK_BEGIN();
        
        PREPARE_LOCAL_BUF();
        PACK_COMMON_BEGIN(MSG_PROBE_MEMORY, LC_MEMORY, "pp", ptr, &nothrow);
@@ -265,13 +251,13 @@ void operator delete(void *ptr, const std::nothrow_t& nothrow) throw()
        PACK_MEMORY(0, MEMORY_API_FREE, ptr);
        FLUSH_LOCAL_BUF();
        
-       POST_PROBEBLOCK_END();
+       POST_PACK_PROBEBLOCK_END();
 }
 
 void operator delete[](void *ptr, const std::nothrow_t& nothrow) throw()
 {
        static void (*deletep)(void *ptr, const std::nothrow_t& nothrow);
-       DECLARE_VARIABLE_STANDARD; log_t log;
+       DECLARE_VARIABLE_STANDARD;
 
        GET_REAL_FUNCP_RTLD_NEXT_CPP(_ZdaPvRKSt9nothrow_t, deletep);
 
@@ -285,9 +271,7 @@ void operator delete[](void *ptr, const std::nothrow_t& nothrow) throw()
 
        deletep(ptr, nothrow);
 
-       POST_PROBEBLOCK_BEGIN_MEM(LC_MEMORY, "delete", VT_NULL, NULL, "%p", ptr);
-       POST_PROBEBLOCK_MIDDLE_MEM(0, MEMORY_API_FREE, ptr);
-       POST_PROBEBLOCK_CALLSTACK();
+       POST_PACK_PROBEBLOCK_BEGIN();
                
        PREPARE_LOCAL_BUF();
        PACK_COMMON_BEGIN(MSG_PROBE_MEMORY, LC_MEMORY, "pp", ptr, &nothrow);
@@ -295,6 +279,6 @@ void operator delete[](void *ptr, const std::nothrow_t& nothrow) throw()
        PACK_MEMORY(0, MEMORY_API_FREE, ptr);
        FLUSH_LOCAL_BUF();
        
-       POST_PROBEBLOCK_END();
+       POST_PACK_PROBEBLOCK_END();
 }