summaryrefslogtreecommitdiff
path: root/sys/dev/raidframe/rf_reconstruct.h
diff options
context:
space:
mode:
authorThierry Deval <tdeval@cvs.openbsd.org>2002-12-16 07:01:06 +0000
committerThierry Deval <tdeval@cvs.openbsd.org>2002-12-16 07:01:06 +0000
commit9f4f754a2c89fa0aae2495b9897832c871e55410 (patch)
tree990a42520130e4092662926e20b65536fa947a43 /sys/dev/raidframe/rf_reconstruct.h
parentd18f950d8b18360863af577de1796c0079f4bc20 (diff)
Major KNF. Incentive from Tedu
Diffstat (limited to 'sys/dev/raidframe/rf_reconstruct.h')
-rw-r--r--sys/dev/raidframe/rf_reconstruct.h371
1 files changed, 238 insertions, 133 deletions
diff --git a/sys/dev/raidframe/rf_reconstruct.h b/sys/dev/raidframe/rf_reconstruct.h
index 8a0842ce867..42296b5db1d 100644
--- a/sys/dev/raidframe/rf_reconstruct.h
+++ b/sys/dev/raidframe/rf_reconstruct.h
@@ -1,5 +1,6 @@
-/* $OpenBSD: rf_reconstruct.h,v 1.4 2000/08/08 16:07:45 peter Exp $ */
+/* $OpenBSD: rf_reconstruct.h,v 1.5 2002/12/16 07:01:05 tdeval Exp $ */
/* $NetBSD: rf_reconstruct.h,v 1.5 2000/05/28 00:48:30 oster Exp $ */
+
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -27,9 +28,9 @@
* rights to redistribute these changes.
*/
-/*********************************************************
- * rf_reconstruct.h -- header file for reconstruction code
- *********************************************************/
+/***********************************************************
+ * rf_reconstruct.h -- Header file for reconstruction code.
+ ***********************************************************/
#ifndef _RF__RF_RECONSTRUCT_H_
#define _RF__RF_RECONSTRUCT_H_
@@ -39,47 +40,93 @@
#include "rf_reconmap.h"
#include "rf_psstatus.h"
-/* reconstruction configuration information */
+/* Reconstruction configuration information. */
struct RF_ReconConfig_s {
- unsigned numFloatingReconBufs; /* number of floating recon bufs to
- * use */
- RF_HeadSepLimit_t headSepLimit; /* how far apart the heads are allow
- * to become, in parity stripes */
+ unsigned numFloatingReconBufs;
+ /*
+ * Number of floating recon
+ * bufs to use.
+ */
+ RF_HeadSepLimit_t headSepLimit; /*
+ * How far apart the heads are
+ * allowed to become, in parity
+ * stripes.
+ */
};
-/* a reconstruction buffer */
+
+/* A reconstruction buffer. */
struct RF_ReconBuffer_s {
- RF_Raid_t *raidPtr; /* void * to avoid recursive includes */
- caddr_t buffer; /* points to the data */
- RF_StripeNum_t parityStripeID; /* the parity stripe that this data
- * relates to */
- int which_ru; /* which reconstruction unit within the PSS */
- RF_SectorNum_t failedDiskSectorOffset; /* the offset into the failed
- * disk */
- RF_RowCol_t row, col; /* which disk this buffer belongs to or is
- * targeted at */
- RF_StripeCount_t count; /* counts the # of SUs installed so far */
- int priority; /* used to force hi priority recon */
- RF_RbufType_t type; /* FORCED or FLOATING */
- char *arrived; /* [x] = 1/0 if SU from disk x has/hasn't
- * arrived */
- RF_ReconBuffer_t *next; /* used for buffer management */
- void *arg; /* generic field for general use */
- RF_RowCol_t spRow, spCol; /* spare disk to which this buf should
- * be written */
- /* if dist sparing off, always identifies the replacement disk */
- RF_SectorNum_t spOffset;/* offset into the spare disk */
- /* if dist sparing off, identical to failedDiskSectorOffset */
- RF_ReconParityStripeStatus_t *pssPtr; /* debug- pss associated with
- * issue-pending write */
+ RF_Raid_t *raidPtr; /*
+ * (void *) to avoid recursive
+ * includes.
+ */
+ caddr_t buffer; /* Points to the data. */
+ RF_StripeNum_t parityStripeID;/*
+ * The parity stripe that this
+ * data relates to.
+ */
+ int which_ru; /*
+ * Which reconstruction unit
+ * within the PSS.
+ */
+ RF_SectorNum_t failedDiskSectorOffset;
+ /*
+ * The offset into the failed
+ * disk.
+ */
+ RF_RowCol_t row, col; /*
+ * Which disk this buffer
+ * belongs to or is targeted at.
+ */
+ RF_StripeCount_t count; /*
+ * Counts the # of SUs
+ * installed so far.
+ */
+ int priority; /*
+ * Used to force high priority
+ * recon.
+ */
+ RF_RbufType_t type; /* FORCED or FLOATING. */
+ char *arrived; /*
+ * [x] = 1/0 if SU from disk x
+ * has/hasn't arrived.
+ */
+ RF_ReconBuffer_t *next; /*
+ * Used for buffer management.
+ */
+ void *arg; /*
+ * Generic field for general
+ * use.
+ */
+ RF_RowCol_t spRow, spCol; /*
+ * Spare disk to which this buf
+ * should be written.
+ */
+ /* If dist sparing off, always identifies the replacement disk */
+ RF_SectorNum_t spOffset; /*
+ * Offset into the spare disk.
+ */
+ /* If dist sparing off, identical to failedDiskSectorOffset */
+ RF_ReconParityStripeStatus_t *pssPtr; /*
+ * Debug pss associated with
+ * issue-pending write.
+ */
};
-/* a reconstruction event descriptor. The event types currently are:
- * RF_REVENT_READDONE -- a read operation has completed
- * RF_REVENT_WRITEDONE -- a write operation has completed
- * RF_REVENT_BUFREADY -- the buffer manager has produced a full buffer
- * RF_REVENT_BLOCKCLEAR -- a reconstruction blockage has been cleared
- * RF_REVENT_BUFCLEAR -- the buffer manager has released a process blocked on submission
- * RF_REVENT_SKIP -- we need to skip the current RU and go on to the next one, typ. b/c we found recon forced
- * RF_REVENT_FORCEDREADONE- a forced-reconstructoin read operation has completed
+
+/*
+ * A reconstruction event descriptor. The event types currently are:
+ * RF_REVENT_READDONE -- A read operation has completed.
+ * RF_REVENT_WRITEDONE -- A write operation has completed.
+ * RF_REVENT_BUFREADY -- The buffer manager has produced a
+ * full buffer.
+ * RF_REVENT_BLOCKCLEAR -- A reconstruction blockage has been cleared.
+ * RF_REVENT_BUFCLEAR -- The buffer manager has released a process
+ * blocked on submission.
+ * RF_REVENT_SKIP -- We need to skip the current RU and go on
+ * to the next one, typ. b/c we found recon
+ * forced.
+ * RF_REVENT_FORCEDREADONE -- A forced-reconstructoin read operation has
+ * completed.
*/
typedef enum RF_Revent_e {
RF_REVENT_READDONE,
@@ -90,113 +137,171 @@ typedef enum RF_Revent_e {
RF_REVENT_HEADSEPCLEAR,
RF_REVENT_SKIP,
RF_REVENT_FORCEDREADDONE
-} RF_Revent_t;
+} RF_Revent_t;
struct RF_ReconEvent_s {
- RF_Revent_t type; /* what kind of event has occurred */
- RF_RowCol_t col; /* row ID is implicit in the queue in which
- * the event is placed */
- void *arg; /* a generic argument */
- RF_ReconEvent_t *next;
+ RF_Revent_t type; /* What kind of event has occurred. */
+ RF_RowCol_t col; /*
+ * Row ID is implicit in the queue in
+ * which the event is placed.
+ */
+ void *arg; /* A generic argument. */
+ RF_ReconEvent_t *next;
};
+
/*
- * Reconstruction control information maintained per-disk
+ * Reconstruction control information maintained per-disk.
* (for surviving disks)
*/
struct RF_PerDiskReconCtrl_s {
- RF_ReconCtrl_t *reconCtrl;
- RF_RowCol_t row, col; /* to make this structure self-identifying */
- RF_StripeNum_t curPSID; /* the next parity stripe ID to check on this
- * disk */
- RF_HeadSepLimit_t headSepCounter; /* counter used to control
- * maximum head separation */
- RF_SectorNum_t diskOffset; /* the offset into the indicated disk
- * of the current PU */
- RF_ReconUnitNum_t ru_count; /* this counts off the recon units
- * within each parity unit */
- RF_ReconBuffer_t *rbuf; /* the recon buffer assigned to this disk */
+ RF_ReconCtrl_t *reconCtrl;
+ RF_RowCol_t row, col; /*
+ * To make this structure
+ * self-identifying.
+ */
+ RF_StripeNum_t curPSID; /*
+ * The next parity stripe ID
+ * to check on this disk.
+ */
+ RF_HeadSepLimit_t headSepCounter;/*
+ * Counter used to control
+ * maximum head separation.
+ */
+ RF_SectorNum_t diskOffset; /*
+ * The offset into the
+ * indicated disk
+ * of the current PU.
+ */
+ RF_ReconUnitNum_t ru_count; /*
+ * This counts off the recon
+ * units within each parity
+ * unit.
+ */
+ RF_ReconBuffer_t *rbuf; /*
+ * The recon buffer assigned
+ * to this disk.
+ */
};
-/* main reconstruction control structure */
+
+/* Main reconstruction control structure. */
struct RF_ReconCtrl_s {
- RF_RaidReconDesc_t *reconDesc;
- RF_RowCol_t fcol; /* which column has failed */
- RF_PerDiskReconCtrl_t *perDiskInfo; /* information maintained
- * per-disk */
- RF_ReconMap_t *reconMap;/* map of what has/has not been reconstructed */
- RF_RowCol_t spareRow; /* which of the spare disks we're using */
- RF_RowCol_t spareCol;
- RF_StripeNum_t lastPSID;/* the ID of the last parity stripe we want
- * reconstructed */
- int percentComplete;/* percentage completion of reconstruction */
- int numRUsComplete; /* number of Reconstruction Units done */
- int numRUsTotal; /* total number of Reconstruction Units */
-
- /* reconstruction event queue */
- RF_ReconEvent_t *eventQueue; /* queue of pending reconstruction
- * events */
- RF_DECLARE_MUTEX(eq_mutex) /* mutex for locking event
- * queue */
- RF_DECLARE_COND(eq_cond) /* condition variable for
- * signalling recon events */
- int eq_count; /* debug only */
-
- /* reconstruction buffer management */
- RF_DECLARE_MUTEX(rb_mutex) /* mutex for messing around
- * with recon buffers */
- RF_ReconBuffer_t *floatingRbufs; /* available floating
- * reconstruction buffers */
- RF_ReconBuffer_t *committedRbufs; /* recon buffers that have
- * been committed to some
- * waiting disk */
- RF_ReconBuffer_t *fullBufferList; /* full buffers waiting to be
- * written out */
- RF_ReconBuffer_t *priorityList; /* full buffers that have been
- * elevated to higher priority */
- RF_CallbackDesc_t *bufferWaitList; /* disks that are currently
- * blocked waiting for buffers */
-
- /* parity stripe status table */
- RF_PSStatusHeader_t *pssTable; /* stores the reconstruction status of
- * active parity stripes */
-
- /* maximum-head separation control */
- RF_HeadSepLimit_t minHeadSepCounter; /* the minimum hs counter over
- * all disks */
- RF_CallbackDesc_t *headSepCBList; /* list of callbacks to be
- * done as minPSID advances */
-
- /* performance monitoring */
- struct timeval starttime; /* recon start time */
-
- void (*continueFunc) (void *); /* function to call when io
- * returns */
- void *continueArg; /* argument for Func */
-};
-/* the default priority for reconstruction accesses */
-#define RF_IO_RECON_PRIORITY RF_IO_LOW_PRIORITY
+ RF_RaidReconDesc_t *reconDesc;
+ RF_RowCol_t fcol; /* Which column has failed. */
+ RF_PerDiskReconCtrl_t *perDiskInfo; /*
+ * Information maintained
+ * per-disk.
+ */
+ RF_ReconMap_t *reconMap; /*
+ * Map of what has/has not
+ * been reconstructed.
+ */
+ RF_RowCol_t spareRow; /*
+ * Which of the spare disks
+ * we're using.
+ */
+ RF_RowCol_t spareCol;
+ RF_StripeNum_t lastPSID; /*
+ * The ID of the last
+ * parity stripe we want
+ * reconstructed.
+ */
+ int percentComplete;
+ /*
+ * Percentage completion of
+ * reconstruction.
+ */
+ int numRUsComplete;/*
+ * Number of Reconstruction
+ * Units done.
+ */
+ int numRUsTotal; /*
+ * Total number of
+ * Reconstruction Units.
+ */
-int rf_ConfigureReconstruction(RF_ShutdownList_t ** listp);
+ /* Reconstruction event queue. */
+ RF_ReconEvent_t *eventQueue; /*
+ * Queue of pending
+ * reconstruction events.
+ */
+ RF_DECLARE_MUTEX (eq_mutex); /*
+ * Mutex for locking event
+ * queue.
+ */
+ RF_DECLARE_COND (eq_cond); /*
+ * Condition variable for
+ * signalling recon events.
+ */
+ int eq_count; /* Debug only. */
-int
-rf_ReconstructFailedDisk(RF_Raid_t * raidPtr, RF_RowCol_t row,
- RF_RowCol_t col);
+ /* Reconstruction buffer management. */
+ RF_DECLARE_MUTEX (rb_mutex); /*
+ * Mutex for messing around
+ * with recon buffers.
+ */
+ RF_ReconBuffer_t *floatingRbufs; /*
+ * Available floating
+ * reconstruction buffers.
+ */
+ RF_ReconBuffer_t *committedRbufs;/*
+ * Recon buffers that have
+ * been committed to some
+ * waiting disk.
+ */
+ RF_ReconBuffer_t *fullBufferList;/*
+ * Full buffers waiting to be
+ * written out.
+ */
+ RF_ReconBuffer_t *priorityList; /*
+ * Full buffers that have been
+ * elevated to higher priority.
+ */
+ RF_CallbackDesc_t *bufferWaitList;/*
+ * Disks that are currently
+ * blocked waiting for buffers.
+ */
-int
-rf_ReconstructFailedDiskBasic(RF_Raid_t * raidPtr, RF_RowCol_t row,
- RF_RowCol_t col);
+ /* Parity stripe status table. */
+ RF_PSStatusHeader_t *pssTable; /*
+ * Stores the reconstruction
+ * status of active parity
+ * stripes.
+ */
-int
-rf_ReconstructInPlace(RF_Raid_t * raidPtr, RF_RowCol_t row, RF_RowCol_t col);
+ /* Maximum-head separation control. */
+ RF_HeadSepLimit_t minHeadSepCounter;
+ /*
+ * The minimum hs counter over
+ * all disks.
+ */
+ RF_CallbackDesc_t *headSepCBList; /*
+ * List of callbacks to be
+ * done as minPSID advances.
+ */
-int rf_ContinueReconstructFailedDisk(RF_RaidReconDesc_t * reconDesc);
+ /* Performance monitoring. */
+ struct timeval starttime; /* Recon start time. */
-int
-rf_ForceOrBlockRecon(RF_Raid_t * raidPtr, RF_AccessStripeMap_t * asmap,
- void (*cbFunc) (RF_Raid_t *, void *), void *cbArg);
+ void (*continueFunc) (void *);
+ /*
+ * Function to call when io
+ * returns.
+ */
+ void *continueArg; /* Argument for Func. */
+};
- int rf_UnblockRecon(RF_Raid_t * raidPtr, RF_AccessStripeMap_t * asmap);
+/* The default priority for reconstruction accesses. */
+#define RF_IO_RECON_PRIORITY RF_IO_LOW_PRIORITY
- int rf_RegisterReconDoneProc(RF_Raid_t * raidPtr, void (*proc) (RF_Raid_t *, void *), void *arg,
- RF_ReconDoneProc_t ** handlep);
+int rf_ConfigureReconstruction(RF_ShutdownList_t **);
+int rf_ReconstructFailedDisk(RF_Raid_t *, RF_RowCol_t, RF_RowCol_t);
+int rf_ReconstructFailedDiskBasic(RF_Raid_t *, RF_RowCol_t, RF_RowCol_t);
+int rf_ReconstructInPlace(RF_Raid_t *, RF_RowCol_t, RF_RowCol_t);
+int rf_ContinueReconstructFailedDisk(RF_RaidReconDesc_t *);
+int rf_ForceOrBlockRecon(RF_Raid_t *, RF_AccessStripeMap_t *,
+ void (*) (RF_Raid_t *, void *), void *);
+int rf_UnblockRecon(RF_Raid_t *, RF_AccessStripeMap_t *);
+int rf_RegisterReconDoneProc(RF_Raid_t *, void (*) (RF_Raid_t *, void *),
+ void *, RF_ReconDoneProc_t **);
-#endif /* !_RF__RF_RECONSTRUCT_H_ */
+#endif /* !_RF__RF_RECONSTRUCT_H_ */