summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authoroster <oster@NetBSD.org>2000-01-08 22:57:30 +0000
committeroster <oster@NetBSD.org>2000-01-08 22:57:30 +0000
commit04719e3adccf878a35539e9db8ce9f0bcddade77 (patch)
tree7d9bc8634dec53bfc955213dc308a6e986caf804 /sys/dev
parentce3b031d6ded503f0c0964b747068f4c3e604ff2 (diff)
- nuke calls to rf_get_threadid() and associated #include
- change a bunch of debugging printfs from "[%d] ...", tid (where tid is the "thread id") to "raid%d: ...", raidPtr->raidid - other minor rototillage
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/raidframe/rf_driver.c20
-rw-r--r--sys/dev/raidframe/rf_engine.c48
-rw-r--r--sys/dev/raidframe/rf_paritylogging.c41
-rw-r--r--sys/dev/raidframe/rf_psstatus.c8
-rw-r--r--sys/dev/raidframe/rf_raid1.c61
-rw-r--r--sys/dev/raidframe/rf_raid5.c13
-rw-r--r--sys/dev/raidframe/rf_reconstruct.c30
-rw-r--r--sys/dev/raidframe/rf_shutdown.c11
-rw-r--r--sys/dev/raidframe/rf_states.c14
9 files changed, 103 insertions, 143 deletions
diff --git a/sys/dev/raidframe/rf_driver.c b/sys/dev/raidframe/rf_driver.c
index 05bcce30804..b4e155127e7 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.21 2000/01/07 03:25:34 oster Exp $ */
+/* $NetBSD: rf_driver.c,v 1.22 2000/01/08 22:57:31 oster Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -91,7 +91,6 @@
#include "rf_diskqueue.h"
#include "rf_parityscan.h"
#include "rf_alloclist.h"
-#include "rf_threadid.h"
#include "rf_dagutils.h"
#include "rf_utils.h"
#include "rf_etimer.h"
@@ -643,7 +642,7 @@ rf_AllocRaidAccDesc(
desc->numPending = 0;
desc->cleanupList = NULL;
rf_MakeAllocList(desc->cleanupList);
- rf_get_threadid(desc->tid);
+ desc->tid = 0; /* XXX Make this go away */
return (desc);
}
@@ -689,7 +688,6 @@ async_flag should be RF_TRUE or RF_FALSE
bp_in is a buf pointer. void * to facilitate ignoring it outside the kernel
*/
{
- int tid;
RF_RaidAccessDesc_t *desc;
caddr_t lbufPtr = bufPtr;
struct buf *bp = (struct buf *) bp_in;
@@ -702,13 +700,12 @@ bp_in is a buf pointer. void * to facilitate ignoring it outside the kernel
return (EINVAL);
}
- rf_get_threadid(tid);
if (rf_accessDebug) {
printf("logBytes is: %d %d %d\n", raidPtr->raidid,
raidPtr->logBytesPerSector,
(int) rf_RaidAddressToByte(raidPtr, numBlocks));
- printf("[%d] %s raidAddr %d (stripeid %d-%d) numBlocks %d (%d bytes) buf 0x%lx\n", tid,
+ printf("raid%d: %s raidAddr %d (stripeid %d-%d) numBlocks %d (%d bytes) buf 0x%lx\n", raidPtr->raidid,
(type == RF_IO_TYPE_READ) ? "READ" : "WRITE", (int) raidAddress,
(int) rf_RaidAddressToStripeID(&raidPtr->Layout, raidAddress),
(int) rf_RaidAddressToStripeID(&raidPtr->Layout, raidAddress + numBlocks - 1),
@@ -772,10 +769,7 @@ rf_FailDisk(
int fcol,
int initRecon)
{
- int tid;
-
- rf_get_threadid(tid);
- printf("[%d] Failing disk r%d c%d\n", tid, frow, fcol);
+ printf("raid%d: Failing disk r%d c%d\n", raidPtr->raidid, frow, fcol);
RF_LOCK_MUTEX(raidPtr->mutex);
raidPtr->numFailures++;
raidPtr->Disks[frow][fcol].status = rf_ds_failed;
@@ -793,11 +787,9 @@ rf_SignalQuiescenceLock(raidPtr, reconDesc)
RF_Raid_t *raidPtr;
RF_RaidReconDesc_t *reconDesc;
{
- int tid;
-
if (rf_quiesceDebug) {
- rf_get_threadid(tid);
- printf("[%d] Signalling quiescence lock\n", tid);
+ printf("raid%d: Signalling quiescence lock\n",
+ raidPtr->raidid);
}
raidPtr->access_suspend_release = 1;
diff --git a/sys/dev/raidframe/rf_engine.c b/sys/dev/raidframe/rf_engine.c
index d74962305ea..bc3fad405db 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.8 2000/01/08 03:34:31 oster Exp $ */
+/* $NetBSD: rf_engine.c,v 1.9 2000/01/08 22:57:31 oster Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -60,7 +60,6 @@
#include "rf_dag.h"
#include "rf_engine.h"
-#include "rf_threadid.h"
#include "rf_etimer.h"
#include "rf_general.h"
#include "rf_dagutils.h"
@@ -110,11 +109,8 @@ rf_ConfigureEngine(
RF_Raid_t * raidPtr,
RF_Config_t * cfgPtr)
{
- int rc, tid = 0;
+ int rc;
- if (rf_engineDebug) {
- rf_get_threadid(tid);
- }
DO_INIT(listp, raidPtr);
raidPtr->node_queue = NULL;
@@ -128,14 +124,14 @@ rf_ConfigureEngine(
* to check return code b/c the kernel panics if it can't create the
* thread. */
if (rf_engineDebug) {
- printf("[%d] Creating engine thread\n", tid);
+ printf("raid%d: Creating engine thread\n", raidPtr->raidid);
}
if (RF_CREATE_THREAD(raidPtr->engine_thread, DAGExecutionThread, raidPtr,"raid")) {
RF_ERRORMSG("RAIDFRAME: Unable to create engine thread\n");
return (ENOMEM);
}
if (rf_engineDebug) {
- printf("[%d] Created engine thread\n", tid);
+ printf("raid%d: Created engine thread\n", raidPtr->raidid);
}
RF_THREADGROUP_STARTED(&raidPtr->engine_tg);
/* XXX something is missing here... */
@@ -147,7 +143,7 @@ rf_ConfigureEngine(
#endif
/* engine thread is now running and waiting for work */
if (rf_engineDebug) {
- printf("[%d] Engine thread running and waiting for events\n", tid);
+ printf("raid%d: Engine thread running and waiting for events\n", raidPtr->raidid);
}
rc = rf_ShutdownCreate(listp, rf_ShutdownEngine, raidPtr);
if (rc) {
@@ -243,14 +239,13 @@ NodeReady(RF_DagNode_t * node)
static void
FireNode(RF_DagNode_t * node)
{
- int tid;
-
switch (node->status) {
case rf_fired:
/* fire the do function of a node */
if (rf_engineDebug) {
- rf_get_threadid(tid);
- printf("[%d] Firing node 0x%lx (%s)\n", tid, (unsigned long) node, node->name);
+ printf("raid%d: Firing node 0x%lx (%s)\n",
+ node->dagHdr->raidPtr->raidid,
+ (unsigned long) node, node->name);
}
if (node->flags & RF_DAGNODE_FLAG_YIELD) {
#if defined(__NetBSD__) && defined(_KERNEL)
@@ -266,9 +261,10 @@ FireNode(RF_DagNode_t * node)
break;
case rf_recover:
/* fire the undo function of a node */
- if (rf_engineDebug || 1) {
- rf_get_threadid(tid);
- printf("[%d] Firing (undo) node 0x%lx (%s)\n", tid, (unsigned long) node, node->name);
+ if (rf_engineDebug) {
+ printf("raid%d: Firing (undo) node 0x%lx (%s)\n",
+ node->dagHdr->raidPtr->raidid,
+ (unsigned long) node, node->name);
}
if (node->flags & RF_DAGNODE_FLAG_YIELD)
#if defined(__NetBSD__) && defined(_KERNEL)
@@ -397,7 +393,7 @@ PropagateResults(
{
RF_DagNode_t *s, *a;
RF_Raid_t *raidPtr;
- int tid, i, ks;
+ int i, ks;
RF_DagNode_t *finishlist = NULL; /* a list of NIL nodes to be
* finished */
RF_DagNode_t *skiplist = NULL; /* list of nodes with failed truedata
@@ -406,8 +402,6 @@ PropagateResults(
RF_DagNode_t *q = NULL, *qh = NULL, *next;
int j, skipNode;
- rf_get_threadid(tid);
-
raidPtr = node->dagHdr->raidPtr;
DO_LOCK(raidPtr);
@@ -597,7 +591,6 @@ ProcessNode(
int context)
{
RF_Raid_t *raidPtr;
- int tid;
raidPtr = node->dagHdr->raidPtr;
@@ -610,15 +603,13 @@ ProcessNode(
node->dagHdr->status = rf_rollForward; /* crossed commit
* barrier */
if (rf_engineDebug || 1) {
- rf_get_threadid(tid);
- printf("[%d] node (%s) returned fail, rolling forward\n", tid, node->name);
+ printf("raid%d: node (%s) returned fail, rolling forward\n", raidPtr->raidid, node->name);
}
} else {
node->dagHdr->status = rf_rollBackward; /* never reached commit
* barrier */
if (rf_engineDebug || 1) {
- rf_get_threadid(tid);
- printf("[%d] node (%s) returned fail, rolling backward\n", tid, node->name);
+ printf("raid%d: node (%s) returned fail, rolling backward\n", raidPtr->raidid, node->name);
}
}
break;
@@ -680,7 +671,6 @@ rf_DispatchDAG(
void *cbArg)
{
RF_Raid_t *raidPtr;
- int tid;
raidPtr = dag->raidPtr;
if (dag->tracerec) {
@@ -691,8 +681,7 @@ rf_DispatchDAG(
RF_PANIC();
}
if (rf_engineDebug) {
- rf_get_threadid(tid);
- printf("[%d] Entering DispatchDAG\n", tid);
+ printf("raid%d: Entering DispatchDAG\n", raidPtr->raidid);
}
raidPtr->dags_in_flight++; /* debug only: blow off proper
* locking */
@@ -719,14 +708,13 @@ DAGExecutionThread(RF_ThreadArg_t arg)
{
RF_DagNode_t *nd, *local_nq, *term_nq, *fire_nq;
RF_Raid_t *raidPtr;
- int ks, tid;
+ int ks;
int s;
raidPtr = (RF_Raid_t *) arg;
if (rf_engineDebug) {
- rf_get_threadid(tid);
- printf("[%d] Engine thread is running\n", tid);
+ printf("raid%d: Engine thread is running\n", raidPtr->raidid);
}
s = splbio();
diff --git a/sys/dev/raidframe/rf_paritylogging.c b/sys/dev/raidframe/rf_paritylogging.c
index 8e760e20140..94480494605 100644
--- a/sys/dev/raidframe/rf_paritylogging.c
+++ b/sys/dev/raidframe/rf_paritylogging.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_paritylogging.c,v 1.5 2000/01/08 05:13:26 oster Exp $ */
+/* $NetBSD: rf_paritylogging.c,v 1.6 2000/01/08 22:57:31 oster Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -44,7 +44,6 @@
#include "rf_dagffwr.h"
#include "rf_dagdegrd.h"
#include "rf_dagdegwr.h"
-#include "rf_threadid.h"
#include "rf_paritylog.h"
#include "rf_paritylogDiskMgr.h"
#include "rf_paritylogging.h"
@@ -540,9 +539,8 @@ rf_ShutdownParityLoggingRegionInfo(RF_ThreadArg_t arg)
raidPtr = (RF_Raid_t *) arg;
if (rf_parityLogDebug) {
- int tid;
- rf_get_threadid(tid);
- printf("[%d] ShutdownParityLoggingRegionInfo\n", tid);
+ printf("raid%d: ShutdownParityLoggingRegionInfo\n",
+ raidPtr->raidid);
}
/* free region information structs */
for (i = 0; i < rf_numParityRegions; i++)
@@ -558,9 +556,7 @@ rf_ShutdownParityLoggingPool(RF_ThreadArg_t arg)
raidPtr = (RF_Raid_t *) arg;
if (rf_parityLogDebug) {
- int tid;
- rf_get_threadid(tid);
- printf("[%d] ShutdownParityLoggingPool\n", tid);
+ printf("raid%d: ShutdownParityLoggingPool\n", raidPtr->raidid);
}
/* free contents of parityLogPool */
FreeParityLogQueue(raidPtr, &raidPtr->parityLogPool);
@@ -574,9 +570,8 @@ rf_ShutdownParityLoggingRegionBufferPool(RF_ThreadArg_t arg)
raidPtr = (RF_Raid_t *) arg;
if (rf_parityLogDebug) {
- int tid;
- rf_get_threadid(tid);
- printf("[%d] ShutdownParityLoggingRegionBufferPool\n", tid);
+ printf("raid%d: ShutdownParityLoggingRegionBufferPool\n",
+ raidPtr->raidid);
}
FreeRegionBufferQueue(&raidPtr->regionBufferPool);
}
@@ -588,9 +583,8 @@ rf_ShutdownParityLoggingParityBufferPool(RF_ThreadArg_t arg)
raidPtr = (RF_Raid_t *) arg;
if (rf_parityLogDebug) {
- int tid;
- rf_get_threadid(tid);
- printf("[%d] ShutdownParityLoggingParityBufferPool\n", tid);
+ printf("raid%d: ShutdownParityLoggingParityBufferPool\n",
+ raidPtr->raidid);
}
FreeRegionBufferQueue(&raidPtr->parityBufferPool);
}
@@ -604,9 +598,8 @@ rf_ShutdownParityLoggingDiskQueue(RF_ThreadArg_t arg)
raidPtr = (RF_Raid_t *) arg;
if (rf_parityLogDebug) {
- int tid;
- rf_get_threadid(tid);
- printf("[%d] ShutdownParityLoggingDiskQueue\n", tid);
+ printf("raid%d: ShutdownParityLoggingDiskQueue\n",
+ raidPtr->raidid);
}
/* free disk manager stuff */
RF_ASSERT(raidPtr->parityLogDiskQueue.bufHead == NULL);
@@ -633,9 +626,7 @@ rf_ShutdownParityLogging(RF_ThreadArg_t arg)
raidPtr = (RF_Raid_t *) arg;
if (rf_parityLogDebug) {
- int tid;
- rf_get_threadid(tid);
- printf("[%d] ShutdownParityLogging\n", tid);
+ printf("raid%d: ShutdownParityLogging\n", raidPtr->raidid);
}
/* shutdown disk thread */
/* This has the desirable side-effect of forcing all regions to be
@@ -656,9 +647,7 @@ rf_ShutdownParityLogging(RF_ThreadArg_t arg)
}
RF_UNLOCK_MUTEX(raidPtr->parityLogDiskQueue.mutex);
if (rf_parityLogDebug) {
- int tid;
- rf_get_threadid(tid);
- printf("[%d] ShutdownParityLogging done (thread completed)\n", tid);
+ printf("raid%d: ShutdownParityLogging done (thread completed)\n", raidPtr->raidid);
}
}
@@ -812,7 +801,6 @@ rf_ParityLoggingDagSelect(
RF_RowCol_t frow, fcol;
RF_RowStatus_t rstat;
int prior_recon;
- int tid;
RF_ASSERT(RF_IO_IS_R_OR_W(type));
@@ -894,9 +882,8 @@ rf_ParityLoggingDagSelect(
RF_ASSERT(failedPDA->col != -1);
if (rf_dagDebug || rf_mapDebug) {
- rf_get_threadid(tid);
- printf("[%d] Redirected type '%c' r %d c %d o %ld -> r %d c %d o %ld\n",
- tid, type, or, oc, (long) oo, failedPDA->row, failedPDA->col, (long) failedPDA->startSector);
+ printf("raid%d: Redirected type '%c' r %d c %d o %ld -> r %d c %d o %ld\n",
+ raidPtr->raidid, type, or, oc, (long) oo, failedPDA->row, failedPDA->col, (long) failedPDA->startSector);
}
asmp->numDataFailed = asmp->numParityFailed = 0;
}
diff --git a/sys/dev/raidframe/rf_psstatus.c b/sys/dev/raidframe/rf_psstatus.c
index 196b69a9808..db5b0484468 100644
--- a/sys/dev/raidframe/rf_psstatus.c
+++ b/sys/dev/raidframe/rf_psstatus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_psstatus.c,v 1.4 1999/08/13 03:41:57 oster Exp $ */
+/* $NetBSD: rf_psstatus.c,v 1.5 2000/01/08 22:57:31 oster Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -38,7 +38,6 @@
#include "rf_types.h"
#include "rf_raid.h"
-#include "rf_threadid.h"
#include "rf_general.h"
#include "rf_debugprint.h"
#include "rf_freelist.h"
@@ -209,11 +208,10 @@ rf_LookupRUStatus(
* specifying */
}
if (p && (flags & RF_PSS_RECON_BLOCKED)) {
- int tid;
- rf_get_threadid(tid);
p->blockCount++;/* if we're asking to block recon, bump the
* count */
- Dprintf3("[%d] Blocked recon on psid %ld. count now %d\n", tid, psID, p->blockCount);
+ Dprintf3("raid%d: Blocked recon on psid %ld. count now %d\n",
+ raidPtr->raidid, psID, p->blockCount);
}
return (p);
}
diff --git a/sys/dev/raidframe/rf_raid1.c b/sys/dev/raidframe/rf_raid1.c
index c0599f1b631..c85e92dd25d 100644
--- a/sys/dev/raidframe/rf_raid1.c
+++ b/sys/dev/raidframe/rf_raid1.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_raid1.c,v 1.4 1999/08/13 03:41:57 oster Exp $ */
+/* $NetBSD: rf_raid1.c,v 1.5 2000/01/08 22:57:30 oster Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -40,7 +40,6 @@
#include "rf_dagdegrd.h"
#include "rf_dagutils.h"
#include "rf_dagfuncs.h"
-#include "rf_threadid.h"
#include "rf_diskqueue.h"
#include "rf_general.h"
#include "rf_utils.h"
@@ -195,7 +194,7 @@ rf_RAID1DagSelect(
{
RF_RowCol_t frow, fcol, or, oc;
RF_PhysDiskAddr_t *failedPDA;
- int prior_recon, tid;
+ int prior_recon;
RF_RowStatus_t rstat;
RF_SectorNum_t oo;
@@ -251,10 +250,11 @@ rf_RAID1DagSelect(
}
}
if (rf_dagDebug || rf_mapDebug) {
- rf_get_threadid(tid);
- printf("[%d] Redirected type '%c' r %d c %d o %ld -> r %d c %d o %ld\n",
- tid, type, or, oc, (long) oo, failedPDA->row, failedPDA->col,
- (long) failedPDA->startSector);
+ printf("raid%d: Redirected type '%c' r %d c %d o %ld -> r %d c %d o %ld\n",
+ raidPtr->raidid, type, or, oc,
+ (long) oo, failedPDA->row,
+ failedPDA->col,
+ (long) failedPDA->startSector);
}
asmap->numDataFailed = asmap->numParityFailed = 0;
}
@@ -277,7 +277,7 @@ rf_VerifyParityRAID1(
int correct_it,
RF_RaidAccessFlags_t flags)
{
- int nbytes, bcount, stripeWidth, ret, i, j, tid = 0, nbad, *bbufs;
+ int nbytes, bcount, stripeWidth, ret, i, j, nbad, *bbufs;
RF_DagNode_t *blockNode, *unblockNode, *wrBlock;
RF_DagHeader_t *rd_dag_h, *wr_dag_h;
RF_AccessStripeMapHeader_t *asm_h;
@@ -293,9 +293,6 @@ rf_VerifyParityRAID1(
RF_StripeNum_t psID;
RF_MCPair_t *mcpair;
- if (rf_verifyParityDebug) {
- rf_get_threadid(tid);
- }
layoutPtr = &raidPtr->Layout;
startAddr = rf_RaidAddressOfPrevStripeBoundary(layoutPtr, raidAddr);
nsector = parityPDA->numSector;
@@ -321,8 +318,9 @@ rf_VerifyParityRAID1(
if (buf == NULL)
goto done;
if (rf_verifyParityDebug) {
- printf("[%d] RAID1 parity verify: buf=%lx bcount=%d (%lx - %lx)\n",
- tid, (long) buf, bcount, (long) buf, (long) buf + bcount);
+ printf("raid%d: RAID1 parity verify: buf=%lx bcount=%d (%lx - %lx)\n",
+ raidPtr->raidid, (long) buf, bcount, (long) buf,
+ (long) buf + bcount);
}
/*
* Generate a DAG which will read the entire stripe- then we can
@@ -394,7 +392,8 @@ rf_VerifyParityRAID1(
rd_dag_h->tracerec = &tracerec;
if (rf_verifyParityDebug > 1) {
- printf("[%d] RAID1 parity verify read dag:\n", tid);
+ printf("raid%d: RAID1 parity verify read dag:\n",
+ raidPtr->raidid);
rf_PrintDAGList(rd_dag_h);
}
RF_LOCK_MUTEX(mcpair->mutex);
@@ -432,8 +431,9 @@ rf_VerifyParityRAID1(
*/
for (i = 0; i < layoutPtr->numDataCol; i++) {
if (rf_verifyParityDebug) {
- printf("[%d] RAID1 parity verify %d bytes: i=%d buf1=%lx buf2=%lx buf=%lx\n",
- tid, nbytes, i, (long) buf1, (long) buf2, (long) buf);
+ printf("raid%d: RAID1 parity verify %d bytes: i=%d buf1=%lx buf2=%lx buf=%lx\n",
+ raidPtr->raidid, nbytes, i, (long) buf1,
+ (long) buf2, (long) buf);
}
ret = bcmp(buf1, buf2, nbytes);
if (ret) {
@@ -449,7 +449,7 @@ rf_VerifyParityRAID1(
buf2[1] & 0xff, buf2[2] & 0xff, buf2[3] & 0xff, buf2[4] & 0xff);
}
if (rf_verifyParityDebug) {
- printf("[%d] RAID1: found bad parity, i=%d\n", tid, i);
+ printf("raid%d: RAID1: found bad parity, i=%d\n", raidPtr->raidid, i);
}
/*
* Parity is bad. Keep track of which columns were bad.
@@ -466,7 +466,7 @@ rf_VerifyParityRAID1(
if ((ret != RF_PARITY_OKAY) && correct_it) {
ret = RF_PARITY_COULD_NOT_CORRECT;
if (rf_verifyParityDebug) {
- printf("[%d] RAID1 parity verify: parity not correct\n", tid);
+ printf("raid%d: RAID1 parity verify: parity not correct\n", raidPtr->raidid);
}
if (bbufs == NULL)
goto done;
@@ -531,7 +531,8 @@ done:
rf_FreeMCPair(mcpair);
rf_FreeAllocList(allocList);
if (rf_verifyParityDebug) {
- printf("[%d] RAID1 parity verify, returning %d\n", tid, ret);
+ printf("raid%d: RAID1 parity verify, returning %d\n",
+ raidPtr->raidid, ret);
}
return (ret);
}
@@ -547,7 +548,7 @@ rf_SubmitReconBufferRAID1(rbuf, keep_it, use_committed)
RF_ReconParityStripeStatus_t *pssPtr;
RF_ReconCtrl_t *reconCtrlPtr;
RF_RaidLayout_t *layoutPtr;
- int tid = 0, retcode, created;
+ int retcode, created;
RF_CallbackDesc_t *cb, *p;
RF_ReconBuffer_t *t;
RF_Raid_t *raidPtr;
@@ -564,10 +565,10 @@ rf_SubmitReconBufferRAID1(rbuf, keep_it, use_committed)
RF_ASSERT(rbuf->col != reconCtrlPtr->fcol);
if (rf_reconbufferDebug) {
- rf_get_threadid(tid);
- printf("[%d] RAID1 reconbuffer submission r%d c%d psid %ld ru%d (failed offset %ld)\n",
- tid, rbuf->row, rbuf->col, (long) rbuf->parityStripeID, rbuf->which_ru,
- (long) rbuf->failedDiskSectorOffset);
+ printf("raid%d: RAID1 reconbuffer submission r%d c%d psid %ld ru%d (failed offset %ld)\n",
+ raidPtr->raidid, rbuf->row, rbuf->col,
+ (long) rbuf->parityStripeID, rbuf->which_ru,
+ (long) rbuf->failedDiskSectorOffset);
}
if (rf_reconDebug) {
printf("RAID1 reconbuffer submit psid %ld buf %lx\n",
@@ -594,13 +595,14 @@ rf_SubmitReconBufferRAID1(rbuf, keep_it, use_committed)
t = NULL;
if (keep_it) {
if (rf_reconbufferDebug) {
- printf("[%d] RAID1 rbuf submission: keeping rbuf\n", tid);
+ printf("raid%d: RAID1 rbuf submission: keeping rbuf\n",
+ raidPtr->raidid);
}
t = rbuf;
} else {
if (use_committed) {
if (rf_reconbufferDebug) {
- printf("[%d] RAID1 rbuf submission: using committed rbuf\n", tid);
+ printf("raid%d: RAID1 rbuf submission: using committed rbuf\n", raidPtr->raidid);
}
t = reconCtrlPtr->committedRbufs;
RF_ASSERT(t);
@@ -609,7 +611,7 @@ rf_SubmitReconBufferRAID1(rbuf, keep_it, use_committed)
} else
if (reconCtrlPtr->floatingRbufs) {
if (rf_reconbufferDebug) {
- printf("[%d] RAID1 rbuf submission: using floating rbuf\n", tid);
+ printf("raid%d: RAID1 rbuf submission: using floating rbuf\n", raidPtr->raidid);
}
t = reconCtrlPtr->floatingRbufs;
reconCtrlPtr->floatingRbufs = t->next;
@@ -618,7 +620,7 @@ rf_SubmitReconBufferRAID1(rbuf, keep_it, use_committed)
}
if (t == NULL) {
if (rf_reconbufferDebug) {
- printf("[%d] RAID1 rbuf submission: waiting for rbuf\n", tid);
+ printf("raid%d: RAID1 rbuf submission: waiting for rbuf\n", raidPtr->raidid);
}
RF_ASSERT((keep_it == 0) && (use_committed == 0));
raidPtr->procsInBufWait++;
@@ -678,7 +680,8 @@ out:
RF_UNLOCK_PSS_MUTEX(raidPtr, rbuf->row, rbuf->parityStripeID);
RF_UNLOCK_MUTEX(reconCtrlPtr->rb_mutex);
if (rf_reconbufferDebug) {
- printf("[%d] RAID1 rbuf submission: returning %d\n", tid, retcode);
+ printf("raid%d: RAID1 rbuf submission: returning %d\n",
+ raidPtr->raidid, retcode);
}
return (retcode);
}
diff --git a/sys/dev/raidframe/rf_raid5.c b/sys/dev/raidframe/rf_raid5.c
index 827825a629b..aebd21a05fd 100644
--- a/sys/dev/raidframe/rf_raid5.c
+++ b/sys/dev/raidframe/rf_raid5.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_raid5.c,v 1.3 1999/02/05 00:06:16 oster Exp $ */
+/* $NetBSD: rf_raid5.c,v 1.4 2000/01/08 22:57:30 oster Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -41,7 +41,6 @@
#include "rf_dagdegrd.h"
#include "rf_dagdegwr.h"
#include "rf_dagutils.h"
-#include "rf_threadid.h"
#include "rf_general.h"
#include "rf_map.h"
#include "rf_utils.h"
@@ -189,7 +188,6 @@ rf_RaidFiveDagSelect(
RF_RowCol_t frow, fcol;
RF_RowStatus_t rstat;
int prior_recon;
- int tid;
RF_ASSERT(RF_IO_IS_R_OR_W(type));
@@ -272,10 +270,11 @@ rf_RaidFiveDagSelect(
RF_ASSERT(failedPDA->col != -1);
if (rf_dagDebug || rf_mapDebug) {
- rf_get_threadid(tid);
- printf("[%d] Redirected type '%c' r %d c %d o %ld -> r %d c %d o %ld\n",
- tid, type, or, oc, (long) oo, failedPDA->row, failedPDA->col,
- (long) failedPDA->startSector);
+ printf("raid%d: Redirected type '%c' r %d c %d o %ld -> r %d c %d o %ld\n",
+ raidPtr->raidid, type, or, oc,
+ (long) oo, failedPDA->row,
+ failedPDA->col,
+ (long) failedPDA->startSector);
}
asmap->numDataFailed = asmap->numParityFailed = 0;
}
diff --git a/sys/dev/raidframe/rf_reconstruct.c b/sys/dev/raidframe/rf_reconstruct.c
index cd3faa4d39c..d86e1c545f8 100644
--- a/sys/dev/raidframe/rf_reconstruct.c
+++ b/sys/dev/raidframe/rf_reconstruct.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_reconstruct.c,v 1.9 2000/01/05 02:57:29 oster Exp $ */
+/* $NetBSD: rf_reconstruct.c,v 1.10 2000/01/08 22:57:31 oster Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -50,7 +50,6 @@
#include "rf_reconutil.h"
#include "rf_revent.h"
#include "rf_reconbuffer.h"
-#include "rf_threadid.h"
#include "rf_acctrace.h"
#include "rf_etimer.h"
#include "rf_dag.h"
@@ -1388,7 +1387,7 @@ CheckHeadSeparation(
{
RF_ReconCtrl_t *reconCtrlPtr = raidPtr->reconControl[row];
RF_CallbackDesc_t *cb, *p, *pt;
- int retval = 0, tid;
+ int retval = 0;
/* if we're too far ahead of the slowest disk, stop working on this
* disk until the slower ones catch up. We do this by scheduling a
@@ -1398,12 +1397,13 @@ CheckHeadSeparation(
* separation before we'll wake up.
*
*/
- rf_get_threadid(tid);
RF_LOCK_MUTEX(reconCtrlPtr->rb_mutex);
if ((raidPtr->headSepLimit >= 0) &&
((ctrl->headSepCounter - reconCtrlPtr->minHeadSepCounter) > raidPtr->headSepLimit)) {
- Dprintf6("[%d] RECON: head sep stall: row %d col %d hsCtr %ld minHSCtr %ld limit %ld\n",
- tid, row, col, ctrl->headSepCounter, reconCtrlPtr->minHeadSepCounter, raidPtr->headSepLimit);
+ Dprintf6("raid%d: RECON: head sep stall: row %d col %d hsCtr %ld minHSCtr %ld limit %ld\n",
+ raidPtr->raidid, row, col, ctrl->headSepCounter,
+ reconCtrlPtr->minHeadSepCounter,
+ raidPtr->headSepLimit);
cb = rf_AllocCallbackDesc();
/* the minHeadSepCounter value we have to get to before we'll
* wake up. build in 20% hysteresis. */
@@ -1500,7 +1500,6 @@ rf_ForceOrBlockRecon(raidPtr, asmap, cbFunc, cbArg)
* offset */
RF_RowCol_t *diskids;
RF_RowCol_t stripe;
- int tid;
RF_ReconUnitNum_t which_ru; /* RU within parity stripe */
RF_RowCol_t fcol, diskno, i;
RF_ReconBuffer_t *new_rbuf; /* ptr to newly allocated rbufs */
@@ -1508,7 +1507,6 @@ rf_ForceOrBlockRecon(raidPtr, asmap, cbFunc, cbArg)
RF_CallbackDesc_t *cb;
int created = 0, nPromoted;
- rf_get_threadid(tid);
psid = rf_MapStripeIDToParityStripeID(&raidPtr->Layout, stripeID, &which_ru);
RF_LOCK_PSS_MUTEX(raidPtr, row, psid);
@@ -1548,7 +1546,7 @@ rf_ForceOrBlockRecon(raidPtr, asmap, cbFunc, cbArg)
if (pssPtr->issued[diskno]) {
nPromoted = rf_DiskIOPromote(&raidPtr->Queues[row][diskno], psid, which_ru);
if (rf_reconDebug && nPromoted)
- printf("[%d] promoted read from row %d col %d\n", tid, row, diskno);
+ printf("raid%d: promoted read from row %d col %d\n", raidPtr->raidid, row, diskno);
} else {
new_rbuf = rf_MakeReconBuffer(raidPtr, row, diskno, RF_RBUF_TYPE_FORCED); /* create new buf */
ComputePSDiskOffsets(raidPtr, psid, row, diskno, &offset, &fd_offset,
@@ -1570,13 +1568,14 @@ rf_ForceOrBlockRecon(raidPtr, asmap, cbFunc, cbArg)
new_rbuf->arg = req;
rf_DiskIOEnqueue(&raidPtr->Queues[row][diskno], req, RF_IO_NORMAL_PRIORITY); /* enqueue the I/O */
- Dprintf3("[%d] Issued new read req on row %d col %d\n", tid, row, diskno);
+ Dprintf3("raid%d: Issued new read req on row %d col %d\n", raidPtr->raidid, row, diskno);
}
}
/* if the write is sitting in the disk queue, elevate its
* priority */
if (rf_DiskIOPromote(&raidPtr->Queues[row][fcol], psid, which_ru))
- printf("[%d] promoted write to row %d col %d\n", tid, row, fcol);
+ printf("raid%d: promoted write to row %d col %d\n",
+ raidPtr->raidid, row, fcol);
}
/* install a callback descriptor to be invoked when recon completes on
* this parity stripe. */
@@ -1587,7 +1586,8 @@ rf_ForceOrBlockRecon(raidPtr, asmap, cbFunc, cbArg)
cb->callbackArg.p = (void *) cbArg;
cb->next = pssPtr->procWaitList;
pssPtr->procWaitList = cb;
- DDprintf2("[%d] Waiting for forced recon on psid %ld\n", tid, psid);
+ DDprintf2("raid%d: Waiting for forced recon on psid %ld\n",
+ raidPtr->raidid, psid);
RF_UNLOCK_PSS_MUTEX(raidPtr, row, psid);
return (1);
@@ -1622,10 +1622,9 @@ rf_UnblockRecon(raidPtr, asmap)
RF_ReconParityStripeStatus_t *pssPtr;
RF_ReconUnitNum_t which_ru;
RF_StripeNum_t psid;
- int tid, created = 0;
+ int created = 0;
RF_CallbackDesc_t *cb;
- rf_get_threadid(tid);
psid = rf_MapStripeIDToParityStripeID(&raidPtr->Layout, stripeID, &which_ru);
RF_LOCK_PSS_MUTEX(raidPtr, row, psid);
pssPtr = rf_LookupRUStatus(raidPtr, raidPtr->reconControl[row]->pssTable, psid, which_ru, RF_PSS_NONE, &created);
@@ -1642,7 +1641,8 @@ rf_UnblockRecon(raidPtr, asmap)
goto out;
}
pssPtr->blockCount--;
- Dprintf3("[%d] unblocking recon on psid %ld: blockcount is %d\n", tid, psid, pssPtr->blockCount);
+ Dprintf3("raid%d: unblocking recon on psid %ld: blockcount is %d\n",
+ raidPtr->raidid, psid, pssPtr->blockCount);
if (pssPtr->blockCount == 0) { /* if recon blockage has been released */
/* unblock recon before calling CauseReconEvent in case
diff --git a/sys/dev/raidframe/rf_shutdown.c b/sys/dev/raidframe/rf_shutdown.c
index a78b52f4b27..e76d95967ea 100644
--- a/sys/dev/raidframe/rf_shutdown.c
+++ b/sys/dev/raidframe/rf_shutdown.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_shutdown.c,v 1.4 1999/02/05 00:06:17 oster Exp $ */
+/* $NetBSD: rf_shutdown.c,v 1.5 2000/01/08 22:57:31 oster Exp $ */
/*
* rf_shutdown.c
*/
@@ -38,7 +38,6 @@
#include "rf_shutdown.h"
#include "rf_debugMem.h"
#include "rf_freelist.h"
-#include "rf_threadid.h"
static void
rf_FreeShutdownEnt(RF_ShutdownList_t * ent)
@@ -85,16 +84,12 @@ rf_ShutdownList(RF_ShutdownList_t ** list)
line = r->line;
if (rf_shutdownDebug) {
- int tid;
- rf_get_threadid(tid);
- printf("[%d] call shutdown, created %s:%d\n", tid, file, line);
+ printf("call shutdown, created %s:%d\n", file, line);
}
r->cleanup(r->arg);
if (rf_shutdownDebug) {
- int tid;
- rf_get_threadid(tid);
- printf("[%d] completed shutdown, created %s:%d\n", tid, file, line);
+ printf("completed shutdown, created %s:%d\n", file, line);
}
rf_FreeShutdownEnt(r);
}
diff --git a/sys/dev/raidframe/rf_states.c b/sys/dev/raidframe/rf_states.c
index 202f7e501bb..1edfdf8ad4d 100644
--- a/sys/dev/raidframe/rf_states.c
+++ b/sys/dev/raidframe/rf_states.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_states.c,v 1.11 2000/01/07 03:47:15 oster Exp $ */
+/* $NetBSD: rf_states.c,v 1.12 2000/01/08 22:57:30 oster Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -34,7 +34,6 @@
#include "rf_dag.h"
#include "rf_desc.h"
#include "rf_aselect.h"
-#include "rf_threadid.h"
#include "rf_general.h"
#include "rf_states.h"
#include "rf_dagutils.h"
@@ -90,6 +89,7 @@ rf_ContinueRaidAccess(RF_RaidAccessDesc_t * desc)
int suspended = RF_FALSE;
int current_state_index = desc->state;
RF_AccessState_t current_state = desc->states[current_state_index];
+ int unit = desc->raidPtr->raidid;
do {
@@ -135,12 +135,10 @@ rf_ContinueRaidAccess(RF_RaidAccessDesc_t * desc)
* renter this function or loop back up, desc should be valid. */
if (rf_printStatesDebug) {
- int tid;
- rf_get_threadid(tid);
-
- printf("[%d] State: %-24s StateIndex: %3i desc: 0x%ld %s\n",
- tid, StateName(current_state), current_state_index, (long) desc,
- suspended ? "callback scheduled" : "looping");
+ printf("raid%d: State: %-24s StateIndex: %3i desc: 0x%ld %s\n",
+ unit, StateName(current_state),
+ current_state_index, (long) desc,
+ suspended ? "callback scheduled" : "looping");
}
} while (!suspended && current_state != rf_LastState);