Changeset 430548b

Timestamp:

05/28/15 21:24:13 (10 years ago)

Author:

Hal Finkel <hfinkel@…>

Branches:

master

Children:

3105f50

Parents:

fc0b9bf

git-author:

Hal Finkel <hfinkel@…> (05/28/15 21:24:13)

git-committer:

Hal Finkel <hfinkel@…> (05/28/15 21:24:13)

Message:

a working solution for static linking

Files:

• Makefile (modified) (2 diffs)
• memlog.c (modified) (15 diffs)

Makefile

@@ -5 +5 @@
 LDFLAGS = -lpthread -ldl
 
-all: libmemlog.so libmemlog.a
+all: libmemlog.so memlog.o
 
-libmemlog.a: memlog.c
-        rm -f memlog.o
+memlog.o: memlog.c
         $(CC) $(CPPFLAGS) $(CFLAGS) -c -o memlog.o memlog.c
-        ar cr libmemlog.a memlog.o
-        ranlib libmemlog.a
 
 libmemlog.so: memlog.c
@@ -17 +14 @@
 
 clean:
-        rm -f memlog.o libmemlog.a libmemlog.so
+        rm -f memlog.o libmemlog.so
 

memlog.c

@@ -8 +8 @@
 #include <string.h>
 
+#include <malloc.h>
 #include <execinfo.h>
 #include <sys/syscall.h>
@@ -54 +55 @@
 }
 
-static void print_context(void *caller) {
+static void print_context(const void *caller) {
   struct rusage usage;
   if (getrusage(RUSAGE_SELF, &usage)) {
@@ -68 +69 @@
 
   int found_caller = 0;
-  caller =  __builtin_extract_return_addr(caller);
+  caller =  __builtin_extract_return_addr((void*) caller);
   for (int pci = 0; pci < num_pcs; ++pci) {
     intptr_t pc = (intptr_t) pcs[pci];
@@ -120 +121 @@
 }
 
-static void record_malloc(size_t size, void *ptr, void *caller) {
+static void record_malloc(size_t size, void *ptr, const void *caller) {
   if (!log_file)
     return;
@@ -135 +136 @@
 }
 
-static void record_free(void *ptr, void *caller) {
+static void record_free(void *ptr, const void *caller) {
   if (!log_file)
     return;
@@ -158 +159 @@
 extern void __libc_free(void *ptr);
 
-void *malloc(size_t size) {
+#ifdef __PIC__
+#define FUNC(x) x
+#else
+#define FUNC(x) __wrap_ ## x
+#endif
+
+void *FUNC(malloc)(size_t size) {
+  const void *caller = __builtin_return_address(0);
+
   if (in_malloc)
     return __libc_malloc(size);
@@ -166 +175 @@
   void *ptr = __libc_malloc(size);
 
-  void *caller = __builtin_return_address(0);
   record_malloc(size, ptr, caller);
 
@@ -173 +181 @@
 }
 
-void *realloc(void *ptr, size_t size) {
+void *FUNC(realloc)(void *ptr, size_t size) {
+  const void *caller = __builtin_return_address(0);
+
   if (in_malloc)
     return __libc_realloc(ptr, size);
@@ -181 +191 @@
   void *nptr = __libc_realloc(ptr, size);
 
-  void *caller = __builtin_return_address(0);
   if (ptr)
     record_free(ptr, caller);
@@ -191 +200 @@
 }
 
-void *calloc(size_t nmemb, size_t size) {
+void *FUNC(calloc)(size_t nmemb, size_t size) {
+  const void *caller = __builtin_return_address(0);
+
   if (in_malloc)
     return __libc_calloc(nmemb, size);
@@ -199 +210 @@
   void *ptr = __libc_calloc(nmemb, size);
 
-  void *caller = __builtin_return_address(0);
   record_malloc(nmemb*size, ptr, caller);
 
@@ -207 +217 @@
 }
 
-void *memalign(size_t boundary, size_t size) {
+void *FUNC(memalign)(size_t boundary, size_t size) {
+  const void *caller = __builtin_return_address(0);
+
   if (in_malloc)
     return __libc_memalign(boundary, size);
@@ -215 +227 @@
   void *ptr = __libc_memalign(boundary, size);
 
-  void *caller = __builtin_return_address(0);
   record_malloc(size, ptr, caller);
 
@@ -223 +234 @@
 }
 
-void free(void *ptr) {
+void FUNC(free)(void *ptr) {
+  const void *caller = __builtin_return_address(0);
+
   if (in_malloc || !ptr)
     return __libc_free(ptr);
@@ -229 +242 @@
   in_malloc = 1;
 
-  void *caller = __builtin_return_address(0);
   record_free(ptr, caller);