diff options
| author | oster <oster@NetBSD.org> | 2000-01-07 03:25:34 +0000 |
|---|---|---|
| committer | oster <oster@NetBSD.org> | 2000-01-07 03:25:34 +0000 |
| commit | e5ce17d0ebcff3e52fa44786c0b66ab408e432cd (patch) | |
| tree | c62e43b64c211634b3b3b5eece780ce6b627eaef /sys/dev/raidframe | |
| parent | fa8c26f54723c9690f04c7aa7160b86631ce2fb9 (diff) | |
Nuke RF_DECLARE_GLOBAL_THREADID, rf_setup_threadid(), rf_shutdown_threadid(),
and rf_assign_threadid(). rf_threadid.h, your days are numbered.
Diffstat (limited to 'sys/dev/raidframe')
| -rw-r--r-- | sys/dev/raidframe/rf_driver.c | 8 | ||||
| -rw-r--r-- | sys/dev/raidframe/rf_engine.c | 3 | ||||
| -rw-r--r-- | sys/dev/raidframe/rf_paritylogDiskMgr.c | 4 | ||||
| -rw-r--r-- | sys/dev/raidframe/rf_threadid.h | 7 |
4 files changed, 4 insertions, 18 deletions
diff --git a/sys/dev/raidframe/rf_driver.c b/sys/dev/raidframe/rf_driver.c index 30f15730520..05bcce30804 100644 --- a/sys/dev/raidframe/rf_driver.c +++ b/sys/dev/raidframe/rf_driver.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_driver.c,v 1.20 2000/01/07 03:03:44 oster Exp $ */ +/* $NetBSD: rf_driver.c,v 1.21 2000/01/07 03:25:34 oster Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. * All rights reserved. @@ -148,8 +148,6 @@ void rf_update_component_labels( RF_Raid_t *); RF_DECLARE_MUTEX(rf_printf_mutex) /* debug only: avoids interleaved * printfs by different stripes */ -RF_DECLARE_GLOBAL_THREADID /* declarations for threadid.h */ - #define SIGNAL_QUIESCENT_COND(_raid_) wakeup(&((_raid_)->accesses_suspended)) #define WAIT_FOR_QUIESCENCE(_raid_) \ @@ -182,9 +180,6 @@ rf_BootRaidframe() return (EBUSY); raidframe_booted = 1; - rf_setup_threadid(); - rf_assign_threadid(); - rc = rf_mutex_init(&configureMutex); if (rc) { RF_ERRORMSG3("Unable to init mutex file %s line %d rc=%d\n", __FILE__, @@ -239,7 +234,6 @@ rf_UnconfigureArray() if (rc) { RF_ERRORMSG1("RAIDFRAME: unable to do global shutdown, rc=%d\n", rc); } - rf_shutdown_threadid(); /* * We must wait until now, because the AllocList module diff --git a/sys/dev/raidframe/rf_engine.c b/sys/dev/raidframe/rf_engine.c index c8280314429..f6c1b2d8832 100644 --- a/sys/dev/raidframe/rf_engine.c +++ b/sys/dev/raidframe/rf_engine.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_engine.c,v 1.6 2000/01/05 02:57:29 oster Exp $ */ +/* $NetBSD: rf_engine.c,v 1.7 2000/01/07 03:25:34 oster Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -724,7 +724,6 @@ DAGExecutionThread(RF_ThreadArg_t arg) raidPtr = (RF_Raid_t *) arg; - rf_assign_threadid(); if (rf_engineDebug) { rf_get_threadid(tid); printf("[%d] Engine thread is running\n", tid); diff --git a/sys/dev/raidframe/rf_paritylogDiskMgr.c b/sys/dev/raidframe/rf_paritylogDiskMgr.c index 0538fefbeef..81dbd1d9791 100644 --- a/sys/dev/raidframe/rf_paritylogDiskMgr.c +++ b/sys/dev/raidframe/rf_paritylogDiskMgr.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_paritylogDiskMgr.c,v 1.4 1999/08/13 03:41:57 oster Exp $ */ +/* $NetBSD: rf_paritylogDiskMgr.c,v 1.5 2000/01/07 03:25:35 oster Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -554,8 +554,6 @@ rf_ParityLoggingDiskManager(RF_Raid_t * raidPtr) RF_ParityLog_t *reintQueue, *flushQueue; int workNeeded, done = RF_FALSE; - rf_assign_threadid(); /* don't remove this line */ - /* Main program for parity logging disk thread. This routine waits * for work to appear in either the flush or reintegration queues and * is responsible for flushing core logs to the log disk as well as diff --git a/sys/dev/raidframe/rf_threadid.h b/sys/dev/raidframe/rf_threadid.h index 3667b82a01e..8e7e2ddf05f 100644 --- a/sys/dev/raidframe/rf_threadid.h +++ b/sys/dev/raidframe/rf_threadid.h @@ -1,4 +1,4 @@ -/* $NetBSD: rf_threadid.h,v 1.3 1999/02/05 00:06:18 oster Exp $ */ +/* $NetBSD: rf_threadid.h,v 1.4 2000/01/07 03:25:35 oster Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -44,11 +44,6 @@ * Kernel */ -#define RF_DECLARE_GLOBAL_THREADID -#define rf_setup_threadid() -#define rf_shutdown_threadid() -#define rf_assign_threadid() - #define rf_get_threadid(_id_) _id_ = 0; #endif /* !_RF__RF_THREADID_H_ */ |
