diff options
author | Jason Evans <je@facebook.com> | 2010-03-04 01:45:38 (GMT) |
---|---|---|
committer | Jason Evans <je@facebook.com> | 2010-03-04 01:45:38 (GMT) |
commit | 698805c5252465ddbdcf7048e5ccf16d02533877 (patch) | |
tree | eb6a93dfead69108007951c62f051b38ae2bdb20 /jemalloc/doc | |
parent | cfeccd34a37a83804ed56e4562103a6e6f6cabec (diff) | |
download | jemalloc-698805c5252465ddbdcf7048e5ccf16d02533877.zip jemalloc-698805c5252465ddbdcf7048e5ccf16d02533877.tar.gz jemalloc-698805c5252465ddbdcf7048e5ccf16d02533877.tar.bz2 |
Simplify malloc_message().
Rather than passing four strings to malloc_message(), malloc_write4(),
and all the functions that use them, only pass one string.
Diffstat (limited to 'jemalloc/doc')
-rw-r--r-- | jemalloc/doc/jemalloc.3.in | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/jemalloc/doc/jemalloc.3.in b/jemalloc/doc/jemalloc.3.in index fca1106..6787b97 100644 --- a/jemalloc/doc/jemalloc.3.in +++ b/jemalloc/doc/jemalloc.3.in @@ -71,7 +71,7 @@ .Ft size_t .Fn @jemalloc_prefix@malloc_usable_size "const void *ptr" .Ft void -.Fn @jemalloc_prefix@malloc_stats_print "void (*write4)(void *" "const char *" "const char *" "const char *" "const char *)" "const char *opts" +.Fn @jemalloc_prefix@malloc_stats_print "void (*write_cb)(void *" "const char *)" "const char *opts" .Ft int .Fn @jemalloc_prefix@mallctl "const char *name" "void *oldp" "size_t *oldlenp" "void *newp" "size_t newlen" .Ft int @@ -81,7 +81,7 @@ .Ft const char * .Va @jemalloc_prefix@malloc_options ; .Ft void -.Fn \*(lp*@jemalloc_prefix@malloc_message\*(rp "void *w4opaque" "const char *p1" "const char *p2" "const char *p3" "const char *p4" +.Fn \*(lp*@jemalloc_prefix@malloc_message\*(rp "void *cbopaque" "const char *s" .Sh DESCRIPTION The .Fn @jemalloc_prefix@malloc @@ -178,15 +178,15 @@ implementation-dependent. The .Fn @jemalloc_prefix@malloc_stats_print function writes human-readable summary statistics via the -.Fa write4 +.Fa write_cb callback function pointer and -.Fa w4opaque +.Fa cbopaque data passed to -.Fn write4 , +.Fn write_cb , or .Fn @jemalloc_prefix@malloc_message if -.Fa write4 +.Fa write_cb is .Dv NULL . This function can be called repeatedly. @@ -1315,12 +1315,12 @@ strings forming the errors and warnings if for some reason the file descriptor is not suitable for this. .Va @jemalloc_prefix@malloc_message takes the -.Fa w4opaque +.Fa cbopaque pointer argument that is .Dv NULL unless overridden by the arguments in a call to .Fn @jemalloc_prefix@malloc_stats_print , -followed by four string pointers. +followed by a string pointer. Please note that doing anything which tries to allocate memory in this function is likely to result in a crash or deadlock. .Pp |