summaryrefslogtreecommitdiff
path: root/cleanup.c
diff options
context:
space:
mode:
authorrpj <rpj>1999-01-03 16:41:14 +0000
committerrpj <rpj>1999-01-03 16:41:14 +0000
commit5ab9f5892826bb1c4e45b4dcb2692d4eb2f813f1 (patch)
tree055390c239a2f7cefdde4360a5f0f0096be19930 /cleanup.c
parent63d8161801576f3acd5169b472946f4a687c4728 (diff)
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.
Diffstat (limited to 'cleanup.c')
-rw-r--r--cleanup.c209
1 files changed, 1 insertions, 208 deletions
diff --git a/cleanup.c b/cleanup.c
index b0817d7..12ce282 100644
--- a/cleanup.c
+++ b/cleanup.c
@@ -6,9 +6,8 @@
* threads.
*/
-#include <errno.h>
-
#include <malloc.h>
+
#include "pthread.h"
#include "implement.h"
@@ -143,209 +142,3 @@ _pthread_push_cleanup (_pthread_cleanup_t * cleanup,
/* </JEB> */
-#if 0 /* Pre Bossom */
-
-int
-_pthread_handler_push(int stack,
- int poporder,
- void (*routine)(void *),
- void *arg)
-{
- /* Place the new handler into the list so that handlers are
- popped off in the order given by poporder. */
- _pthread_handler_node_t * new_handler;
- _pthread_handler_node_t * next;
- _pthread_handler_node_t ** stacktop;
-
- stacktop = _PTHREAD_STACK(stack);
-
- new_handler =
- (_pthread_handler_node_t *) malloc(sizeof(_pthread_handler_node_t));
-
- if (new_handler == NULL)
- {
- return 0; /* NOMEM */
- }
-
- new_handler->routine = routine;
- new_handler->arg = arg;
-
- if (poporder == _PTHREAD_HANDLER_POP_LIFO)
- {
- /* Add the new node to the start of the list. */
- new_handler->next = *stacktop;
- *stacktop = new_handler;
- }
- else
- {
- /* Add the new node to the end of the list. */
- new_handler->next = NULL;
-
- if (*stacktop == NULL)
- {
- *stacktop = new_handler;
- }
- else
- {
- next = *stacktop;
-
- while (next->next != NULL)
- {
- next = next->next;
- }
-
- next->next = new_handler;
- }
- }
- return 0;
-}
-
-void
-_pthread_handler_pop(int stack, int execute)
-{
- _pthread_handler_node_t ** stacktop;
- _pthread_handler_node_t * next;
- void (* func)(void *);
- void * arg;
-
- stacktop = _PTHREAD_STACK(stack);
-
- if (*stacktop != NULL)
- {
- func = (*stacktop)->routine;
- arg = (*stacktop)->arg;
- next = (*stacktop)->next;
-
- free(*stacktop);
- *stacktop = next;
-
- if (execute != 0 && func != NULL)
- {
- (void) func(arg);
- }
- }
-}
-
-void
-_pthread_handler_pop_all(int stack, int execute)
-{
- /* Pop and possibly run all handlers on the given stack. */
- _pthread_handler_node_t ** stacktop;
- _pthread_handler_node_t * next;
- void (* func)(void *);
- void * arg;
-
- stacktop = _PTHREAD_STACK(stack);
-
- while (*stacktop != NULL)
- {
- func = (*stacktop)->routine;
- arg = (*stacktop)->arg;
- next = (*stacktop)->next;
-
- free(*stacktop);
- *stacktop = next;
-
- if (execute != 0 && func != NULL)
- {
- (void) func(arg);
- }
- }
-}
-
-/* Run destructors for all non-NULL key values for the calling thread.
- */
-void
-_pthread_destructor_run_all()
-{
- _pthread_tsd_key_t * key;
- int count;
- int dirty;
-
- /* This threads private keys */
- key = _pthread_tsd_key_table;
-
- /* Stop destructor execution at a finite time. POSIX allows us
- to ignore this if we like, even at the risk of an infinite loop.
-
- FIXME: We don't know when to stop yet.
- */
- for (count = 0; count < PTHREAD_DESTRUCTOR_ITERATIONS; count++)
- {
- int k;
- void * arg;
-
- dirty = 0;
-
- /* Loop through all keys. */
- for (k = 0; k < _POSIX_THREAD_KEYS_MAX; k++)
- {
- /* CRITICAL SECTION */
- pthread_mutex_lock(&_pthread_tsd_mutex);
-
- switch (key->status)
- {
- case _PTHREAD_TSD_KEY_INUSE:
- arg = pthread_getspecific((pthread_key_t) k);
-
- if (arg != NULL && key->destructor != NULL)
- {
- /* The destructor must be called with the mutex off. */
- pthread_mutex_unlock(&_pthread_tsd_mutex);
- /* END CRITICAL SECTION */
-
- /* FIXME: Is the destructor supposed to set the key value
- to NULL? How is this done when arg is the key value, not
- a pointer to it? For now we assume that the destructor
- always succeeds.
- */
- (void) (key->destructor)(arg);
-
- /* CRITICAL SECTION */
- pthread_mutex_lock(&_pthread_tsd_mutex);
-
- pthread_setspecific((pthread_key_t) k, NULL);
-#if 0
- /* Only needed if we don't assume the destructor
- always succeeds.
- */
- dirty = 1;
-#endif
- }
- break;
-
- case _PTHREAD_TSD_KEY_DELETED:
- key->status = _PTHREAD_TSD_KEY_INUSE;
- pthread_setspecific((pthread_key_t) k, NULL);
-
- if (key->in_use <= 0)
- {
- /* This is the last thread to use this
- deleted key. It can now be made available
- for re-use.
- */
- key->status = _PTHREAD_TSD_KEY_REUSE;
- _pthread_key_reuse[_pthread_key_reuse_top++] = k;
- }
- else
- {
- key->status = _PTHREAD_TSD_KEY_DELETED;
- }
- break;
-
- default:
- break;
- }
-
- pthread_mutex_unlock(&_pthread_tsd_mutex);
- /* END CRITICAL SECTION */
-
- key++;
- }
-
- if (!dirty)
- break;
- }
-}
-
-#endif /* Pre Bossom */