Changeset 1645 for zzuf/trunkTweet

Timestamp:

Jan 10, 2007, 6:31:58 PM (16 years ago)

Author:

Sam Hocevar

Message:

• Removed brk/sbrk, they're so outdated and useless.

Location:

zzuf/trunk

Files:

• doc/zzuf.1 (modified) (1 diff)
• src/load-mem.c (modified) (4 diffs)

zzuf/trunk/doc/zzuf.1

@@ -291 +291 @@
 Memory management:
 \fBmmap\fR(), \fBmunmap\fR(), \fBmalloc\fR(), \fBcalloc\fR(), \fBvalloc\fR(),
-\fBfree\fR(), \fBmemalign\fR(), \fBposix_memalign\fR(), \fBbrk\fR(),
-\fBsbrk\fR()
+\fBfree\fR(), \fBmemalign\fR(), \fBposix_memalign\fR()
 .TP
 Linux-specific:

zzuf/trunk/src/load-mem.c

@@ -54 +54 @@
 #include "fd.h"
 
+/* TODO: mremap, maybe brk/sbrk */
+
 /* Library functions that we divert */
 static void *  (*calloc_orig)   (size_t nmemb, size_t size);
@@ -67 +69 @@
 #endif
 static void *  (*realloc_orig)  (void *ptr, size_t size);
-static int     (*brk_orig)      (void *end_data_segment);
-static void *  (*sbrk_orig)     (intptr_t increment);
 
 static void *  (*mmap_orig)     (void *start, size_t length, int prot,
                                  int flags, int fd, off_t offset);
-/* TODO */
-/* static void *  (*mremap_orig)   (void *old_address, size_t old_size,
-                                 size_t new_size, int flags); */
 #ifdef HAVE_MMAP64
 static void *  (*mmap64_orig)   (void *start, size_t length, int prot,
@@ -99 +96 @@
     LOADSYM(posix_memalign);
 #endif
-    LOADSYM(brk);
-    LOADSYM(sbrk);
 
     LOADSYM(mmap);
@@ -202 +197 @@
 }
 #endif
-
-int brk(void *end_data_segment)
-{
-    int ret;
-    if(!_zz_ready)
-        LOADSYM(brk);
-    ret = brk_orig(end_data_segment);
-    if(ret == -1 && _zz_memory && errno == ENOMEM)
-        raise(SIGKILL);
-    return ret;
-}
-
-void *sbrk(intptr_t increment)
-{
-    void *ret;
-    if(!_zz_ready)
-        LOADSYM(sbrk);
-    ret = sbrk_orig(increment);
-    if(ret == (void *)-1 && _zz_memory && errno == ENOMEM)
-        raise(SIGKILL);
-    return ret;
-}
 
 /* Table used for mmap() and munmap() */