summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--linuxthreads/ChangeLog22
-rw-r--r--malloc/mtrace.c30
3 files changed, 41 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog
index 3ad6c72dd4..ab7ddd011c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
1998-10-29 Ulrich Drepper <drepper@cygnus.com>
+ * malloc/mtrace.c (tr_where): Replace snprintf call by mempcpy and
+ _fitoa.
+
* sysdeps/unix/sysv/linux/ttyname_r.c (ttyname_r): Try reading
/prof/self/fd/FD first.
* sysdeps/unix/sysv/linux/ttyname.c (ttyname): Likewise.
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index 635bc634dd..dc044ad2ae 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,3 +1,25 @@
+1998-10-29 14:28 Ulrich Drepper <drepper@cygnus.com>
+
+ * spinlock.h (__pthread_trylock): Define inline.
+ (__pthread_lock): Add extra parameter to declaration. Declare
+ using internal_function.
+ (__pthread_unlock): Declare using internal_function.
+ * spinlock.c (__pthread_lock): Add new parameter. Use it instead
+ of local variable self. Avoid recomputing self. Define using
+ internal_function.
+ (__pthread_trylock): Remove.
+ (__pthread_unlock): Define using internal_function.
+ * cancel.c: Adjust for __pthread_lock interface change. Use already
+ computed self value is possible.
+ * condvar.c: Likewise.
+ * join.c: Likewise.
+ * manager.c: Likewise.
+ * mutex.c: Likewise.
+ * pthread.c: Likewise.
+ * rwlock.c: Likewise.
+ * semaphore.c: Likewise.
+ * signals.c: Likewise.
+
1998-10-27 13:46 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/pthread/pthread.h (struct _pthread_cleanup_buffer): Prepend
diff --git a/malloc/mtrace.c b/malloc/mtrace.c
index 8dd711a3a7..d15569c9d6 100644
--- a/malloc/mtrace.c
+++ b/malloc/mtrace.c
@@ -32,14 +32,11 @@
#include <stdio.h>
#include <string.h>
-
-#ifndef __GNU_LIBRARY__
-extern char *getenv ();
-#else
#include <stdlib.h>
-#endif
-#if defined _LIBC && defined USE_IN_LIBIO
+#include <stdio-common/_itoa.h>
+
+#ifdef USE_IN_LIBIO
# include <libio/iolibio.h>
# define setvbuf(s, b, f, l) _IO_setvbuf (s, b, f, l)
#endif
@@ -99,14 +96,19 @@ tr_where (caller)
char *buf = (char *) "";
if (info.dli_sname && info.dli_sname[0])
{
- size_t len = strlen (info.dli_sname) + 22;
- buf = alloca (len);
- if (caller >= (const __ptr_t) info.dli_saddr)
- snprintf (buf, len, "(%s+0x%x)", info.dli_sname,
- caller - (const __ptr_t) info.dli_saddr);
- else
- snprintf (buf, len, "(%s-0x%x)", info.dli_sname,
- (const __ptr_t) info.dli_saddr - caller);
+ size_t len = strlen (info.dli_sname);
+ buf = alloca (len + 6 + 2 * sizeof (void *));
+
+ buf[0] = '(';
+ __stpcpy (_fitoa (caller >= (const __ptr_t) info.dli_saddr
+ ? caller - (const __ptr_t) info.dli_saddr
+ : (const __ptr_t) info.dli_saddr - caller,
+ __stpcpy (__mempcpy (buf + 1, info.dli_sname,
+ len),
+ caller >= (__ptr_t) info.dli_saddr
+ ? "+0x" : "-0x"),
+ 16, 0),
+ ")");
}
fprintf (mallstream, "@ %s%s%s[%p] ",