Submitted by: John Birrell <cimaxp1!jb@werple.net.au>

Here are the diffs for libc_r to get it one step closer to P1003.1c
These make most of the thread/mutex/condvar structures opaque to the
user. There are three functions which have been renamed with _np
suffixes because they are extensions to P1003.1c (I did them for JAVA,
which needs to suspend/resume threads and also start threads suspended).

I've created a new header (pthread_np.h) for the non-POSIX stuff.

The egrep tags stuff in /usr/src/lib/libc_r/Makefile that I uncommented
doesn't work. I think its best to delete it. I don't think libc_r needs
tags anyway, 'cause most of the source is in libc which does have tags.

also:

Here's the first batch of man pages for the thread functions.
The diff to /usr/src/lib/libc_r/Makefile removes some stuff that was
inherited from /usr/src/lib/libc/Makefile that should only be done with
libc.

also:

I should have sent this diff with the pthread(3) man page.
It allows people to type

make -DWANT_LIBC_R world

to get libc_r built with the rest of the world. I put this in the
pthread(3) man page.  The default is still not to build libc_r.


also:
The diff attached adds a pthread(3) man page to /usr/src/share/man/man3.
The idea is that without libc_r installed, this man page will give people
enough info to know that they have to build libc_r.

1 files changed, 10 insertions, 10 deletions

diff --git a/lib/libkse/thread/thr_spec.c b/lib/libkse/thread/thr_spec.c
index e7c45d2..cc83c60 100644
--- a/lib/libkse/thread/thr_spec.c
+++ b/lib/libkse/thread/thr_spec.c
@@ -39,12 +39,12 @@
 #include "pthread_private.h"
 
 /* Static variables: */
-static struct pthread_key key_table[PTHREAD_DATAKEYS_MAX];
+static struct pthread_key key_table[PTHREAD_KEYS_MAX];
 
 int
-pthread_keycreate(pthread_key_t * key, void (*destructor) (void *))
+pthread_key_create(pthread_key_t * key, void (*destructor) (void *))
 {
-	for ((*key) = 0; (*key) < PTHREAD_DATAKEYS_MAX; (*key)++) {
+	for ((*key) = 0; (*key) < PTHREAD_KEYS_MAX; (*key)++) {
 		if (key_table[(*key)].count == 0) {
 			key_table[(*key)].count++;
 			key_table[(*key)].destructor = destructor;
@@ -63,7 +63,7 @@ pthread_key_delete(pthread_key_t key)
 	/* Block signals: */
 	_thread_kern_sig_block(&status);
 
-	if (key < PTHREAD_DATAKEYS_MAX) {
+	if (key < PTHREAD_KEYS_MAX) {
 		switch (key_table[key].count) {
 		case 1:
 			key_table[key].destructor = NULL;
@@ -94,8 +94,8 @@ _thread_cleanupspecific(void)
 	/* Block signals: */
 	_thread_kern_sig_block(&status);
 
-	for (itr = 0; itr < _POSIX_THREAD_DESTRUTOR_ITERATIONS; itr++) {
-		for (key = 0; key < PTHREAD_DATAKEYS_MAX; key++) {
+	for (itr = 0; itr < PTHREAD_DESTRUCTOR_ITERATIONS; itr++) {
+		for (key = 0; key < PTHREAD_KEYS_MAX; key++) {
 			if (_thread_run->specific_data_count) {
 				if (_thread_run->specific_data[key]) {
 					data = (void *) _thread_run->specific_data[key];
@@ -125,8 +125,8 @@ static inline const void **
 pthread_key_allocate_data(void)
 {
 	const void    **new_data;
-	if ((new_data = (const void **) malloc(sizeof(void *) * PTHREAD_DATAKEYS_MAX)) != NULL) {
-		memset((void *) new_data, 0, sizeof(void *) * PTHREAD_DATAKEYS_MAX);
+	if ((new_data = (const void **) malloc(sizeof(void *) * PTHREAD_KEYS_MAX)) != NULL) {
+		memset((void *) new_data, 0, sizeof(void *) * PTHREAD_KEYS_MAX);
 	}
 	return (new_data);
 }
@@ -154,7 +154,7 @@ pthread_setspecific(pthread_key_t key, const void *value)
 	}
 
 	if ((pthread->specific_data) || (pthread->specific_data = pthread_key_allocate_data())) {
-		if ((key < PTHREAD_DATAKEYS_MAX) && (key_table)) {
+		if ((key < PTHREAD_KEYS_MAX) && (key_table)) {
 			if (key_table[key].count) {
 				if (pthread->specific_data[key] == NULL) {
 					if (value != NULL) {
@@ -213,7 +213,7 @@ pthread_getspecific(pthread_key_t key, void **p_data)
 		rval = -1;
 	}
 	/* Check if there is specific data: */
-	else if (pthread->specific_data != NULL && (key < PTHREAD_DATAKEYS_MAX) && (key_table)) {
+	else if (pthread->specific_data != NULL && (key < PTHREAD_KEYS_MAX) && (key_table)) {
 		/* Check if this key has been used before: */
 		if (key_table[key].count) {
 			/* Return the value: */