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, 19 insertions, 5 deletions

diff --git a/lib/libc_r/uthread/uthread_fd.c b/lib/libc_r/uthread/uthread_fd.c
index b41631a..ad6e9f3 100644
--- a/lib/libc_r/uthread/uthread_fd.c
+++ b/lib/libc_r/uthread/uthread_fd.c
@@ -31,6 +31,7 @@
  *
  */
 #include <errno.h>
+#include <fcntl.h>
 #include <stdlib.h>
 #ifdef _THREAD_SAFE
 #include <pthread.h>
@@ -48,7 +49,7 @@ _thread_fd_table_init(int fd)
 	/* Check if the file descriptor is out of range: */
 	if (fd < 0 || fd >= _thread_dtablesize) {
 		/* Return a bad file descriptor error: */
-		_thread_seterrno(_thread_run, EBADF);
+		errno = EBADF;
 		ret = -1;
 	}
 	/*
@@ -60,7 +61,7 @@ _thread_fd_table_init(int fd)
 	/* Allocate memory for the file descriptor table entry: */
 	else if ((_thread_fd_table[fd] = (struct fd_table_entry *) malloc(sizeof(struct fd_table_entry))) == NULL) {
 		/* Return a bad file descriptor error: */
-		_thread_seterrno(_thread_run, EBADF);
+		errno = EBADF;
 		ret = -1;
 	} else {
 		/* Initialise the file locks: */
@@ -73,12 +74,25 @@ _thread_fd_table_init(int fd)
 		_thread_fd_table[fd]->r_lockcount = 0;;
 		_thread_fd_table[fd]->w_lockcount = 0;;
 
-		/* Default the flags: */
-		_thread_fd_table[fd]->flags = 0;
-
 		/* Initialise the read/write queues: */
 		_thread_queue_init(&_thread_fd_table[fd]->r_queue);
 		_thread_queue_init(&_thread_fd_table[fd]->w_queue);
+
+		/* Get the flags for the file: */
+		if ((_thread_fd_table[fd]->flags = _thread_sys_fcntl(fd, F_GETFL, 0)) == -1) {
+			ret = -1;
+
+		/* Make the file descriptor non-blocking: */
+		} else {
+			_thread_sys_fcntl(fd, F_SETFL, _thread_fd_table[fd]->flags | O_NONBLOCK);
+		}
+
+		/* Check if one of the fcntl calls failed: */
+		if (ret == -1) {
+			/* Free the file descriptor table entry: */
+			free(_thread_fd_table[fd]);
+			_thread_fd_table[fd] = NULL;
+		}
 	}
 
 	/* Unblock signals: */