From: wessels <> Date: Mon, 21 Jul 1997 13:20:55 +0000 (+0000) Subject: - Change some sizes to 'size_t' X-Git-Tag: SQUID_3_0_PRE1~4851 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=78f1250a26ed9053fce60b92b740c0b266961276;p=thirdparty%2Fsquid.git - Change some sizes to 'size_t' - Change some offsets to 'off_t' - Need to unlock static icons - Move unbuffered logs flag to Config - Too much time debugging keep-alive problems with Netscape Navigator-2.x --- diff --git a/src/cf.data.pre b/src/cf.data.pre index b16e3a092c..a95003baac 100644 --- a/src/cf.data.pre +++ b/src/cf.data.pre @@ -1803,6 +1803,18 @@ DOC_START query_icmp off DOC_END +NAME: buffered_logs +COMMENT: on|off +TYPE: onoff +DEFAULT: off +LOC: Config.Options.buffered_logs +DOC_START + Some log files (cache.log, useragent.log) are written with + stdio functions, and as such they can be buffered or + unbuffered. By default they will be unbuffered. +buffered_logs off +DOC_END + NAME: always_direct TYPE: acl_access LOC: Config.accessList.AlwaysDirect diff --git a/src/debug.cc b/src/debug.cc index f29494b8e2..a25c4b85aa 100644 --- a/src/debug.cc +++ b/src/debug.cc @@ -1,5 +1,5 @@ /* - * $Id: debug.cc,v 1.49 1997/07/16 20:32:02 wessels Exp $ + * $Id: debug.cc,v 1.50 1997/07/21 07:20:56 wessels Exp $ * * DEBUG: section 0 Debug Routines * AUTHOR: Harvest Derived @@ -149,7 +149,7 @@ _db_print(va_alist) #endif /* HAVE_SYSLOG */ /* write to log file */ vfprintf(debug_log, f, args); - if (unbuffered_logs) + if (!Config.Options.buffered_logs) fflush(debug_log); if (opt_debug_stderr && debug_log != stderr) vfprintf(stderr, f, args); diff --git a/src/globals.h b/src/globals.h index 811e05f04a..2dc6634edc 100644 --- a/src/globals.h +++ b/src/globals.h @@ -82,7 +82,6 @@ extern time_t squid_curtime; /* 0 */ extern time_t squid_starttime; /* 0 */ extern volatile int reconfigure_pending; /* 0 */ extern volatile int shutdown_pending; /* 0 */ -extern volatile int unbuffered_logs; /* 0 */ extern volatile unsigned long nudpconn; /* 0 */ extern volatile unsigned long ntcpconn; /* 0 */ extern int unlinkd_count; /* 0 */ diff --git a/src/main.cc b/src/main.cc index 4dccdf3e05..c12ff7157e 100644 --- a/src/main.cc +++ b/src/main.cc @@ -1,6 +1,6 @@ /* - * $Id: main.cc,v 1.167 1997/07/19 07:20:02 wessels Exp $ + * $Id: main.cc,v 1.168 1997/07/21 07:20:58 wessels Exp $ * * DEBUG: section 1 Startup and Main Loop * AUTHOR: Harvest Derived @@ -131,9 +131,8 @@ static void usage(void) { fprintf(stderr, - "Usage: %s [-hsvzCDFRUVY] [-f config-file] [-[au] port] [-k signal]\n" + "Usage: %s [-svzCDFRUVY] [-f config-file] [-[au] port] [-k signal]\n" " -a port Specify ASCII port number (default: %d).\n" - " -b Buffer log output (default is unbuffered).\n" " -d Write debugging to stderr also.\n" " -f file Use given config-file instead of\n" " %s\n" @@ -188,9 +187,6 @@ mainParseOptions(int argc, char *argv[]) case 'a': httpPortNumOverride = atoi(optarg); break; - case 'b': - unbuffered_logs = 0; - break; case 'd': opt_debug_stderr = 1; break; diff --git a/src/mime.cc b/src/mime.cc index 0413bcdd18..6e04f70c1c 100644 --- a/src/mime.cc +++ b/src/mime.cc @@ -1,5 +1,5 @@ /* - * $Id: mime.cc,v 1.35 1997/07/19 07:20:03 wessels Exp $ + * $Id: mime.cc,v 1.36 1997/07/21 07:20:59 wessels Exp $ * * DEBUG: section 25 MIME Parsing * AUTHOR: Harvest Derived @@ -431,5 +431,6 @@ mimeLoadIconFile(const char *icon) storeTimestampsSet(e); BIT_SET(e->flag, ENTRY_SPECIAL); debug(25, 1) ("Loaded icon %s\n", url); + storeUnlockObject(e); put_free_4k_page(buf); } diff --git a/src/protos.h b/src/protos.h index e37ca338fe..7e1af68986 100644 --- a/src/protos.h +++ b/src/protos.h @@ -384,10 +384,10 @@ extern void shut_down _PARAMS((int)); extern void start_announce _PARAMS((void *unused)); -extern void sslStart _PARAMS((int fd, const char *, request_t *, int *sz)); +extern void sslStart _PARAMS((int fd, const char *, request_t *, size_t *sz)); extern void waisStart _PARAMS((request_t *, StoreEntry *)); extern void storeDirClean _PARAMS((void *unused)); -extern void passStart _PARAMS((int, const char *, request_t *, int *)); +extern void passStart _PARAMS((int, const char *, request_t *, size_t *)); extern void identStart _PARAMS((int, ConnStateData *, IDCB * callback)); extern int httpAnonAllowed _PARAMS((const char *line)); extern int httpAnonDenied _PARAMS((const char *line)); diff --git a/src/ssl.cc b/src/ssl.cc index 44b55bcf12..8bc28fea50 100644 --- a/src/ssl.cc +++ b/src/ssl.cc @@ -1,6 +1,6 @@ /* - * $Id: ssl.cc,v 1.58 1997/07/16 20:32:17 wessels Exp $ + * $Id: ssl.cc,v 1.59 1997/07/21 07:21:01 wessels Exp $ * * DEBUG: section 26 Secure Sockets Layer Proxy * AUTHOR: Duane Wessels @@ -360,7 +360,7 @@ sslConnectDone(int fd, int status, void *data) } void -sslStart(int fd, const char *url, request_t * request, int *size_ptr) +sslStart(int fd, const char *url, request_t * request, size_t *size_ptr) { /* Create state structure. */ SslStateData *sslState = NULL; diff --git a/src/structs.h b/src/structs.h index 5205f52737..07d976d25d 100644 --- a/src/structs.h +++ b/src/structs.h @@ -208,6 +208,7 @@ struct _SquidConfig { int client_db; int query_icmp; int icp_hit_stale; + int buffered_logs; } Options; struct _acl *aclList; struct { @@ -267,8 +268,8 @@ struct _dnsserver_t { int inpipe; int outpipe; time_t answer; - unsigned int offset; - unsigned int size; + off_t offset; + size_t size; char *ip_inbuf; struct timeval dispatch_time; void *data; @@ -283,7 +284,7 @@ struct _dnsStatData { struct _dwrite_q { char *buf; int len; - int cur_offset; + off_t cur_offset; struct _dwrite_q *next; void (*free) (void *); }; @@ -444,8 +445,8 @@ struct _clientHttpRequest { char *log_url; struct { char *buf; - int offset; - int size; + off_t offset; + size_t size; } out; size_t req_sz; StoreEntry *entry; @@ -465,8 +466,8 @@ struct _ConnStateData { int fd; struct { char *buf; - int offset; - int size; + off_t offset; + size_t size; } in; clientHttpRequest *chr; struct sockaddr_in peer; @@ -705,7 +706,7 @@ struct _mem_hdr { struct _stmem_stats { int max_pages; int total_pages_allocated; - int page_size; + size_t page_size; int n_pages_in_use; Stack free_page_stack; }; @@ -733,10 +734,10 @@ struct _MemObject { char *e_abort_msg; log_type abort_code; int e_current_len; - int e_lowest_offset; + off_t e_lowest_offset; struct _store_client *clients; int nclients; - u_num32 swap_offset; + off_t swap_offset; short swapin_fd; short swapout_fd; struct _http_reply *reply; diff --git a/src/tunnel.cc b/src/tunnel.cc index 10bf072700..abf0fbb9d8 100644 --- a/src/tunnel.cc +++ b/src/tunnel.cc @@ -1,6 +1,6 @@ /* - * $Id: tunnel.cc,v 1.58 1997/07/16 20:32:17 wessels Exp $ + * $Id: tunnel.cc,v 1.59 1997/07/21 07:21:01 wessels Exp $ * * DEBUG: section 26 Secure Sockets Layer Proxy * AUTHOR: Duane Wessels @@ -360,7 +360,7 @@ sslConnectDone(int fd, int status, void *data) } void -sslStart(int fd, const char *url, request_t * request, int *size_ptr) +sslStart(int fd, const char *url, request_t * request, size_t *size_ptr) { /* Create state structure. */ SslStateData *sslState = NULL; diff --git a/src/useragent.cc b/src/useragent.cc index cf15aa9267..b02a002daa 100644 --- a/src/useragent.cc +++ b/src/useragent.cc @@ -1,6 +1,6 @@ /* - * $Id: useragent.cc,v 1.8 1997/07/15 05:34:14 wessels Exp $ + * $Id: useragent.cc,v 1.9 1997/07/21 07:21:02 wessels Exp $ * * DEBUG: section 40 User-Agent logging * AUTHOR: Joe Ramey @@ -112,7 +112,7 @@ logUserAgent(const char *client, const char *agent) client, time_str, agent); - if (unbuffered_logs) + if (!Config.Options.buffered_logs) fflush(cache_useragent_log); #endif }