Mon Jan 4 11:23:40 1999 Ross Johnson <rpj@ixobrychus.canberra.edu.au>bossom-merge-99-01-04bossom-merge-98-12-08

	* all: No code changes, just cleanup.
	- remove #if 0 /* Pre Bossom */ enclosed code.
	- Remove some redundant #includes.
	* pthread.h: Update implemented/unimplemented routines list.
	* Tag the bossom merge branch getting ready to merge back to main
	trunk.

1 files changed, 0 insertions, 68 deletions

diff --git a/exit.c b/exit.c
index bb46165..5177e88 100644
--- a/exit.c
+++ b/exit.c
@@ -6,8 +6,6 @@
  * a thread.
  */
 
-#include <windows.h>
-#include <process.h>
 #include "pthread.h"
 #include "implement.h"
 
@@ -49,69 +47,3 @@ pthread_exit (void *value_ptr)
 
 /* </JEB> */
 
-
-#if 0 /* Pre Bossom */
-
-void
-_pthread_vacuum(void)
-{
-  /* Run all the handlers. */
-  _pthread_handler_pop_all(_PTHREAD_CLEANUP_STACK, 
-			   _PTHREAD_HANDLER_EXECUTE);
-
-  /* Pop any atfork handlers without executing them. */
-  _pthread_handler_pop_all(_PTHREAD_FORKPREPARE_STACK, 
-			   _PTHREAD_HANDLER_NOEXECUTE);
-
-  _pthread_handler_pop_all(_PTHREAD_FORKPARENT_STACK, 
-			   _PTHREAD_HANDLER_NOEXECUTE);
-
-  _pthread_handler_pop_all(_PTHREAD_FORKCHILD_STACK,
-			   _PTHREAD_HANDLER_NOEXECUTE);
-}
-
-void
-_pthread_exit(pthread_t thread, void * value, int return_code)
-{
-  int detachstate;
-
-  /* CRITICAL SECTION */
-  pthread_mutex_lock(&_pthread_table_mutex);
-
-  /* Copy value into the thread entry so it can be given
-     to any joining threads. */
-  thread->joinvalueptr = value;
-
-  pthread_mutex_unlock(&_pthread_table_mutex);
-  /* END CRITICAL SECTION */
-
-  _pthread_vacuum();
-
-  /* CRITICAL SECTION */
-  pthread_mutex_lock(&_pthread_table_mutex);
-
-  /* Remove the thread entry on exit only if the thread is detached
-     AND there are no waiting joins. Otherwise the thread entry will
-     be deleted by the last waiting pthread_join() after this thread
-     has terminated. */
-
-  if (pthread_attr_getdetachstate(&thread->attr, &detachstate) == 0 
-      && detachstate == PTHREAD_CREATE_DETACHED
-      && thread->join_count == 0)
-    {
-      (void) _pthread_delete_thread(thread);
-    }
-
-  pthread_mutex_unlock(&_pthread_table_mutex);
-  /* END CRITICAL SECTION */
-
-  _endthreadex(return_code);
-}
-
-void
-pthread_exit(void * value)
-{
-  _pthread_exit(pthread_self(), value, 0);
-}
-
-#endif /* Pre Bossom */