Re: squid3-ipv6 squid3/src HttpHeader.cc,1.18.4.8,1.18.4.9 cache_manager.cc,1.7.8.3,1.7.8.4 client_db.cc,1.5.4.14,1.5.4.15 event.cc,1.5.8.5,1.5.8.6

Any objections to these going into 3-HEAD?
Baring the seconds precision drop to 3dp (aka ms), its all whitespace.

> Modified Files:
> Tag: squid3-ipv6
> HttpHeader.cc cache_manager.cc client_db.cc event.cc
> Log Message:
> Some Formatting tweaks to squidclient output. Much more readable.
>
>
> Index: event.cc
> ===================================================================
> RCS file: /cvsroot/squid/squid3/src/event.cc,v
> retrieving revision 1.5.8.5
> retrieving revision 1.5.8.6
> diff -C2 -d -r1.5.8.5 -r1.5.8.6
> *** event.cc 31 Jul 2007 06:40:27 -0000 1.5.8.5
> --- event.cc 10 Aug 2007 10:41:09 -0000 1.5.8.6
> ***************
> *** 269,273 ****
> storeAppendPrintf(sentry, "Last event to run: %s\n\n", last_event_ran);
>
> ! storeAppendPrintf(sentry, "%s\t%s\t%s\t%s\n",
> "Operation",
> "Next Execution",
> --- 269,273 ----
> storeAppendPrintf(sentry, "Last event to run: %s\n\n", last_event_ran);
>
> ! storeAppendPrintf(sentry, "%-25s\t%-15s\t%s\t%s\n",
> "Operation",
> "Next Execution",
> ***************
> *** 276,280 ****
>
> while (e != NULL) {
> ! storeAppendPrintf(sentry, "%s\t%f seconds\t%d\t%s\n",
> e->name, e->when ? e->when - current_dtime : 0, e->weight,
> (e->arg && e->cbdata) ? cbdataReferenceValid(e->arg) ? "yes" : "no" : "N/A");
> --- 276,280 ----
>
> while (e != NULL) {
> ! storeAppendPrintf(sentry, "%-25s\t%0.3f sec\t%5d\t %s\n",
> e->name, e->when ? e->when - current_dtime : 0, e->weight,
> (e->arg && e->cbdata) ? cbdataReferenceValid(e->arg) ? "yes" : "no" : "N/A");
>
> Index: HttpHeader.cc
> ===================================================================
> RCS file: /cvsroot/squid/squid3/src/HttpHeader.cc,v
> retrieving revision 1.18.4.8
> retrieving revision 1.18.4.9
> diff -C2 -d -r1.18.4.8 -r1.18.4.9
> *** HttpHeader.cc 30 May 2007 05:06:06 -0000 1.18.4.8
> --- HttpHeader.cc 10 Aug 2007 10:41:09 -0000 1.18.4.9
> ***************
> *** 1607,1616 ****
> storeAppendPrintf(e, "\nHttp Fields Stats (replies and requests)\n");
>
> ! storeAppendPrintf(e, "%2s\t %-20s\t %5s\t %6s\t %6s\n",
> "id", "name", "#alive", "%err", "%repeat");
>
> for (ht = (http_hdr_type)0; ht < HDR_ENUM_END; ++ht) {
> HttpHeaderFieldInfo *f = Headers + ht;
> ! storeAppendPrintf(e, "%2d\t %-20s\t %5d\t %6.3f\t %6.3f\n",
> f->id, f->name.buf(), f->stat.aliveCount,
> xpercent(f->stat.errCount, f->stat.parsCount),
> --- 1607,1616 ----
> storeAppendPrintf(e, "\nHttp Fields Stats (replies and requests)\n");
>
> ! storeAppendPrintf(e, "%2s\t %-25s\t %5s\t %6s\t %6s\n",
> "id", "name", "#alive", "%err", "%repeat");
>
> for (ht = (http_hdr_type)0; ht < HDR_ENUM_END; ++ht) {
> HttpHeaderFieldInfo *f = Headers + ht;
> ! storeAppendPrintf(e, "%2d\t %-25s\t %5d\t %6.3f\t %6.3f\n",
> f->id, f->name.buf(), f->stat.aliveCount,
> xpercent(f->stat.errCount, f->stat.parsCount),
>
> Index: client_db.cc
> ===================================================================
> RCS file: /cvsroot/squid/squid3/src/client_db.cc,v
> retrieving revision 1.5.4.14
> retrieving revision 1.5.4.15
> diff -C2 -d -r1.5.4.14 -r1.5.4.15
> *** client_db.cc 3 Jun 2007 12:58:32 -0000 1.5.4.14
> --- client_db.cc 10 Aug 2007 10:41:09 -0000 1.5.4.15
> ***************
> *** 249,256 ****
> while ((c = (ClientInfo *) hash_next(client_table))) {
> storeAppendPrintf(sentry, "Address: %s\n", hashKeyStr(&c->hash));
> ! storeAppendPrintf(sentry, "Name: %s\n", fqdnFromAddr(c->addr));
> storeAppendPrintf(sentry, "Currently established connections: %d\n",
> c->n_established);
> ! storeAppendPrintf(sentry, " ICP Requests %d\n",
> c->Icp.n_requests);
>
> --- 249,256 ----
> while ((c = (ClientInfo *) hash_next(client_table))) {
> storeAppendPrintf(sentry, "Address: %s\n", hashKeyStr(&c->hash));
> ! storeAppendPrintf(sentry, "Name: %s\n", fqdnFromAddr(c->addr));
> storeAppendPrintf(sentry, "Currently established connections: %d\n",
> c->n_established);
> ! storeAppendPrintf(sentry, " ICP Requests %d\n",
> c->Icp.n_requests);
>
> ***************
> *** 294,300 ****
>
> storeAppendPrintf(sentry, "TOTALS\n");
> ! storeAppendPrintf(sentry, "ICP : %d Queries, %d Hits (%3d%%)\n",
> icp_total, icp_hits, percent(icp_hits, icp_total));
> ! storeAppendPrintf(sentry, "HTTP: %d Requests, %d Hits (%3d%%)\n",
> http_total, http_hits, percent(http_hits, http_total));
> }
> --- 294,300 ----
>
> storeAppendPrintf(sentry, "TOTALS\n");
> ! storeAppendPrintf(sentry, "ICP : %7d Queries, %7d Hits (%3d%%)\n",
> icp_total, icp_hits, percent(icp_hits, icp_total));
> ! storeAppendPrintf(sentry, "HTTP: %7d Requests, %7d Hits (%3d%%)\n",
> http_total, http_hits, percent(http_hits, http_total));
> }
>
> Index: cache_manager.cc
> ===================================================================
> RCS file: /cvsroot/squid/squid3/src/cache_manager.cc,v
> retrieving revision 1.7.8.3
> retrieving revision 1.7.8.4
> diff -C2 -d -r1.7.8.3 -r1.7.8.4
> *** cache_manager.cc 29 Apr 2007 03:01:36 -0000 1.7.8.3
> --- cache_manager.cc 10 Aug 2007 10:41:09 -0000 1.7.8.4
> ***************
> *** 384,388 ****
>
> for (a = ActionTable; a != NULL; a = a->next) {
> ! storeAppendPrintf(sentry, " %-22s\t%s\t%s\n",
> a->action, a->desc, cachemgrActionProtection(a));
> }
> --- 384,388 ----
>
> for (a = ActionTable; a != NULL; a = a->next) {
> ! storeAppendPrintf(sentry, " %-22s\t%-32s\t%s\n",
> a->action, a->desc, cachemgrActionProtection(a));
> }
>
Received on Fri Aug 10 2007 - 05:36:02 MDT