Libc-498.1.5.tar.gz

[apple/libc.git] / threads / cprocs.c

diff --git a/threads/cprocs.c b/threads/cprocs.c
index 72b6f5b447e7c225539d6858ffab07a68165e2cd..834f04c096312686be81b031a0d059641045f972 100644 (file)
--- a/threads/cprocs.c
+++ b/threads/cprocs.c
@@ -3,8 +3,6 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
- * 
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
@@ -46,8 +44,8 @@
  * Implementation of cprocs (lightweight processes)
  * and primitive synchronization operations.
  */
-#include <stdlib.h>
 #include "pthread_internals.h"
+#include <stdlib.h>
 #include "cthreads.h"
 #include "cthread_internals.h"
 #include <mach/message.h>
@@ -64,8 +62,6 @@ extern void alloc_stack(), _dealloc_stack();
 extern mach_port_t mach_thread_self();
 extern boolean_t swtch_pri();
 
-private int cprocs_started = FALSE;
-
 #ifdef CTHREADS_DEBUG
 private void
 print_cproc(p)
@@ -100,12 +96,11 @@ print_cproc_queue(name, queue)
        cthread_queue_map(queue, cproc_t, print_cproc);
        printf("\n");
 }
-#endif CTHREADS_DEBUG
+#endif /* CTHREADS_DEBUG */
 
-private int cproc_lock = 0;            /* unlocked */
+#ifdef CTHREADS_DEBUG
 private cproc_t cprocs = NO_CPROC;     /* linked list of cprocs */
 
-#ifdef CTHREADS_DEBUG
 private void
 print_all_cprocs()
 {
@@ -116,13 +111,14 @@ print_all_cprocs()
                print_cproc(p);
        printf("\n");
 }
-#endif CTHREADS_DEBUG
+#endif /* CTHREADS_DEBUG */
 
 /*
  * Routines for supporting fork() of multi-threaded programs.
  */
 
-void _cproc_fork_child()
+void
+_cproc_fork_child()
 /*
  * Called in the child after a fork().  Resets cproc data structures to
  * coincide with the reality that we now have a single cproc and cthread.
@@ -140,15 +136,21 @@ void _cproc_fork_child()
 
 #undef errno
 extern int errno;
-void cthread_set_errno_self(error)
+extern int *__error(void);
+
+void
+cthread_set_errno_self(error)
        int     error;
 {
-       pthread_t t;
+       int *ep = __error();
+       extern int __unix_conforming;
+
+       if ((__unix_conforming) && (error == EINTR) && (__pthread_canceled(0) == 0))
+               pthread_exit(PTHREAD_CANCELED);
+
+        if (ep != &errno)
+            *ep = error;
 
-       t = pthread_self();
-        if (t && (t->sig == _PTHREAD_SIG)) {
-            t->err_no = error;
-        }
         errno = error;
 }