summaryrefslogtreecommitdiff
path: root/sys/dev/raidframe/rf_threadstuff.c
diff options
context:
space:
mode:
authoroster <oster@NetBSD.org>1999-01-26 02:33:49 +0000
committeroster <oster@NetBSD.org>1999-01-26 02:33:49 +0000
commit1eecf8e491f4ecb40edff2d8093fac193d203e73 (patch)
treefc9f06792e783e03fe393007c4caf9d3c8da17f3 /sys/dev/raidframe/rf_threadstuff.c
parent7c2e6d4c420981d843ea6d87e2aa3ad916fac166 (diff)
RAIDframe cleanup, phase 1. Nuke simulator support, user-land driver,
out-dated comments, and other unneeded stuff. This helps prepare for cleaning up the rest of the code, and adding new functionality. No functional changes to the kernel code in this commit.
Diffstat (limited to 'sys/dev/raidframe/rf_threadstuff.c')
-rw-r--r--sys/dev/raidframe/rf_threadstuff.c272
1 files changed, 1 insertions, 271 deletions
diff --git a/sys/dev/raidframe/rf_threadstuff.c b/sys/dev/raidframe/rf_threadstuff.c
index 207dd77d1b3..9a54a9c1041 100644
--- a/sys/dev/raidframe/rf_threadstuff.c
+++ b/sys/dev/raidframe/rf_threadstuff.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_threadstuff.c,v 1.1 1998/11/13 04:20:35 oster Exp $ */
+/* $NetBSD: rf_threadstuff.c,v 1.2 1999/01/26 02:34:03 oster Exp $ */
/*
* rf_threadstuff.c
*/
@@ -29,11 +29,6 @@
* rights to redistribute these changes.
*/
-#ifdef _KERNEL
-#define KERNEL
-#endif
-
-
#include "rf_types.h"
#include "rf_threadstuff.h"
#include "rf_general.h"
@@ -180,243 +175,10 @@ int _rf_init_threadgroup(g, file, line)
return(0);
}
-/*
- * User
- */
-
-#if !defined(KERNEL) && !defined(SIMULATE)
-
-#if RF_DEBUG_ATOMIC > 0
-
-static RF_ATEnt_t rf_atent_list;
-static RF_ATEnt_t *rf_atent_done_list=NULL;
-
-static pthread_mutex_t rf_atent_mutex;
-
-void rf_atent_init()
-{
- int rc;
-
- rc = pthread_mutex_init(&rf_atent_mutex, pthread_mutexattr_default);
- if (rc) {
- fprintf(stderr, "ERROR: rc=%d creating rf_atent_mutex\n", rc);
- fflush(stderr);
- RF_PANIC();
- }
- rf_atent_list.next = rf_atent_list.prev = &rf_atent_list;
-}
-
-#define ATENT_TYPE(_e_) ((((_e_)->type == 0)||((_e_)->type > 2)) ? 0 : (_e_)->type)
-#define ATENT_OTYPE(_e_) ((((_e_)->otype == 0)||((_e_)->otype > 2)) ? 0 : (_e_)->otype)
-
-void rf_atent_shutdown()
-{
- int rc, num_freed[3], num_not_freed[3];
- RF_ATEnt_t *r, *n;
-
- num_freed[0] = num_freed[1] = num_freed[2] = 0;
- num_not_freed[0] = num_not_freed[1] = num_not_freed[2] = 0;
- printf("rf_atent_shutdown:\n");
- for(r=rf_atent_list.next;r!=&rf_atent_list;r=r->next) {
- printf("r=%lx type=%d file=%s line=%d\n", r, r->type, r->file, r->line);
- num_not_freed[ATENT_TYPE(r)]++;
- }
- rc = pthread_mutex_destroy(&rf_atent_mutex);
- if (rc) {
- fprintf(stderr, "ERROR: rc=%d destroying rf_atent_mutex\n", rc);
- fflush(stderr);
- RF_PANIC();
- }
- for(r=rf_atent_done_list;r;r=n) {
- n = r->next;
- num_freed[ATENT_OTYPE(r)]++;
- free(r);
- }
- printf("%d mutexes not freed %d conditions not freed %d bogus not freed\n",
- num_not_freed[1], num_not_freed[2], num_not_freed[0]);
- printf("%d mutexes freed %d conditions freed %d bogus freed\n",
- num_freed[1], num_freed[2], num_freed[0]);
- fflush(stdout);
- fflush(stderr);
-}
-
-static RF_ATEnt_t *AllocATEnt(file,line)
- char *file;
- int line;
-{
- RF_ATEnt_t *t;
-
- t = (RF_ATEnt_t *)malloc(sizeof(RF_ATEnt_t));
- if (t == NULL) {
- RF_PANIC();
- }
- t->file = file;
- t->line = line;
- t->type = 0;
- return(t);
-}
-
-static void FreeATEnt(t)
- RF_ATEnt_t *t;
-{
- t->otype = t->type;
- t->type = 0;
- t->next = rf_atent_done_list;
- rf_atent_done_list = t;
-}
-
-int _rf_mutex_init(m, file, line)
- RF_ATEnt_t **m;
- char *file;
- int line;
-{
- RF_ATEnt_t *a;
- int rc;
-
- a = AllocATEnt(file,line);
- rc = pthread_mutex_init(&a->m, pthread_mutexattr_default);
- if (rc == 0) {
- pthread_mutex_lock(&rf_atent_mutex);
- a->next = rf_atent_list.next;
- a->prev = &rf_atent_list;
- a->type = RF_ATENT_M;
- a->next->prev = a;
- a->prev->next = a;
- pthread_mutex_unlock(&rf_atent_mutex);
- }
- else {
- fprintf(stderr, "ERROR: rc=%d allocating mutex %s:%d\n",
- rc, file, line);
- fflush(stderr);
- RF_PANIC();
- }
- *m = a;
- return(0);
-}
-
-int _rf_mutex_destroy(m, file, line)
- RF_ATEnt_t **m;
- char *file;
- int line;
-{
- RF_ATEnt_t *r;
- int rc;
-
- r = *m;
- rc = pthread_mutex_destroy(&r->m);
- if (rc) {
- fprintf(stderr, "ERROR: rc=%d destroying mutex %s:%d\n",
- rc, file, line);
- fflush(stderr);
- RF_PANIC();
- }
- pthread_mutex_lock(&rf_atent_mutex);
- r->next->prev = r->prev;
- r->prev->next = r->next;
- FreeATEnt(r);
- pthread_mutex_unlock(&rf_atent_mutex);
- *m = NULL;
- return(0);
-}
-
-int _rf_cond_init(c, file, line)
- RF_ATEnt_t **c;
- char *file;
- int line;
-{
- RF_ATEnt_t *a;
- int rc;
-
- a = AllocATEnt(file,line);
- rc = pthread_cond_init(&a->c, pthread_condattr_default);
- if (rc == 0) {
- pthread_mutex_lock(&rf_atent_mutex);
- a->next = rf_atent_list.next;
- a->prev = &rf_atent_list;
- a->next->prev = a;
- a->prev->next = a;
- a->type = RF_ATENT_C;
- pthread_mutex_unlock(&rf_atent_mutex);
- }
- else {
- fprintf(stderr, "ERROR: rc=%d allocating cond %s:%d\n",
- rc, file, line);
- fflush(stderr);
- RF_PANIC();
- }
- *c = a;
- return(0);
-}
-
-int _rf_cond_destroy(c, file, line)
- RF_ATEnt_t **c;
- char *file;
- int line;
-{
- RF_ATEnt_t *r;
- int rc;
-
- r = *c;
- rc = pthread_cond_destroy(&r->c);
- if (rc) {
- fprintf(stderr, "ERROR: rc=%d destroying cond %s:%d\n",
- rc, file, line);
- fflush(stderr);
- RF_PANIC();
- }
- pthread_mutex_lock(&rf_atent_mutex);
- r->next->prev = r->prev;
- r->prev->next = r->next;
- FreeATEnt(r);
- pthread_mutex_unlock(&rf_atent_mutex);
- *c = NULL;
- return(0);
-}
-
-#else /* RF_DEBUG_ATOMIC > 0 */
-
-int rf_mutex_init(m)
- pthread_mutex_t *m;
-{
-#ifdef __osf__
- return(pthread_mutex_init(m, pthread_mutexattr_default));
-#endif /* __osf__ */
-#ifdef AIX
- return(pthread_mutex_init(m, &pthread_mutexattr_default));
-#endif /* AIX */
-}
-
-int rf_mutex_destroy(m)
- pthread_mutex_t *m;
-{
- return(pthread_mutex_destroy(m));
-}
-
-int rf_cond_init(c)
- pthread_cond_t *c;
-{
-#ifdef __osf__
- return(pthread_cond_init(c, pthread_condattr_default));
-#endif /* __osf__ */
-#ifdef AIX
- return(pthread_cond_init(c, &pthread_condattr_default));
-#endif /* AIX */
-}
-
-int rf_cond_destroy(c)
- pthread_cond_t *c;
-{
- return(pthread_cond_destroy(c));
-}
-
-#endif /* RF_DEBUG_ATOMIC > 0 */
-
-#endif /* !KERNEL && !SIMULATE */
/*
* Kernel
*/
-#ifdef KERNEL
int rf_mutex_init(m)
decl_simple_lock_data(,*m)
{
@@ -442,35 +204,3 @@ int rf_cond_destroy(c)
{
return(0);
}
-
-
-#endif /* KERNEL */
-
-/*
- * Simulator
- */
-#ifdef SIMULATE
-int rf_mutex_init(m)
- RF_DECLARE_MUTEX(*m)
-{
- return(0);
-}
-
-int rf_mutex_destroy(m)
- RF_DECLARE_MUTEX(*m)
-{
- return(0);
-}
-
-int rf_cond_init(c)
- RF_DECLARE_COND(*c)
-{
- return(0);
-}
-
-int rf_cond_destroy(c)
- RF_DECLARE_COND(*c)
-{
- return(0);
-}
-#endif /* SIMULATE */