[src/trunk]: src/sys/dev/raidframe Nuke RF_DECLARE_GLOBAL_THREADID, rf_setup...

[oster <oster%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/72b06e5533bb
branches:  trunk
changeset: 480220:72b06e5533bb
user:      oster <oster%NetBSD.org@localhost>
date:      Fri Jan 07 03:25:34 2000 +0000

description:
Nuke  RF_DECLARE_GLOBAL_THREADID, rf_setup_threadid(), rf_shutdown_threadid(),
and rf_assign_threadid().  rf_threadid.h, your days are numbered.

diffstat:

 sys/dev/raidframe/rf_driver.c           |  8 +-------
 sys/dev/raidframe/rf_engine.c           |  3 +--
 sys/dev/raidframe/rf_paritylogDiskMgr.c |  4 +---
 sys/dev/raidframe/rf_threadid.h         |  7 +------
 4 files changed, 4 insertions(+), 18 deletions(-)

diffs (92 lines):

diff -r 18cdf9b84985 -r 72b06e5533bb sys/dev/raidframe/rf_driver.c
--- a/sys/dev/raidframe/rf_driver.c     Fri Jan 07 03:13:23 2000 +0000
+++ b/sys/dev/raidframe/rf_driver.c     Fri Jan 07 03:25:34 2000 +0000
@@ -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 @@
 
 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 @@
                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 @@
                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 -r 18cdf9b84985 -r 72b06e5533bb sys/dev/raidframe/rf_engine.c
--- a/sys/dev/raidframe/rf_engine.c     Fri Jan 07 03:13:23 2000 +0000
+++ b/sys/dev/raidframe/rf_engine.c     Fri Jan 07 03:25:34 2000 +0000
@@ -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 @@
 
        raidPtr = (RF_Raid_t *) arg;
 
-       rf_assign_threadid();
        if (rf_engineDebug) {
                rf_get_threadid(tid);
                printf("[%d] Engine thread is running\n", tid);
diff -r 18cdf9b84985 -r 72b06e5533bb sys/dev/raidframe/rf_paritylogDiskMgr.c
--- a/sys/dev/raidframe/rf_paritylogDiskMgr.c   Fri Jan 07 03:13:23 2000 +0000
+++ b/sys/dev/raidframe/rf_paritylogDiskMgr.c   Fri Jan 07 03:25:34 2000 +0000
@@ -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_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 -r 18cdf9b84985 -r 72b06e5533bb sys/dev/raidframe/rf_threadid.h
--- a/sys/dev/raidframe/rf_threadid.h   Fri Jan 07 03:13:23 2000 +0000
+++ b/sys/dev/raidframe/rf_threadid.h   Fri Jan 07 03:25:34 2000 +0000
@@ -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_ */