--------------------- PatchSet 4591 Date: 2002/07/26 13:39:58 Author: serassio Branch: nt-2_5 Tag: (none) Log: awin32 fs debug sections cleanup Members: src/fs/awin32/aiops.c:1.1.62.5->1.1.62.6 src/fs/awin32/store_dir_aufs.c:1.1.62.7->1.1.62.8 src/fs/awin32/store_io_aufs.c:1.1.62.6->1.1.62.7 Index: squid/src/fs/awin32/aiops.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/fs/awin32/Attic/aiops.c,v retrieving revision 1.1.62.5 retrieving revision 1.1.62.6 diff -u -r1.1.62.5 -r1.1.62.6 --- squid/src/fs/awin32/aiops.c 23 Jun 2002 16:31:06 -0000 1.1.62.5 +++ squid/src/fs/awin32/aiops.c 26 Jul 2002 13:39:58 -0000 1.1.62.6 @@ -1,5 +1,5 @@ /* - * $Id: aiops.c,v 1.1.62.5 2002/06/23 16:31:06 serassio Exp $ + * $Id: aiops.c,v 1.1.62.6 2002/07/26 13:39:58 serassio Exp $ * * DEBUG: section 43 AIOPS * AUTHOR: Stewart Forster @@ -530,7 +530,7 @@ squidaio_queue_request(squidaio_request_t * request) { static int high_start = 0; - debug(41, 9) ("squidaio_queue_request: %p type=%d result=%p\n", + debug(43, 9) ("squidaio_queue_request: %p type=%d result=%p\n", request, request->request_type, request->resultp); /* Mark it as not executed (failing result, no error) */ request->ret = -1; @@ -679,7 +679,7 @@ squidaio_request_t *request = resultp->_data; if (request && request->resultp == resultp) { - debug(41, 9) ("squidaio_cancel: %p type=%d result=%p\n", + debug(43, 9) ("squidaio_cancel: %p type=%d result=%p\n", request, request->request_type, request->resultp); request->cancelled = 1; request->resultp = NULL; @@ -973,7 +973,7 @@ if (!request) { return NULL; } - debug(41, 9) ("squidaio_poll_done: %p type=%d result=%p\n", + debug(43, 9) ("squidaio_poll_done: %p type=%d result=%p\n", request, request->request_type, request->resultp); done_requests.head = request->next; if (!done_requests.head) Index: squid/src/fs/awin32/store_dir_aufs.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/fs/awin32/Attic/store_dir_aufs.c,v retrieving revision 1.1.62.7 retrieving revision 1.1.62.8 diff -u -r1.1.62.7 -r1.1.62.8 --- squid/src/fs/awin32/store_dir_aufs.c 2 Jun 2002 19:26:58 -0000 1.1.62.7 +++ squid/src/fs/awin32/store_dir_aufs.c 26 Jul 2002 13:39:59 -0000 1.1.62.8 @@ -1,6 +1,6 @@ /* - * $Id: store_dir_aufs.c,v 1.1.62.7 2002/06/02 19:26:58 serassio Exp $ + * $Id: store_dir_aufs.c,v 1.1.62.8 2002/07/26 13:39:59 serassio Exp $ * * DEBUG: section 47 Store Directory Routines * AUTHOR: Duane Wessels @@ -1369,7 +1369,7 @@ if (ql == 0) loadav = 0; loadav = ql * 1000 / MAGIC1; - debug(41, 9) ("storeAufsDirCheckObj: load=%d\n", loadav); + debug(47, 9) ("storeAufsDirCheckObj: load=%d\n", loadav); return loadav; } @@ -1382,7 +1382,7 @@ void storeAufsDirRefObj(SwapDir * SD, StoreEntry * e) { - debug(1, 3) ("storeAufsDirRefObj: referencing %p %d/%d\n", e, e->swap_dirn, + debug(47, 3) ("storeAufsDirRefObj: referencing %p %d/%d\n", e, e->swap_dirn, e->swap_filen); if (SD->repl->Referenced) SD->repl->Referenced(SD->repl, e, &e->repl); @@ -1396,7 +1396,7 @@ void storeAufsDirUnrefObj(SwapDir * SD, StoreEntry * e) { - debug(1, 3) ("storeAufsDirUnrefObj: referencing %p %d/%d\n", e, e->swap_dirn, + debug(47, 3) ("storeAufsDirUnrefObj: referencing %p %d/%d\n", e, e->swap_dirn, e->swap_filen); if (SD->repl->Dereferenced) SD->repl->Dereferenced(SD->repl, e, &e->repl); Index: squid/src/fs/awin32/store_io_aufs.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/fs/awin32/Attic/store_io_aufs.c,v retrieving revision 1.1.62.6 retrieving revision 1.1.62.7 diff -u -r1.1.62.6 -r1.1.62.7 --- squid/src/fs/awin32/store_io_aufs.c 2 Jun 2002 19:26:58 -0000 1.1.62.6 +++ squid/src/fs/awin32/store_io_aufs.c 26 Jul 2002 13:39:59 -0000 1.1.62.7 @@ -1,8 +1,8 @@ /* - * $Id: store_io_aufs.c,v 1.1.62.6 2002/06/02 19:26:58 serassio Exp $ + * $Id: store_io_aufs.c,v 1.1.62.7 2002/07/26 13:39:59 serassio Exp $ * - * DEBUG: section 78 Storage Manager awin32 Interface + * DEBUG: section 79 Storage Manager awin32 Interface * AUTHOR: Robert Collins * * SQUID Web Proxy Cache http://www.squid-cache.org/ @@ -67,7 +67,7 @@ #if !ASYNC_OPEN int fd; #endif - debug(78, 3) ("storeAufsOpen: fileno %08X\n", f); + debug(79, 3) ("storeAufsOpen: fileno %08X\n", f); /* * we should detect some 'too many files open' condition and return * NULL here. @@ -79,7 +79,7 @@ #if !ASYNC_OPEN fd = file_open(path, O_RDONLY | O_BINARY); if (fd < 0) { - debug(78, 3) ("storeAufsOpen: got failure (%d)\n", errno); + debug(79, 3) ("storeAufsOpen: got failure (%d)\n", errno); return NULL; } #endif @@ -121,7 +121,7 @@ filn = storeAufsDirMapBitAllocate(SD); path = storeAufsDirFullPath(SD, filn, NULL); - debug(78, 3) ("storeAufsCreate: fileno %08X\n", filn); + debug(79, 3) ("storeAufsCreate: fileno %08X\n", filn); /* * we should detect some 'too many files open' condition and return * NULL here. @@ -133,7 +133,7 @@ #if !ASYNC_CREATE fd = file_open(path, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY); if (fd < 0) { - debug(78, 3) ("storeAufsCreate: got failure (%d)\n", errno); + debug(79, 3) ("storeAufsCreate: got failure (%d)\n", errno); return NULL; } #endif @@ -169,7 +169,7 @@ storeAufsClose(SwapDir * SD, storeIOState * sio) { squidaiostate_t *aiostate = (squidaiostate_t *) sio->fsstate; - debug(78, 3) ("storeAufsClose: dirno %d, fileno %08X, FD %d\n", + debug(79, 3) ("storeAufsClose: dirno %d, fileno %08X, FD %d\n", sio->swap_dirn, sio->swap_filen, aiostate->fd); if (storeAufsSomethingPending(sio)) { aiostate->flags.close_request = 1; @@ -189,7 +189,7 @@ assert(!aiostate->flags.reading); if (aiostate->fd < 0) { struct _queued_read *q; - debug(78, 3) ("storeAufsRead: queueing read because FD < 0\n"); + debug(79, 3) ("storeAufsRead: queueing read because FD < 0\n"); assert(aiostate->flags.opening); assert(aiostate->pending_reads == NULL); q = memPoolAlloc(aufs_qread_pool); @@ -205,7 +205,7 @@ sio->read.callback_data = callback_data; aiostate->read_buf = buf; cbdataLock(callback_data); - debug(78, 3) ("storeAufsRead: dirno %d, fileno %08X, FD %d\n", + debug(79, 3) ("storeAufsRead: dirno %d, fileno %08X, FD %d\n", sio->swap_dirn, sio->swap_filen, aiostate->fd); sio->offset = offset; aiostate->flags.reading = 1; @@ -222,7 +222,7 @@ storeAufsWrite(SwapDir * SD, storeIOState * sio, char *buf, size_t size, off_t offset, FREE * free_func) { squidaiostate_t *aiostate = (squidaiostate_t *) sio->fsstate; - debug(78, 3) ("storeAufsWrite: dirno %d, fileno %08X, FD %d\n", + debug(79, 3) ("storeAufsWrite: dirno %d, fileno %08X, FD %d\n", sio->swap_dirn, sio->swap_filen, aiostate->fd); if (aiostate->fd < 0) { /* disk file not opened yet */ @@ -239,7 +239,7 @@ #if ASYNC_WRITE if (aiostate->flags.writing) { struct _queued_write *q; - debug(78, 3) ("storeAufsWrite: queuing write\n"); + debug(79, 3) ("storeAufsWrite: queuing write\n"); q = memPoolAlloc(aufs_qwrite_pool); q->buf = buf; q->size = size; @@ -261,7 +261,7 @@ void storeAufsUnlink(SwapDir * SD, StoreEntry * e) { - debug(78, 3) ("storeAufsUnlink: dirno %d, fileno %08X\n", SD->index, e->swap_filen); + debug(79, 3) ("storeAufsUnlink: dirno %d, fileno %08X\n", SD->index, e->swap_filen); storeAufsDirReplRemove(e); storeAufsDirMapBitReset(SD, e->swap_filen); storeAufsDirUnlinkFile(SD, e->swap_filen); @@ -276,7 +276,7 @@ struct _queued_write *q = linklistShift(&aiostate->pending_writes); if (NULL == q) return 0; - debug(78, 3) ("storeAufsKickWriteQueue: writing queued chunk of %ld bytes\n", + debug(79, 3) ("storeAufsKickWriteQueue: writing queued chunk of %ld bytes\n", (long int) q->size); storeAufsWrite(INDEXSD(sio->swap_dirn), sio, q->buf, q->size, q->offset, q->free_func); memPoolFree(aufs_qwrite_pool, q); @@ -290,7 +290,7 @@ struct _queued_read *q = linklistShift(&(aiostate->pending_reads)); if (NULL == q) return 0; - debug(78, 3) ("storeAufsKickReadQueue: reading queued request of %ld bytes\n", + debug(79, 3) ("storeAufsKickReadQueue: reading queued request of %ld bytes\n", (long int) q->size); storeAufsRead(INDEXSD(sio->swap_dirn), sio, q->buf, q->size, q->offset, q->callback, q->callback_data); memPoolFree(aufs_qread_pool, q); @@ -302,13 +302,13 @@ { storeIOState *sio = my_data; squidaiostate_t *aiostate = (squidaiostate_t *) sio->fsstate; - debug(78, 3) ("storeAufsOpenDone: FD %d, errflag %d\n", fd, errflag); + debug(79, 3) ("storeAufsOpenDone: FD %d, errflag %d\n", fd, errflag); Opening_FD--; aiostate->flags.opening = 0; if (errflag || fd < 0) { errno = errflag; - debug(78, 0) ("storeAufsOpenDone: %s\n", xstrerror()); - debug(78, 1) ("\t%s\n", storeAufsDirFullPath(INDEXSD(sio->swap_dirn), sio->swap_filen, NULL)); + debug(79, 0) ("storeAufsOpenDone: %s\n", xstrerror()); + debug(79, 1) ("\t%s\n", storeAufsDirFullPath(INDEXSD(sio->swap_dirn), sio->swap_filen, NULL)); storeAufsIOCallback(sio, DISK_ERROR); return; } @@ -322,7 +322,7 @@ storeAufsKickReadQueue(sio); if (aiostate->flags.close_request) storeAufsIOCallback(sio, errflag); - debug(78, 3) ("storeAufsOpenDone: exiting\n"); + debug(79, 3) ("storeAufsOpenDone: exiting\n"); } #if ASYNC_READ @@ -338,12 +338,12 @@ STRCB *callback = sio->read.callback; void *their_data = sio->read.callback_data; ssize_t rlen; - debug(78, 3) ("storeAufsReadDone: dirno %d, fileno %08X, FD %d, len %d\n", + debug(79, 3) ("storeAufsReadDone: dirno %d, fileno %08X, FD %d, len %d\n", sio->swap_dirn, sio->swap_filen, fd, len); aiostate->flags.inreaddone = 1; aiostate->flags.reading = 0; if (errflag) { - debug(78, 3) ("storeAufsReadDone: got failure (%d)\n", errflag); + debug(79, 3) ("storeAufsReadDone: got failure (%d)\n", errflag); rlen = -1; } else { rlen = (ssize_t) len; @@ -383,7 +383,7 @@ static int loop_detect = 0; storeIOState *sio = my_data; squidaiostate_t *aiostate = (squidaiostate_t *) sio->fsstate; - debug(78, 3) ("storeAufsWriteDone: dirno %d, fileno %08X, FD %d, len %ld, err=%d\n", + debug(79, 3) ("storeAufsWriteDone: dirno %d, fileno %08X, FD %d, len %ld, err=%d\n", sio->swap_dirn, sio->swap_filen, fd, (long int) len, errflag); #if ASYNC_WRITE /* Translate from errno to Squid disk error */ @@ -396,7 +396,7 @@ assert(++loop_detect < 10); aiostate->flags.writing = 0; if (errflag) { - debug(78, 0) ("storeAufsWriteDone: got failure (%d)\n", errflag); + debug(79, 0) ("storeAufsWriteDone: got failure (%d)\n", errflag); storeAufsIOCallback(sio, errflag); loop_detect--; return; @@ -427,24 +427,24 @@ void *their_data = sio->callback_data; squidaiostate_t *aiostate = (squidaiostate_t *) sio->fsstate; int fd = aiostate->fd; - debug(78, 3) ("storeAufsIOCallback: errflag=%d\n", errflag); + debug(79, 3) ("storeAufsIOCallback: errflag=%d\n", errflag); sio->callback = NULL; sio->callback_data = NULL; - debug(78, 3) ("%s:%d\n", __FILE__, __LINE__); + debug(79, 3) ("%s:%d\n", __FILE__, __LINE__); if (callback) if (NULL == their_data || cbdataValid(their_data)) callback(their_data, errflag, sio); - debug(78, 3) ("%s:%d\n", __FILE__, __LINE__); + debug(79, 3) ("%s:%d\n", __FILE__, __LINE__); cbdataUnlock(their_data); aiostate->fd = -1; cbdataFree(sio); if (fd < 0) return; - debug(78, 3) ("%s:%d\n", __FILE__, __LINE__); + debug(79, 3) ("%s:%d\n", __FILE__, __LINE__); aioClose(fd); fd_close(fd); store_open_disk_fd--; - debug(78, 3) ("%s:%d\n", __FILE__, __LINE__); + debug(79, 3) ("%s:%d\n", __FILE__, __LINE__); }