PennMUSH Community
Show
Ignore:
Timestamp:
07/08/07 20:50:12 (1 year ago)
Author:
shawnw
Message:

Merged 1.8.3p4 into trunk

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • 1.8.3/trunk/hdrs/csrimalloc.h

    r919 r1032  
    2222/* Tracing malloc definitions - helps find leaks */ 
    2323 
    24 extern univptr_t trace__malloc 
    25 _((size_t nbytes, const char *fname, int linenum)); 
    26 extern univptr_t trace__calloc 
    27 _((size_t nelem, size_t elsize, const char *fname, int linenum)); 
    28 extern univptr_t trace__realloc 
    29 _((univptr_t cp, size_t nbytes, const char *fname, int linenum)); 
    30 extern univptr_t trace__valloc _((size_t size, const char *fname, int linenum)); 
    31 extern univptr_t trace__memalign 
    32 _((size_t alignment, size_t size, const char *fname, int linenum)); 
    33 extern univptr_t trace__emalloc 
    34 _((size_t nbytes, const char *fname, int linenum)); 
    35 extern univptr_t trace__ecalloc 
    36 _((size_t nelem, size_t sz, const char *fname, int linenum)); 
    37 extern univptr_t trace__erealloc 
    38 _((univptr_t ptr, size_t nbytes, const char *fname, int linenum)); 
    39 extern char *trace__strdup _((const char *s, const char *fname, int linenum)); 
    40 extern char *trace__strsave _((const char *s, const char *fname, int linenum)); 
    41 extern void trace__free _((univptr_t cp, const char *fname, int linenum)); 
    42 extern void trace__cfree _((univptr_t cp, const char *fname, int linenum)); 
     24univptr_t trace__malloc(size_t nbytes, const char *fname, int linenum); 
     25univptr_t trace__calloc 
     26  (size_t nelem, size_t elsize, const char *fname, int linenum); 
     27univptr_t trace__realloc 
     28  (univptr_t cp, size_t nbytes, const char *fname, int linenum); 
     29univptr_t trace__valloc(size_t size, const char *fname, int linenum); 
     30univptr_t trace__memalign 
     31  (size_t alignment, size_t size, const char *fname, int linenum); 
     32univptr_t trace__emalloc(size_t nbytes, const char *fname, int linenum); 
     33univptr_t trace__ecalloc 
     34  (size_t nelem, size_t sz, const char *fname, int linenum); 
     35univptr_t trace__erealloc 
     36  (univptr_t ptr, size_t nbytes, const char *fname, int linenum); 
     37char *trace__strdup(const char *s, const char *fname, int linenum); 
     38char *trace__strsave(const char *s, const char *fname, int linenum); 
     39void trace__free(univptr_t cp, const char *fname, int linenum); 
     40void trace__cfree(univptr_t cp, const char *fname, int linenum); 
    4341 
    4442#define malloc(x)               trace__malloc((x), __FILE__, __LINE__) 
    …… 
    5856#else                           /* CSRI_TRACE */ 
    5957 
    60 extern univptr_t malloc _((size_t nbytes)); 
    61 extern univptr_t calloc _((size_t nelem, size_t elsize)); 
    62 extern univptr_t realloc _((univptr_t cp, size_t nbytes)); 
    63 extern univptr_t valloc _((size_t size)); 
    64 extern univptr_t memalign _((size_t alignment, size_t size)); 
    65 extern univptr_t emalloc _((size_t nbytes)); 
    66 extern univptr_t ecalloc _((size_t nelem, size_t sz)); 
    67 extern univptr_t erealloc _((univptr_t ptr, size_t nbytes)); 
    68 extern char *strdup _((const char *s)); 
    69 extern char *strsave _((const char *s)); 
    70 extern Free_t free _((univptr_t cp)); 
    71 extern Free_t cfree _((univptr_t cp)); 
     58univptr_t malloc(size_t nbytes); 
     59univptr_t calloc(size_t nelem, size_t elsize); 
     60univptr_t realloc(univptr_t cp, size_t nbytes); 
     61univptr_t valloc(size_t size); 
     62univptr_t memalign(size_t alignment, size_t size); 
     63univptr_t emalloc(size_t nbytes); 
     64univptr_t ecalloc(size_t nelem, size_t sz); 
     65univptr_t erealloc(univptr_t ptr, size_t nbytes); 
     66char *strdup(const char *s); 
     67char *strsave(const char *s); 
     68void free(univptr_t cp); 
     69void cfree(univptr_t cp); 
    7270 
    7371#endif                          /* CSRI_TRACE */ 
    7472 
    75 extern void mal_debug _((int level)); 
    76 extern void mal_dumpleaktrace _((FILE * fp)); 
    77 extern void mal_heapdump _((FILE * fp)); 
    78 extern void mal_leaktrace _((int value)); 
    79 extern void mal_sbrkset _((int n)); 
    80 extern void mal_slopset _((int n)); 
    81 extern void mal_statsdump _((FILE * fp)); 
    82 extern void mal_setstatsfile _((FILE * fp)); 
    83 extern void mal_trace _((int value)); 
    84 extern int mal_verify _((int fullcheck)); 
    85 extern void mal_mmap _((char *fname)); 
     73void mal_debug(int level); 
     74void mal_dumpleaktrace(FILE * fp); 
     75void mal_heapdump(FILE * fp); 
     76void mal_leaktrace(int value); 
     77void mal_sbrkset(int n); 
     78void mal_slopset(int n); 
     79void mal_statsdump(FILE * fp); 
     80void mal_setstatsfile(FILE * fp); 
     81void mal_trace(int value); 
     82int mal_verify(int fullcheck); 
     83void mal_mmap(char *fname); 
    8684 
    8785