PERFORCE change 132148 for review
John Birrell
jb at FreeBSD.org
Sun Dec 30 20:27:50 PST 2007
http://perforce.freebsd.org/chv.cgi?CH=132148
Change 132148 by jb at jb_freebsd1 on 2007/12/31 04:27:40
Remove the M_DTRACE memory type and be consistent about using the
kmem implementation in the opensolaris module.
Affected files ...
.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_load.c#21 edit
.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_sysctl.c#3 edit
.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_unload.c#18 edit
Differences ...
==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_load.c#21 (text+ko) ====
@@ -145,7 +145,7 @@
if (dtrace_helptrace_enabled) {
ASSERT(dtrace_helptrace_buffer == NULL);
dtrace_helptrace_buffer =
- malloc(dtrace_helptrace_bufsize, M_DTRACE, M_NOWAIT | M_ZERO);
+ kmem_zalloc(dtrace_helptrace_bufsize, KM_SLEEP);
dtrace_helptrace_next = 0;
}
==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_sysctl.c#3 (text+ko) ====
@@ -47,7 +47,7 @@
prov = prov->dtpv_next;
}
- if ((p_name = malloc(len, M_DTRACE, M_NOWAIT)) == NULL)
+ if ((p_name = kmem_alloc(len, KM_SLEEP)) == NULL)
error = ENOMEM;
else {
/* Start with an empty string. */
@@ -73,7 +73,7 @@
if (p_name != NULL) {
error = sysctl_handle_string(oidp, p_name, len, req);
- free(p_name, M_DTRACE);
+ kmem_free(p_name, 0);
}
return (error);
==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_unload.c#18 (text+ko) ====
@@ -103,7 +103,7 @@
mutex_exit(&cpu_lock);
if (dtrace_helptrace_enabled) {
- free(dtrace_helptrace_buffer, M_DTRACE);
+ kmem_free(dtrace_helptrace_buffer, 0);
dtrace_helptrace_buffer = NULL;
}
More information about the p4-projects
mailing list