summaryrefslogtreecommitdiff
path: root/lib/libc/stdlib/malloc.c
diff options
context:
space:
mode:
authorjdolecek <jdolecek@NetBSD.org>2001-01-05 22:29:28 +0000
committerjdolecek <jdolecek@NetBSD.org>2001-01-05 22:29:28 +0000
commit75ee9a37ddad65f31babe96ab94b1664b8a470e4 (patch)
treed1582b14b0f479d0d7316ff61f9933e5f8b0c1d1 /lib/libc/stdlib/malloc.c
parentc8ff0e782d547e415a1d990f9f5cab359ddcca49 (diff)
we now have utrace, support it here
Diffstat (limited to 'lib/libc/stdlib/malloc.c')
-rw-r--r--lib/libc/stdlib/malloc.c25
1 files changed, 17 insertions, 8 deletions
diff --git a/lib/libc/stdlib/malloc.c b/lib/libc/stdlib/malloc.c
index 653b0e72fcc..bb2c285e3f8 100644
--- a/lib/libc/stdlib/malloc.c
+++ b/lib/libc/stdlib/malloc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: malloc.c,v 1.34 2000/12/20 20:56:01 christos Exp $ */
+/* $NetBSD: malloc.c,v 1.35 2001/01/05 22:29:28 jdolecek Exp $ */
/*
* ----------------------------------------------------------------------------
@@ -47,9 +47,12 @@
# if defined(__alpha__)
# define malloc_minsize 16U
# endif
-# if !defined(__NETBSD_SYSCALLS)
-# define HAS_UTRACE
-# endif
+# define HAS_UTRACE
+# define UTRACE_LABEL
+
+#include <sys/cdefs.h>
+void utrace __P((struct ut *, int));
+
/*
* Make malloc/free/realloc thread-safe in libc for use with
* kernel threads.
@@ -63,6 +66,11 @@
#if defined(__NetBSD__)
# define malloc_minsize 16U
+# define HAS_UTRACE
+# define UTRACE_LABEL "malloc",
+#include <sys/cdefs.h>
+#include <sys/types.h>
+int utrace __P((const char *, void *, size_t));
#endif /* __NetBSD__ */
#if defined(__sparc__) && defined(sun)
@@ -229,11 +237,12 @@ static int malloc_utrace;
struct ut { void *p; size_t s; void *r; };
-void utrace __P((struct ut *, int));
-
#define UTRACE(a, b, c) \
- if (malloc_utrace) \
- {struct ut u; u.p=a; u.s = b; u.r=c; utrace(&u, sizeof u);}
+ if (malloc_utrace) { \
+ struct ut u; \
+ u.p=a; u.s = b; u.r=c; \
+ utrace(UTRACE_LABEL (void *) &u, sizeof u); \
+ }
#else /* !HAS_UTRACE */
#define UTRACE(a,b,c)
#endif /* HAS_UTRACE */