PERFORCE change 143155 for review

John Birrell jb at FreeBSD.org
Mon Jun 9 03:07:27 UTC 2008


http://perforce.freebsd.org/chv.cgi?CH=143155

Change 143155 by jb at freebsd3 on 2008/06/09 03:06:46

	Backout code that is now implemented via event handler hooks.

Affected files ...

.. //depot/projects/dtrace6/src/sys/kern/init_main.c#4 edit
.. //depot/projects/dtrace6/src/sys/kern/kern_thread.c#5 edit

Differences ...

==== //depot/projects/dtrace6/src/sys/kern/init_main.c#4 (text+ko) ====

@@ -99,15 +99,6 @@
 struct	vmspace vmspace0;
 struct	proc *initproc;
 
-/* DTrace data for the primary thread in proc0. */
-char	kdtrace_thread0[KDTRACE_THREAD_SIZE];
-
-/* Offset from 'struct thread *' to the opaque DTrace fields. */
-int	kdtrace_thread_offset;
-
-/* Overall per-thread allocation size. */
-int	kdtrace_thread_size;
-
 int	boothowto = 0;		/* initialized so that it can be patched */
 SYSCTL_INT(_debug, OID_AUTO, boothowto, CTLFLAG_RD, &boothowto, 0, "");
 int	bootverbose;
@@ -187,18 +178,6 @@
 	int verbose;
 #endif
 
-	/* Get the size of 'struct thread' plus 'struct td_sched' */
-	kdtrace_thread_offset = sched_sizeof_thread();
-
-	/*
-	 * Allow for the DTrace-specific thread data after
-	 * struct td_sched. This space is allocated opaquely to
-	 * avoid license issues. The value of KDTRACE_THREAD_SIZE
-	 * set in sys/proc.h must be larger than that required by
-	 * the DTrace kernel modules.
-	 */
-	kdtrace_thread_size = kdtrace_thread_offset + KDTRACE_THREAD_SIZE;
-
 	if (sysinit == NULL) {
 		sysinit = SET_BEGIN(sysinit_set);
 		sysinit_end = SET_LIMIT(sysinit_set);

==== //depot/projects/dtrace6/src/sys/kern/kern_thread.c#5 (text+ko) ====

@@ -308,7 +308,7 @@
 	mtx_init(&tid_lock, "TID lock", NULL, MTX_DEF);
 	tid_unrhdr = new_unrhdr(PID_MAX + 1, INT_MAX, &tid_lock);
 
-	thread_zone = uma_zcreate("THREAD", kdtrace_thread_size,
+	thread_zone = uma_zcreate("THREAD", sched_sizeof_thread(),
 	    thread_ctor, thread_dtor, thread_init, thread_fini,
 	    THREAD_ALIGN - 1, 0);
 	ksegrp_zone = uma_zcreate("KSEGRP", sched_sizeof_ksegrp(),


More information about the p4-projects mailing list