Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 28009 invoked from network); 6 Nov 2004 07:56:23 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 6 Nov 2004 07:56:23 -0000 Received: (qmail 4798 invoked by uid 500); 6 Nov 2004 07:56:22 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 4758 invoked by uid 500); 6 Nov 2004 07:56:22 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 4745 invoked by uid 500); 6 Nov 2004 07:56:22 -0000 Delivered-To: apmail-httpd-2.0-cvs@apache.org Received: (qmail 4741 invoked by uid 99); 6 Nov 2004 07:56:22 -0000 X-ASF-Spam-Status: No, hits=-10.0 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Fri, 05 Nov 2004 23:56:21 -0800 Received: (qmail 27963 invoked by uid 1327); 6 Nov 2004 07:56:20 -0000 Date: 6 Nov 2004 07:56:20 -0000 Message-ID: <20041106075620.27962.qmail@minotaur.apache.org> From: jerenkrantz@apache.org To: httpd-2.0-cvs@apache.org Subject: cvs commit: httpd-2.0 CHANGES X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N jerenkrantz 2004/11/05 23:56:20 Modified: modules/experimental mod_disk_cache.c docs/manual/mod mod_disk_cache.xml . CHANGES Log: mod_disk_cache: Remove a bunch of non-implemented garbage collection and cache size directives that are now available through htcacheclean. Revision Changes Path 1.69 +1 -101 httpd-2.0/modules/experimental/mod_disk_cache.c Index: mod_disk_cache.c =================================================================== RCS file: /home/cvs/httpd-2.0/modules/experimental/mod_disk_cache.c,v retrieving revision 1.68 retrieving revision 1.69 diff -u -u -r1.68 -r1.69 --- mod_disk_cache.c 4 Nov 2004 21:51:12 -0000 1.68 +++ mod_disk_cache.c 6 Nov 2004 07:56:20 -0000 1.69 @@ -82,26 +82,14 @@ #define DEFAULT_DIRLENGTH 2 #define DEFAULT_MIN_FILE_SIZE 1 #define DEFAULT_MAX_FILE_SIZE 1000000 -#define DEFAULT_CACHE_SIZE 1000000 typedef struct { const char* cache_root; apr_size_t cache_root_len; - off_t space; /* Maximum cache size (in 1024 bytes) */ - apr_time_t maxexpire; /* Maximum time to keep cached files in msecs */ - apr_time_t defaultexpire; /* default time to keep cached file in msecs */ - double lmfactor; /* factor for estimating expires date */ - apr_time_t gcinterval; /* garbage collection interval, in msec */ int dirlevels; /* Number of levels of subdirectories */ int dirlength; /* Length of subdirectory names */ - int expirychk; /* true if expiry time is observed for cached files */ apr_size_t minfs; /* minumum file size for cached files */ apr_size_t maxfs; /* maximum file size for cached files */ - apr_time_t mintm; /* minimum time margin for caching files */ - /* dgc_time_t gcdt; time of day for daily garbage collection */ - apr_array_header_t *gcclnun; /* gc_retain_t entries for unused files */ - apr_array_header_t *gcclean; /* gc_retain_t entries for all files */ - int maxgcmem; /* maximum memory used by garbage collection */ } disk_cache_conf; module AP_MODULE_DECLARE_DATA disk_cache_module; @@ -754,10 +742,8 @@ /* XXX: Set default values */ conf->dirlevels = DEFAULT_DIRLEVELS; conf->dirlength = DEFAULT_DIRLENGTH; - conf->space = DEFAULT_CACHE_SIZE; conf->maxfs = DEFAULT_MAX_FILE_SIZE; conf->minfs = DEFAULT_MIN_FILE_SIZE; - conf->expirychk = 1; conf->cache_root = NULL; conf->cache_root_len = 0; @@ -779,24 +765,7 @@ return NULL; } -static const char -*set_cache_size(cmd_parms *parms, void *in_struct_ptr, const char *arg) -{ - disk_cache_conf *conf = ap_get_module_config(parms->server->module_config, - &disk_cache_module); - conf->space = atoi(arg); - return NULL; -} -static const char -*set_cache_gcint(cmd_parms *parms, void *in_struct_ptr, const char *arg) -{ -/* - disk_cache_conf *conf = ap_get_module_config(parms->server->module_config, - &disk_cache_module); -*/ - /* XXX */ - return NULL; -} + /* * Consider eliminating the next two directives in favor of * Ian's prime number hash... @@ -830,15 +799,7 @@ conf->dirlength = val; return NULL; } -static const char -*set_cache_exchk(cmd_parms *parms, void *in_struct_ptr, int flag) -{ - disk_cache_conf *conf = ap_get_module_config(parms->server->module_config, - &disk_cache_module); - conf->expirychk = flag; - return NULL; -} static const char *set_cache_minfs(cmd_parms *parms, void *in_struct_ptr, const char *arg) { @@ -855,80 +816,19 @@ conf->maxfs = atoi(arg); return NULL; } -static const char -*set_cache_minetm(cmd_parms *parms, void *in_struct_ptr, const char *arg) -{ - /* XXX - disk_cache_conf *conf = ap_get_module_config(parms->server->module_config, - &disk_cache_module); - */ - return NULL; -} -static const char -*set_cache_gctime(cmd_parms *parms, void *in_struct_ptr, const char *arg) -{ - /* XXX - disk_cache_conf *conf = ap_get_module_config(parms->server->module_config, - &disk_cache_module); - */ - return NULL; -} -static const char -*add_cache_gcclean(cmd_parms *parms, void *in_struct_ptr, const char *arg, const char *arg1) -{ - /* XXX - disk_cache_conf *conf = ap_get_module_config(parms->server->module_config, - &disk_cache_module); - */ - return NULL; -} -static const char -*add_cache_gcclnun(cmd_parms *parms, void *in_struct_ptr, const char *arg, const char *arg1) -{ - /* XXX - disk_cache_conf *conf = ap_get_module_config(parms->server->module_config, - &disk_cache_module); - */ - return NULL; -} -static const char -*set_cache_maxgcmem(cmd_parms *parms, void *in_struct_ptr, const char *arg) -{ - /* XXX - disk_cache_conf *conf = ap_get_module_config(parms->server->module_config, - &disk_cache_module); - */ - return NULL; -} static const command_rec disk_cache_cmds[] = { AP_INIT_TAKE1("CacheRoot", set_cache_root, NULL, RSRC_CONF, "The directory to store cache files"), - AP_INIT_TAKE1("CacheSize", set_cache_size, NULL, RSRC_CONF, - "The maximum disk space used by the cache in KB"), - AP_INIT_TAKE1("CacheGcInterval", set_cache_gcint, NULL, RSRC_CONF, - "The interval between garbage collections, in hours"), AP_INIT_TAKE1("CacheDirLevels", set_cache_dirlevels, NULL, RSRC_CONF, "The number of levels of subdirectories in the cache"), AP_INIT_TAKE1("CacheDirLength", set_cache_dirlength, NULL, RSRC_CONF, "The number of characters in subdirectory names"), - AP_INIT_FLAG("CacheExpiryCheck", set_cache_exchk, NULL, RSRC_CONF, - "on if cache observes Expires date when seeking files"), AP_INIT_TAKE1("CacheMinFileSize", set_cache_minfs, NULL, RSRC_CONF, "The minimum file size to cache a document"), AP_INIT_TAKE1("CacheMaxFileSize", set_cache_maxfs, NULL, RSRC_CONF, "The maximum file size to cache a document"), - AP_INIT_TAKE1("CacheTimeMargin", set_cache_minetm, NULL, RSRC_CONF, - "The minimum time margin to cache a document"), - AP_INIT_TAKE1("CacheGcDaily", set_cache_gctime, NULL, RSRC_CONF, - "The time of day for garbage collection (24 hour clock)"), - AP_INIT_TAKE2("CacheGcUnused", add_cache_gcclnun, NULL, RSRC_CONF, - "The time in hours to retain unused file that match a url"), - AP_INIT_TAKE2("CacheGcClean", add_cache_gcclean, NULL, RSRC_CONF, - "The time in hours to retain unchanged files that match a url"), - AP_INIT_TAKE1("CacheGcMemUsage", set_cache_maxgcmem, NULL, RSRC_CONF, - "The maximum kilobytes of memory used for garbage collection"), {NULL} }; 1.11 +1 -184 httpd-2.0/docs/manual/mod/mod_disk_cache.xml Index: mod_disk_cache.xml =================================================================== RCS file: /home/cvs/httpd-2.0/docs/manual/mod/mod_disk_cache.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -u -u -r1.10 -r1.11 --- mod_disk_cache.xml 17 Apr 2004 10:49:22 -0000 1.10 +++ mod_disk_cache.xml 6 Nov 2004 07:56:20 -0000 1.11 @@ -71,52 +71,6 @@ -CacheSize -The maximum amount of disk space that will be used by the -cache in KBytes -CacheSize KBytes -CacheSize 1000000 -server configvirtual host - - - -

