Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

RF_DEBUG_ACCESS and RF_DEBUG_QUIESCE make things a little smaller.

This commit is contained in:
oster 2002-09-17 03:54:42 +00:00
parent 1b0ab96194
commit 8fd475e54a
3 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/dev/raidframe/rf_archs.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: rf_archs.h,v 1.17 2002/09/17 03:43:34 oster Exp $ */ /* $NetBSD: rf_archs.h,v 1.18 2002/09/17 03:54:42 oster Exp $ */
/* /*
* Copyright (c) 1995 Carnegie-Mellon University. * Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved. * All rights reserved.
@ -128,6 +128,10 @@
#define RF_DEBUG_QUEUE 0 #define RF_DEBUG_QUEUE 0
#endif #endif
#ifndef RF_DEBUG_QUIESCE
#define RF_DEBUG_QUIESCE 0
#endif
#include "rf_options.h" #include "rf_options.h"
#endif /* !_RF__RF_ARCHS_H_ */ #endif /* !_RF__RF_ARCHS_H_ */

17
sys/dev/raidframe/rf_driver.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: rf_driver.c,v 1.60 2002/09/16 23:40:57 oster Exp $ */ /* $NetBSD: rf_driver.c,v 1.61 2002/09/17 03:54:42 oster Exp $ */
/*- /*-
* Copyright (c) 1999 The NetBSD Foundation, Inc. * Copyright (c) 1999 The NetBSD Foundation, Inc.
* All rights reserved. * All rights reserved.
@ -73,7 +73,7 @@
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: rf_driver.c,v 1.60 2002/09/16 23:40:57 oster Exp $"); __KERNEL_RCSID(0, "$NetBSD: rf_driver.c,v 1.61 2002/09/17 03:54:42 oster Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -116,6 +116,10 @@ __KERNEL_RCSID(0, "$NetBSD: rf_driver.c,v 1.60 2002/09/16 23:40:57 oster Exp $")
#include <sys/buf.h> #include <sys/buf.h>
#ifndef RF_ACCESS_DEBUG
#define RF_ACCESS_DEBUG 0
#endif
/* rad == RF_RaidAccessDesc_t */ /* rad == RF_RaidAccessDesc_t */
static RF_FreeList_t *rf_rad_freelist; static RF_FreeList_t *rf_rad_freelist;
#define RF_MAX_FREE_RAD 128 #define RF_MAX_FREE_RAD 128
@ -654,6 +658,7 @@ bp_in is a buf pointer. void * to facilitate ignoring it outside the kernel
raidAddress += rf_raidSectorOffset; raidAddress += rf_raidSectorOffset;
#if RF_ACCESS_DEBUG
if (rf_accessDebug) { if (rf_accessDebug) {
printf("logBytes is: %d %d %d\n", raidPtr->raidid, printf("logBytes is: %d %d %d\n", raidPtr->raidid,
@ -667,6 +672,7 @@ bp_in is a buf pointer. void * to facilitate ignoring it outside the kernel
(int) rf_RaidAddressToByte(raidPtr, numBlocks), (int) rf_RaidAddressToByte(raidPtr, numBlocks),
(long) bufPtr); (long) bufPtr);
} }
#endif
if (raidAddress + numBlocks > raidPtr->totalSectors) { if (raidAddress + numBlocks > raidPtr->totalSectors) {
printf("DoAccess: raid addr %lu too large to access %lu sectors. Max legal addr is %lu\n", printf("DoAccess: raid addr %lu too large to access %lu sectors. Max legal addr is %lu\n",
@ -754,10 +760,12 @@ rf_SignalQuiescenceLock(raidPtr, reconDesc)
RF_Raid_t *raidPtr; RF_Raid_t *raidPtr;
RF_RaidReconDesc_t *reconDesc; RF_RaidReconDesc_t *reconDesc;
{ {
#if RF_DEBUG_QUIESCE
if (rf_quiesceDebug) { if (rf_quiesceDebug) {
printf("raid%d: Signalling quiescence lock\n", printf("raid%d: Signalling quiescence lock\n",
raidPtr->raidid); raidPtr->raidid);
} }
#endif
raidPtr->access_suspend_release = 1; raidPtr->access_suspend_release = 1;
if (raidPtr->waiting_for_quiescence) { if (raidPtr->waiting_for_quiescence) {
@ -769,9 +777,10 @@ int
rf_SuspendNewRequestsAndWait(raidPtr) rf_SuspendNewRequestsAndWait(raidPtr)
RF_Raid_t *raidPtr; RF_Raid_t *raidPtr;
{ {
#if RF_DEBUG_QUIESCE
if (rf_quiesceDebug) if (rf_quiesceDebug)
printf("raid%d: Suspending new reqs\n", raidPtr->raidid); printf("raid%d: Suspending new reqs\n", raidPtr->raidid);
#endif
RF_LOCK_MUTEX(raidPtr->access_suspend_mutex); RF_LOCK_MUTEX(raidPtr->access_suspend_mutex);
raidPtr->accesses_suspended++; raidPtr->accesses_suspended++;
raidPtr->waiting_for_quiescence = (raidPtr->accs_in_flight == 0) ? 0 : 1; raidPtr->waiting_for_quiescence = (raidPtr->accs_in_flight == 0) ? 0 : 1;
@ -797,8 +806,10 @@ rf_ResumeNewRequests(raidPtr)
{ {
RF_CallbackDesc_t *t, *cb; RF_CallbackDesc_t *t, *cb;
#if RF_DEBUG_QUIESCE
if (rf_quiesceDebug) if (rf_quiesceDebug)
printf("Resuming new reqs\n"); printf("Resuming new reqs\n");
#endif
RF_LOCK_MUTEX(raidPtr->access_suspend_mutex); RF_LOCK_MUTEX(raidPtr->access_suspend_mutex);
raidPtr->accesses_suspended--; raidPtr->accesses_suspended--;

7
sys/dev/raidframe/rf_states.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: rf_states.c,v 1.17 2002/07/13 20:14:34 oster Exp $ */ /* $NetBSD: rf_states.c,v 1.18 2002/09/17 03:54:43 oster Exp $ */
/* /*
* Copyright (c) 1995 Carnegie-Mellon University. * Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved. * All rights reserved.
@ -27,7 +27,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: rf_states.c,v 1.17 2002/07/13 20:14:34 oster Exp $"); __KERNEL_RCSID(0, "$NetBSD: rf_states.c,v 1.18 2002/09/17 03:54:43 oster Exp $");
#include <sys/errno.h> #include <sys/errno.h>
@ -299,9 +299,10 @@ rf_State_Quiesce(RF_RaidAccessDesc_t * desc)
RF_ETIMER_EVAL(timer); RF_ETIMER_EVAL(timer);
tracerec->specific.user.suspend_ovhd_us += RF_ETIMER_VAL_US(timer); tracerec->specific.user.suspend_ovhd_us += RF_ETIMER_VAL_US(timer);
#if RF_DEBUG_QUIESCE
if (suspended && rf_quiesceDebug) if (suspended && rf_quiesceDebug)
printf("Stalling access due to quiescence lock\n"); printf("Stalling access due to quiescence lock\n");
#endif
desc->state++; desc->state++;
return suspended; return suspended;
} }