PERFORCE change 107729 for review

[John Birrell]

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

Change 107729 by jb at jb_freebsd8 on 2006/10/12 03:31:11

	Remove my experimental threads-in-libc.

Affected files ...

.. //depot/projects/dtrace/src/lib/libc/gen/Makefile.inc#7 edit
.. //depot/projects/dtrace/src/lib/libthr/thread/Makefile.inc#6 edit
.. //depot/projects/dtrace/src/lib/libthr/thread/pthread_create.c#3 delete
.. //depot/projects/dtrace/src/lib/libthr/thread/pthread_exit.c#2 delete
.. //depot/projects/dtrace/src/lib/libthr/thread/pthread_kill.c#2 delete
.. //depot/projects/dtrace/src/lib/libthr/thread/pthread_self.c#2 delete
.. //depot/projects/dtrace/src/lib/libthr/thread/thr_init.c#10 edit

Differences ...

==== //depot/projects/dtrace/src/lib/libc/gen/Makefile.inc#7 (text+ko) ====

@@ -4,7 +4,7 @@
 # machine-independent gen sources
 .PATH: ${.CURDIR}/${MACHINE_ARCH}/gen ${.CURDIR}/gen
 
-SRCS+=  __xuname.c _rand48.c _thread_init.c \
+SRCS+=  __xuname.c _pthread_stubs.c _rand48.c _spinlock_stub.c _thread_init.c \
 	alarm.c arc4random.c assert.c basename.c check_utility_compat.c \
 	clock.c closedir.c confstr.c \
 	crypt.c ctermid.c daemon.c devname.c dirname.c disklabel.c \
@@ -33,10 +33,6 @@
 	usleep.c utime.c valloc.c vis.c wait.c wait3.c waitpid.c \
 	wordexp.c
 
-.if ${MK_LIBC_THREADS} == "no"
-SRCS+=	_pthread_stubs.c _spinlock_stub.c
-.endif
-
 SYM_MAPS+=${.CURDIR}/gen/Symbol.map
 
 # machine-dependent gen sources

==== //depot/projects/dtrace/src/lib/libthr/thread/Makefile.inc#6 (text+ko) ====

@@ -4,10 +4,6 @@
 .PATH: ${.CURDIR}/thread
 
 SRCS+= \
-	pthread_create.c \
-	pthread_exit.c \
-	pthread_kill.c \
-	pthread_self.c \
 	thr_attr.c \
 	thr_barrier.c \
 	thr_barrierattr.c \
@@ -16,9 +12,11 @@
 	thr_concurrency.c \
 	thr_cond.c \
 	thr_condattr.c \
+	thr_create.c \
 	thr_detach.c \
 	thr_equal.c \
 	thr_event.c \
+	thr_exit.c \
 	thr_fork.c \
 	thr_getprio.c \
 	thr_getschedparam.c \
@@ -27,6 +25,7 @@
 	thr_join.c \
 	thr_list.c \
 	thr_kern.c \
+	thr_kill.c \
 	thr_main_np.c \
 	thr_multi_np.c \
 	thr_mutex.c \
@@ -38,6 +37,7 @@
 	thr_rtld.c \
 	thr_rwlock.c \
 	thr_rwlockattr.c \
+	thr_self.c \
 	thr_sem.c \
 	thr_setprio.c \
 	thr_setschedparam.c \

==== //depot/projects/dtrace/src/lib/libthr/thread/thr_init.c#10 (text+ko) ====

@@ -120,7 +120,6 @@
 static void init_private(void);
 static void init_main_thread(struct pthread *thread);
 
-#ifndef LIBC_THREADS
 /*
  * All weak references used within libc should be in this table.
  * This is so that static libraries will work.
@@ -248,7 +247,6 @@
 	{DUAL_ENTRY(_pthread_sigmask)},		/* PJT_SIGMASK */
 	{DUAL_ENTRY(_pthread_testcancel)}	/* PJT_TESTCANCEL */
 };
-#endif
 
 static int init_once = 0;
 
@@ -295,7 +293,6 @@
 		/* Only initialize the threaded application once. */
 		return;
 
-#ifndef LIBC_THREADS
 	/*
 	 * Check the size of the jump table to make sure it is preset
 	 * with the correct number of entries.
@@ -303,7 +300,6 @@
 	if (sizeof(jmp_table) != (sizeof(pthread_func_t) * PJT_MAX * 2))
 		PANIC("Thread jump table not properly initialized");
 	memcpy(__thr_jtable, jmp_table, sizeof(jmp_table));
-#endif
 
 	/*
 	 * Check for the special case of this process running as