The CacheSize directive sets the desired - disk space usage of the cache, in KBytes (1024-byte units). This - directive does not put a hard limit on the size of the cache. The - garbage collector will delete files until the usage is at or below the - settings. Always use a value that is lower than the available disk - space.

- - - CacheSize 5000000 - - - - - -CacheGcInterval -The interval between garbage collection attempts. -CacheGcInterval hours -server configvirtual host - - - -

The CacheGcInterval directive specifies the - number of hours to wait between attempts to free up disk space.

-

More detail will be added here, when the function is implemented.

- - - CacheGcInterval 24
- - - - The CacheGcInterval directive is currently - not implemented. - - - - - CacheDirLevels The number of levels of subdirectories in the cache. @@ -168,29 +122,6 @@ -CacheExpiryCheck -Indicates if the cache observes Expires dates when seeking -files -CacheExpiryCheck On|Off -CacheExpiryCheck On -server configvirtual host - - - -

More detail will be added here, when the function is implemented.

- - - CacheExpiryCheck Off
- - - - The CacheExpiryCheck directive is currently - not implemented. - - - - - CacheMinFileSize The minimum size (in bytes) of a document to be placed in the cache @@ -227,120 +158,6 @@ CacheMaxFileSize 64000 - - - - -CacheTimeMargin -The minimum time margin to cache a document -CacheTimeMargin ? -CacheTimeMargin ? -server configvirtual host - - - -

