summaryrefslogtreecommitdiff
path: root/sys/dev/raidframe
diff options
context:
space:
mode:
authoroster <oster@NetBSD.org>2000-03-04 03:27:13 +0000
committeroster <oster@NetBSD.org>2000-03-04 03:27:13 +0000
commit194aba4e416e060c186b2972ec0651465ec1d770 (patch)
treee809ac125dc0f7b25685e4a2ab7eaa700bbe98f0 /sys/dev/raidframe
parent612e2e8f9213a1e1c7dc95f0bdf3d65a77bfc226 (diff)
Garbage collect the (already disabled) "random" queue type.
Diffstat (limited to 'sys/dev/raidframe')
-rw-r--r--sys/dev/raidframe/rf_archs.h4
-rw-r--r--sys/dev/raidframe/rf_diskqueue.c11
-rw-r--r--sys/dev/raidframe/rf_fifo.c88
3 files changed, 3 insertions, 100 deletions
diff --git a/sys/dev/raidframe/rf_archs.h b/sys/dev/raidframe/rf_archs.h
index c08102828e1..36a96872770 100644
--- a/sys/dev/raidframe/rf_archs.h
+++ b/sys/dev/raidframe/rf_archs.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_archs.h,v 1.8 2000/03/04 03:22:17 oster Exp $ */
+/* $NetBSD: rf_archs.h,v 1.9 2000/03/04 03:27:13 oster Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -66,8 +66,6 @@
#define RF_MEMORY_REDZONES 0
#define RF_RECON_STATS 1
-#define RF_INCLUDE_QUEUE_RANDOM 0
-
#include "rf_options.h"
#endif /* !_RF__RF_ARCHS_H_ */
diff --git a/sys/dev/raidframe/rf_diskqueue.c b/sys/dev/raidframe/rf_diskqueue.c
index c2b13cee7e9..e428f3a4a07 100644
--- a/sys/dev/raidframe/rf_diskqueue.c
+++ b/sys/dev/raidframe/rf_diskqueue.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_diskqueue.c,v 1.11 2000/02/24 03:52:15 oster Exp $ */
+/* $NetBSD: rf_diskqueue.c,v 1.12 2000/03/04 03:27:13 oster Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -130,15 +130,6 @@ static RF_DiskQueueSW_t diskqueuesw[] = {
rf_CscanPeek,
rf_SstfPromote},
-#if !defined(_KERNEL) && RF_INCLUDE_QUEUE_RANDOM > 0
- /* to make a point to Chris :-> */
- {"random", /* random */
- rf_FifoCreate,
- rf_FifoEnqueue,
- rf_RandomDequeue,
- rf_RandomPeek,
- rf_FifoPromote},
-#endif /* !KERNEL && RF_INCLUDE_QUEUE_RANDOM > 0 */
};
#define NUM_DISK_QUEUE_TYPES (sizeof(diskqueuesw)/sizeof(RF_DiskQueueSW_t))
diff --git a/sys/dev/raidframe/rf_fifo.c b/sys/dev/raidframe/rf_fifo.c
index 76b7887223e..5e7d9ed7d0d 100644
--- a/sys/dev/raidframe/rf_fifo.c
+++ b/sys/dev/raidframe/rf_fifo.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_fifo.c,v 1.4 2000/01/08 23:45:05 oster Exp $ */
+/* $NetBSD: rf_fifo.c,v 1.5 2000/03/04 03:27:13 oster Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -146,92 +146,6 @@ rf_FifoDequeue(q_in)
}
return (nd);
}
-/* This never gets used!! No loss (I hope) if we don't include it... GO */
-#if !defined(__NetBSD__) && !defined(_KERNEL)
-
-static RF_DiskQueueData_t *
-n_in_q(headp, tailp, countp, n, deq)
- RF_DiskQueueData_t **headp;
- RF_DiskQueueData_t **tailp;
- int *countp;
- int n;
- int deq;
-{
- RF_DiskQueueData_t *r, *s;
- int i;
-
- for (s = NULL, i = n, r = *headp; r; s = r, r = r->next) {
- if (i == 0)
- break;
- i--;
- }
- RF_ASSERT(r != NULL);
- if (deq == 0)
- return (r);
- if (s) {
- s->next = r->next;
- } else {
- *headp = r->next;
- }
- if (*tailp == r)
- *tailp = s;
- (*countp)--;
- return (r);
-}
-#endif
-
-#if !defined(KERNEL) && RF_INCLUDE_QUEUE_RANDOM > 0
-RF_DiskQueueData_t *
-rf_RandomPeek(q_in)
- void *q_in;
-{
- RF_FifoHeader_t *q = (RF_FifoHeader_t *) q_in;
- RF_DiskQueueData_t *req;
- int n;
-
- if (q->hq_head) {
- n = q->rval % q->hq_count;
- req = n_in_q(&q->hq_head, &q->hq_tail, &q->hq_count, n, 0);
- } else {
- RF_ASSERT(q->hq_count == 0);
- if (q->lq_head == NULL) {
- RF_ASSERT(q->lq_count == 0);
- return (NULL);
- }
- n = q->rval % q->lq_count;
- req = n_in_q(&q->lq_head, &q->lq_tail, &q->lq_count, n, 0);
- }
- RF_ASSERT((q->hq_count + q->lq_count) == req->queue->queueLength);
- RF_ASSERT(req != NULL);
- return (req);
-}
-
-RF_DiskQueueData_t *
-rf_RandomDequeue(q_in)
- void *q_in;
-{
- RF_FifoHeader_t *q = (RF_FifoHeader_t *) q_in;
- RF_DiskQueueData_t *req;
- int n;
-
- if (q->hq_head) {
- n = q->rval % q->hq_count;
- q->rval = (long) RF_STATIC_RANDOM();
- req = n_in_q(&q->hq_head, &q->hq_tail, &q->hq_count, n, 1);
- } else {
- RF_ASSERT(q->hq_count == 0);
- if (q->lq_head == NULL) {
- RF_ASSERT(q->lq_count == 0);
- return (NULL);
- }
- n = q->rval % q->lq_count;
- q->rval = (long) RF_STATIC_RANDOM();
- req = n_in_q(&q->lq_head, &q->lq_tail, &q->lq_count, n, 1);
- }
- RF_ASSERT((q->hq_count + q->lq_count) == (req->queue->queueLength - 1));
- return (req);
-}
-#endif /* !KERNEL && RF_INCLUDE_QUEUE_RANDOM > 0 */
/* Return ptr to item at head of queue. Used to examine request
* info without actually dequeueing the request.