--------------------- PatchSet 989 Date: 2000/12/22 12:52:24 Author: nikitadanilov Branch: raid Tag: (none) Log: Errno monitoring commented out. fd checks added. findFirstOnlineSD() have to be implemented even if DISK_REPL is undefined (required bu store_dir selection algorithms). Members: src/raid.c:1.1.2.1->1.1.2.2 Index: squid/src/raid.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/Attic/raid.c,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- squid/src/raid.c 17 Dec 2000 14:36:24 -0000 1.1.2.1 +++ squid/src/raid.c 22 Dec 2000 12:52:24 -0000 1.1.2.2 @@ -1,6 +1,6 @@ /* - * $Id: raid.c,v 1.1.2.1 2000/12/17 14:36:24 hno Exp $ + * $Id: raid.c,v 1.1.2.2 2000/12/22 12:52:24 nikitadanilov Exp $ * * DEBUG: section 91 RAID support * AUTHOR: Nikita Danilov @@ -191,8 +191,8 @@ { DEBUG( "sigaction failed: %s", xstrerror() ); } - addReadHook( watchDiskDies, NULL ); - addWriteHook( watchDiskDies, NULL ); + /* addReadHook( watchDiskDies, NULL ); + addWriteHook( watchDiskDies, NULL ); */ return 1; } @@ -279,6 +279,8 @@ void *data ) { /* DEBUG( "swap_dir: %i errno: %i (%i)", fd_table[ fd ].swap_dir, *errNo, errno ); */ + CHECK_FD( fd ); + if( fd_table[ fd ].swap_dir != -1 ) { SwapDir *dir; @@ -489,9 +491,10 @@ void doRaidCtrl( void *data ) { + DEBUG( "event: %i dir: %i", ctrlEvent, ctrlSwapDir ); if( hasCtrlEvent ) { - DEBUG( "event: %i dir: %i", ctrlEvent, ctrlSwapDir ); + hasCtrlEvent = 0; switch( ctrlEvent ) { case goOffline: @@ -506,7 +509,6 @@ DEBUG( "Wrong RAID control request" ); break; } - hasCtrlEvent = 0; } registerRaidCtrlEvent(); } @@ -588,10 +590,23 @@ } /* DISK_REPL */ -#endif +#else + +int findFirstOnlineSD() +{ + return 0; +} +/* DISK_REPL */ +#endif + /* * $Log: raid.c,v $ + * Revision 1.1.2.2 2000/12/22 12:52:24 nikitadanilov + * Errno monitoring commented out. fd checks added. findFirstOnlineSD() have + * to be implemented even if DISK_REPL is undefined (required bu store_dir selection + * algorithms). + * * Revision 1.1.2.1 2000/12/17 14:36:24 hno * Imported raid from squidng *