More detail will be added here, when the function is implemented.

- - - CacheTimeMargin X - - - - The CacheTimeMargin directive is currently - not implemented. - - - - - -CacheGcDaily -The recurring time each day for garbage collection to be run. -(24 hour clock) -CacheGcDaily time -CacheGcDaily ? -server configvirtual host - - - -

More detail will be added here, when the function is implemented.

- - - CacheGcDaily 23:59 - - - - The CacheGcDaily directive is currently - not implemented. - - - - - -CacheGcUnused -The time to retain unreferenced cached files that match a -URL. -CacheGcUnused hours url-string -CacheGcUnused ? -server configvirtual host - - - -

More detail will be added here, when the function is implemented.

- - - CacheGcUnused 12 /local_images - - - - The CacheGcUnused directive is currently - not implemented. - - - - - -CacheGcClean -The time to retain unchanged cached files that match a -URL -CacheGcClean hours url-string -CacheGcClean ? -server configvirtual host - - - -

More detail will be added here, when the function is implemented.

- - - CacheGcClean 12 /daily_scripts - - - - The CacheGcClean directive is currently - not implemented. - - - - - -CacheGcMemUsage -The maximum kilobytes of memory used for garbage -collection -CacheGcMemUsage KBytes -CacheGcMemUsage ? -server configvirtual host - - - -

More detail will be added here, when the function is implemented.

- - - CacheGcMemUsage 16 - - - - The CacheGcMemUsage directive is currently - not implemented. - 1.1629 +4 -0 httpd-2.0/CHANGES Index: CHANGES =================================================================== RCS file: /home/cvs/httpd-2.0/CHANGES,v retrieving revision 1.1628 retrieving revision 1.1629 diff -u -u -r1.1628 -r1.1629 --- CHANGES 6 Nov 2004 07:45:21 -0000 1.1628 +++ CHANGES 6 Nov 2004 07:56:20 -0000 1.1629 @@ -2,6 +2,10 @@ [Remove entries to the current 2.0 section below, when backported] + *) mod_disk_cache: Remove a bunch of non-implemented garbage collection + and cache size directives that are now available through htcacheclean. + [Justin Erenkrantz] + *) Add htcacheclean to support/ for assistance with mod_disk_cache. [Andreas Steinmetz]