From: wessels <> Date: Wed, 4 Jan 2006 04:47:59 +0000 (+0000) Subject: Change 'fd=%d' to 'FD %d' in debugging statments to be consistent with X-Git-Tag: SQUID_3_0_PRE4~394 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=664fba56adc07c3ce94add53895d0499baa539c3;p=thirdparty%2Fsquid.git Change 'fd=%d' to 'FD %d' in debugging statments to be consistent with the rest of Squid code. --- diff --git a/src/client_side.cc b/src/client_side.cc index 40ca91652c..5fbaea6844 100644 --- a/src/client_side.cc +++ b/src/client_side.cc @@ -1,6 +1,6 @@ /* - * $Id: client_side.cc,v 1.706 2005/12/08 20:08:46 wessels Exp $ + * $Id: client_side.cc,v 1.707 2006/01/03 21:47:59 wessels Exp $ * * DEBUG: section 33 Client-side Routines * AUTHOR: Duane Wessels @@ -2517,7 +2517,7 @@ clientReadBody(HttpRequest * request, char *buf, size_t size, CBCB * callback, return; } - debug(33, 2) ("clientReadBody: start fd=%d body_size=%lu in.notYetUsed=%ld cb=%p req=%p\n", + debug(33, 2) ("clientReadBody: start FD %d body_size=%lu in.notYetUsed=%ld cb=%p req=%p\n", conn->fd, (unsigned long int) conn->body.size_left, (unsigned long int) conn->in.notYetUsed, callback, request); conn->body.callback = callback; @@ -2538,7 +2538,7 @@ ClientBody::preProcessing() callback = conn->body.callback; request = conn->body.request; /* Note: request is null while eating "aborted" transfers */ - debug(33, 2) ("clientBody::process: start fd=%d body_size=%lu in.notYetUsed=%lu cb=%p req=%p\n", + debug(33, 2) ("clientBody::process: start FD %d body_size=%lu in.notYetUsed=%lu cb=%p req=%p\n", conn->fd, (unsigned long int) conn->body.size_left, (unsigned long int) conn->in.notYetUsed, callback, request); } @@ -2613,7 +2613,7 @@ ClientBody::processBuffer() requestUnlink(request); /* Linked in clientReadBody */ } - debug(33, 2) ("ClientBody::process: end fd=%d size=%lu body_size=%lu in.notYetUsed=%lu cb=%p req=%p\n", + debug(33, 2) ("ClientBody::process: end FD %d size=%lu body_size=%lu in.notYetUsed=%lu cb=%p req=%p\n", conn->fd, (unsigned long int)size, (unsigned long int) conn->body.size_left, (unsigned long) conn->in.notYetUsed, callback, request); } @@ -2624,12 +2624,12 @@ clientReadBodyAbortHandler(char *buf, ssize_t size, void *data) { static char bodyAbortBuf[SQUID_TCP_SO_RCVBUF]; ConnStateData *conn = (ConnStateData *) data; - debug(33, 2) ("clientReadBodyAbortHandler: fd=%d body_size=%lu in.notYetUsed=%lu\n", + debug(33, 2) ("clientReadBodyAbortHandler: FD %d body_size=%lu in.notYetUsed=%lu\n", conn->fd, (unsigned long int) conn->body.size_left, (unsigned long) conn->in.notYetUsed); if (size != 0 && conn->body.size_left != 0) { - debug(33, 3) ("clientReadBodyAbortHandler: fd=%d shedule next read\n", + debug(33, 3) ("clientReadBodyAbortHandler: FD %d shedule next read\n", conn->fd); conn->body.callback = clientReadBodyAbortHandler; conn->body.buf = bodyAbortBuf; diff --git a/src/comm_epoll.cc b/src/comm_epoll.cc index da61fa68b9..f399f15608 100644 --- a/src/comm_epoll.cc +++ b/src/comm_epoll.cc @@ -1,6 +1,6 @@ /* - * $Id: comm_epoll.cc,v 1.7 2005/02/07 22:17:55 serassio Exp $ + * $Id: comm_epoll.cc,v 1.8 2006/01/03 21:47:59 wessels Exp $ * * DEBUG: section 5 Socket functions * @@ -130,7 +130,7 @@ commSetSelect(int fd, unsigned int type, PF * handler, struct epoll_event ev; assert(fd >= 0); - debug(5, DEBUG_EPOLL ? 0 : 8) ("commSetSelect(fd=%d,type=%u,handler=%p,client_data=%p,timeout=%ld)\n", + debug(5, DEBUG_EPOLL ? 0 : 8) ("commSetSelect(FD %d,type=%u,handler=%p,client_data=%p,timeout=%ld)\n", fd,type,handler,client_data,timeout); ev.events = 0; @@ -182,7 +182,7 @@ commSetSelect(int fd, unsigned int type, PF * handler, F->epoll_state = ev.events; if (epoll_ctl(kdpfd, epoll_ctl_type, fd, &ev) < 0) { - debug(5, DEBUG_EPOLL ? 0 : 8) ("commSetSelect: epoll_ctl(,%s,,): failed on fd=%d: %s\n", + debug(5, DEBUG_EPOLL ? 0 : 8) ("commSetSelect: epoll_ctl(,%s,,): failed on FD %d: %s\n", epolltype_atoi(epoll_ctl_type), fd, xstrerror()); } } @@ -256,21 +256,21 @@ comm_select(int msec) for (i = 0, cevents = pevents; i < num; i++, cevents++) { fd = cevents->data.fd; F = &fd_table[fd]; - debug(5, DEBUG_EPOLL ? 0 : 8) ("comm_select(): got fd=%d events=%x monitoring=%x F->read_handler=%p F->write_handler=%p\n", + debug(5, DEBUG_EPOLL ? 0 : 8) ("comm_select(): got FD %d events=%x monitoring=%x F->read_handler=%p F->write_handler=%p\n", fd,cevents->events,F->epoll_state,F->read_handler,F->write_handler); // TODO: add EPOLLPRI?? if (cevents->events & (EPOLLIN|EPOLLHUP|EPOLLERR)) { if ((hdl = F->read_handler) != NULL) { - debug(5, DEBUG_EPOLL ? 0 : 8) ("comm_select(): Calling read handler on fd=%d\n",fd); + debug(5, DEBUG_EPOLL ? 0 : 8) ("comm_select(): Calling read handler on FD %d\n",fd); PROF_start(comm_write_handler); F->read_handler = NULL; hdl(fd, F->read_data); PROF_stop(comm_write_handler); statCounter.select_fds++; } else { - debug(5, DEBUG_EPOLL ? 0 : 8) ("comm_select(): no read handler for fd=%d\n",fd); + debug(5, DEBUG_EPOLL ? 0 : 8) ("comm_select(): no read handler for FD %d\n",fd); fd_table[fd].flags.read_pending = 1; // remove interest since no handler exist for this event. commSetSelect(fd, COMM_SELECT_READ, NULL, NULL, 0); @@ -279,7 +279,7 @@ comm_select(int msec) if (cevents->events & (EPOLLOUT|EPOLLHUP|EPOLLERR)) { if ((hdl = F->write_handler) != NULL) { - debug(5, DEBUG_EPOLL ? 0 : 8) ("comm_select(): Calling write handler on fd=%d\n",fd); + debug(5, DEBUG_EPOLL ? 0 : 8) ("comm_select(): Calling write handler on FD %d\n",fd); PROF_start(comm_read_handler); F->write_handler = NULL; hdl(fd, F->write_data); @@ -287,7 +287,7 @@ comm_select(int msec) statCounter.select_fds++; } else { fd_table[fd].flags.write_pending = 1; - debug(5, DEBUG_EPOLL ? 0 : 8) ("comm_select(): no write handler for fd=%d\n",fd); + debug(5, DEBUG_EPOLL ? 0 : 8) ("comm_select(): no write handler for FD %d\n",fd); // remove interest since no handler exist for this event. commSetSelect(fd, COMM_SELECT_WRITE, NULL, NULL, 0); }