diff options
| author | oster <oster@NetBSD.org> | 1999-01-26 02:33:49 +0000 |
|---|---|---|
| committer | oster <oster@NetBSD.org> | 1999-01-26 02:33:49 +0000 |
| commit | 1eecf8e491f4ecb40edff2d8093fac193d203e73 (patch) | |
| tree | fc9f06792e783e03fe393007c4caf9d3c8da17f3 /sys/dev/raidframe/rf_debugMem.h | |
| parent | 7c2e6d4c420981d843ea6d87e2aa3ad916fac166 (diff) | |
RAIDframe cleanup, phase 1. Nuke simulator support, user-land driver,
out-dated comments, and other unneeded stuff. This helps prepare
for cleaning up the rest of the code, and adding new functionality.
No functional changes to the kernel code in this commit.
Diffstat (limited to 'sys/dev/raidframe/rf_debugMem.h')
| -rw-r--r-- | sys/dev/raidframe/rf_debugMem.h | 131 |
1 files changed, 4 insertions, 127 deletions
diff --git a/sys/dev/raidframe/rf_debugMem.h b/sys/dev/raidframe/rf_debugMem.h index f7b35152f7f..be0670be020 100644 --- a/sys/dev/raidframe/rf_debugMem.h +++ b/sys/dev/raidframe/rf_debugMem.h @@ -1,4 +1,4 @@ -/* $NetBSD: rf_debugMem.h,v 1.2 1999/01/14 22:49:05 thorpej Exp $ */ +/* $NetBSD: rf_debugMem.h,v 1.3 1999/01/26 02:33:54 oster Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -32,106 +32,6 @@ * IMPORTANT: if you put the lock/unlock mutex stuff back in here, you * need to take it out of the routines in debugMem.c * - * Log: rf_debugMem.h,v - * Revision 1.27 1996/07/18 22:57:14 jimz - * port simulator to AIX - * - * Revision 1.26 1996/06/11 13:46:43 jimz - * make bracing consistent around memory allocation macros - * - * Revision 1.25 1996/06/10 11:55:47 jimz - * Straightened out some per-array/not-per-array distinctions, fixed - * a couple bugs related to confusion. Added shutdown lists. Removed - * layout shutdown function (now subsumed by shutdown lists). - * - * Revision 1.24 1996/06/05 18:06:02 jimz - * Major code cleanup. The Great Renaming is now done. - * Better modularity. Better typing. Fixed a bunch of - * synchronization bugs. Made a lot of global stuff - * per-desc or per-array. Removed dead code. - * - * Revision 1.23 1996/05/30 11:29:41 jimz - * Numerous bug fixes. Stripe lock release code disagreed with the taking code - * about when stripes should be locked (I made it consistent: no parity, no lock) - * There was a lot of extra serialization of I/Os which I've removed- a lot of - * it was to calculate values for the cache code, which is no longer with us. - * More types, function, macro cleanup. Added code to properly quiesce the array - * on shutdown. Made a lot of stuff array-specific which was (bogusly) general - * before. Fixed memory allocation, freeing bugs. - * - * Revision 1.22 1996/05/27 18:56:37 jimz - * more code cleanup - * better typing - * compiles in all 3 environments - * - * Revision 1.21 1996/05/23 22:17:40 jimz - * fix alloclist macro names for kernel - * - * Revision 1.20 1996/05/23 21:46:35 jimz - * checkpoint in code cleanup (release prep) - * lots of types, function names have been fixed - * - * Revision 1.19 1996/05/23 13:18:23 jimz - * include rf_options.h - * - * Revision 1.18 1996/05/23 00:33:23 jimz - * code cleanup: move all debug decls to rf_options.c, all extern - * debug decls to rf_options.h, all debug vars preceded by rf_ - * - * Revision 1.17 1996/05/21 18:51:54 jimz - * cleaned up macro args - * - * Revision 1.16 1996/05/18 19:51:34 jimz - * major code cleanup- fix syntax, make some types consistent, - * add prototypes, clean out dead code, et cetera - * - * Revision 1.15 1996/05/01 16:26:22 jimz - * get rid of old ccmn stuff - * - * Revision 1.14 1995/12/01 15:58:09 root - * added copyright info - * - * Revision 1.13 1995/10/11 15:26:03 jimz - * zero memory after allocation in kernel (hide effects - * of uninitialized structs) - * - * Revision 1.12 1995/10/06 17:04:15 jimz - * make Malloc and Free in kernel use kernel malloc package, not cam - * dbufs (which is gross, and was exhausting cam zalloc limit) - * - * Revision 1.11 1995/05/01 13:28:00 holland - * parity range locks, locking disk requests, recon+parityscan in kernel, etc. - * - * Revision 1.10 1995/04/24 13:25:51 holland - * rewrite to move disk queues, recon, & atomic RMW to kernel - * - * Revision 1.9 1995/02/17 19:39:56 holland - * added size param to all calls to Free(). - * this is ignored at user level, but necessary in the kernel. - * - * Revision 1.8 1995/02/10 17:34:10 holland - * kernelization changes - * - * Revision 1.7 1995/02/03 22:31:36 holland - * many changes related to kernelization - * - * Revision 1.6 1995/02/01 15:13:05 holland - * moved #include of general.h out of raid.h and into each file - * - * Revision 1.5 1995/02/01 14:25:19 holland - * began changes for kernelization: - * changed all instances of mutex_t and cond_t to DECLARE macros - * converted configuration code to use config structure - * - * Revision 1.4 1995/01/11 19:27:02 holland - * many changes related to performance tuning - * - * Revision 1.3 1994/11/29 21:34:56 danner - * Changed type of redzone_calloc and malloc to void *. - * - * Revision 1.2 1994/11/28 22:13:23 danner - * Many macros converted to functions. - * */ #ifndef _RF__RF_DEBUGMEM_H_ @@ -141,7 +41,7 @@ #include "rf_alloclist.h" #include "rf_options.h" -#ifndef KERNEL +#ifndef _KERNEL #ifndef __NetBSD__ void *malloc(), *calloc(); @@ -186,15 +86,10 @@ RF_DECLARE_EXTERN_MUTEX(rf_debug_mem_mutex) #else /* KERNEL */ #include <sys/types.h> -#ifdef __NetBSD__ typedef u_int32_t U32; -#else -#include <io/common/iotypes.h> /* just to get defn of U32 */ -#endif /* __NetBSD__ */ #include <sys/malloc.h> -#ifdef __NetBSD__ #define RF_Malloc(_p_, _size_, _cast_) \ { \ @@ -203,16 +98,6 @@ typedef u_int32_t U32; if (rf_memDebug) rf_record_malloc(_p_, _size_, __LINE__, __FILE__); \ } -#else - -#define RF_Malloc(_p_, _size_, _cast_) \ - { \ - _p_ = _cast_ malloc((u_long)_size_, BUCKETINDEX(_size_), M_DEVBUF, M_WAITOK); \ - bzero((char *)_p_, _size_); \ - if (rf_memDebug) rf_record_malloc(_p_, _size_, __LINE__, __FILE__); \ - } -#endif /* __NetBSD__ */ - #define RF_MallocAndAdd(__p_, __size_, __cast_, __alist_) \ { \ RF_Malloc(__p_, __size_, __cast_); \ @@ -231,23 +116,15 @@ typedef u_int32_t U32; if (__alist) rf_AddToAllocList(__alist, __p, (__nel)*(__elsz)); \ } -#ifdef __NetBSD__ #define RF_Free(_p_, _sz_) \ { \ free((void *)(_p_), M_RAIDFRAME); \ if (rf_memDebug) rf_unrecord_malloc(_p_, (U32) (_sz_)); \ } -#else -#define RF_Free(_p_, _sz_) \ - { \ - free((void *)(_p_), M_DEVBUF); \ - if (rf_memDebug) rf_unrecord_malloc(_p_, (U32) (_sz_)); \ - } -#endif /* __NetBSD__ */ -#endif /* KERNEL */ +#endif /* _KERNEL */ -#ifndef KERNEL +#ifndef _KERNEL void *rf_real_redzone_malloc(int size); void *rf_real_redzone_calloc(int n, int size); void rf_real_redzone_free(char *p, int line, char *filen); |
