Menu
▾
▴
[naviserver-commits] naviserver/nsd tclcache.c,NONE,1.1 Makefile,1.7,1.8 cache.c,1.2,1.3 init.c,1.6,1.7 nsd.h,1.41,1.42 proc.c,1.11,1.12 server.c,1.15,1.16 tclcmds.c,1.27,1.28
|
From: Stephen D. <sd...@us...> - 2005-12-30 11:07:44
|
Update of /cvsroot/naviserver/naviserver/nsd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32584/nsd Modified Files: Makefile cache.c init.c nsd.h proc.c server.c tclcmds.c Added Files: tclcache.c Log Message: 2005-12-30 Stephen Deasey <sd...@us...> * include/ns.h: * nsd/nsd.h: * nsd/init.c: * nsd/proc.c: * nsd/cache.c: Global hash of cache names removed; access no longer available via Ns_CacheFind() or ns_cache_names. Caches have unique locking requirements and lifetimes which could be violated by e.g. running ns_cache_stats on a thread local cache as the thread is exiting. New Ns_CacheCreateEx() allows creating a cache which has both a size and a time limit. Caches with time limits are calculated differently. Previous behaviour was to periodically check the last access time of each cache entry and flush those which had expired. A busy cache could grow without bound. New behaviour is to check for expirey each time an entry is retrieved from the cache. All caches can (and should) be size limited. Timeouts may be specified per cache and per entry using new Ns_CacheSetValueExpires(). Ns_CacheFlush() now returns the number of entries flushed. New Ns_CacheStats() takes over from ns_cache_stats for non-Tcl caches. Stats are returned in Tcl "array get" format. Removed Ns_CacheMalloc(), Ns_CacheFree() and Ns_CacheName(). Move Tcl commands to tclcache.c. * nsd/Makefile: * nsd/tclcmds.c: * nsd/tclcache.c: * tests/ns_cache.test: Add new Tcl commands ns_cache_create, _eval, _append, _lappend, and _incr. (RFE# 1119257) Old commands ns_cache_names, _keys, _flush and _stats now only work on Tcl caches. ns_cache_size has been removed; the size is now reported along with other statistics. These commands now only work on Tcl caches. * tcl/cache.tcl: New ns_memoize and related commands which act just like ns_cache_eval but use the script as a key into the memoize cache. Index: init.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/init.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** init.c 7 Nov 2005 03:17:55 -0000 1.6 --- init.c 30 Dec 2005 11:07:34 -0000 1.7 *************** *** 69,73 **** NsInitBinder(); NsInitLog(); - NsInitCache(); NsInitConf(); NsInitEncodings(); --- 69,72 ---- Index: nsd.h =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/nsd.h,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** nsd.h 11 Dec 2005 11:19:50 -0000 1.41 --- nsd.h 30 Dec 2005 11:07:34 -0000 1.42 *************** *** 639,642 **** --- 639,645 ---- Tcl_HashTable runTable; CONST char **errorLogHeaders; + Tcl_HashTable caches; + Ns_Mutex cachelock; + int cacheTimeout; } tcl; *************** *** 873,878 **** extern Ns_ThreadProc NsTclThread; extern Ns_ArgProc NsTclThreadArgProc; - extern Ns_Callback NsCachePurge; - extern Ns_ArgProc NsCacheArgProc; extern Ns_SockProc NsTclSockProc; extern Ns_ArgProc NsTclSockArgProc; --- 876,879 ---- Index: cache.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/cache.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** cache.c 10 Jun 2005 17:58:38 -0000 1.2 --- cache.c 30 Dec 2005 11:07:34 -0000 1.3 *************** *** 32,36 **** * cache.c -- * ! * Routines for a simple cache used by fastpath and Adp. */ --- 32,36 ---- * cache.c -- * ! * Size and time limited caches. */ [...1909 lines suppressed...] ! Ns_IncrTime(&expired, -cachePtr->timeout, 0); ! while ((ePtr = cachePtr->lastEntryPtr) != NULL) { ! if (ePtr->mtime.sec > expired.sec) { ! break; ! } ! if (ePtr->mtime.sec == expired.sec ! && ePtr->mtime.usec > expired.usec) { ! break; ! } ! Ns_CacheFlushEntry((Ns_Entry *) ePtr); ! } } - Ns_MutexUnlock(&cachePtr->lock); } --- 896,900 ---- ePtr->cachePtr->firstEntryPtr = ePtr; if (ePtr->cachePtr->lastEntryPtr == NULL) { ! ePtr->cachePtr->lastEntryPtr = ePtr; } } Index: Makefile =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/Makefile,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Makefile 7 Nov 2005 03:17:55 -0000 1.7 --- Makefile 30 Dec 2005 11:07:34 -0000 1.8 *************** *** 46,50 **** quotehtml.o random.o request.o return.o rollfile.o sched.o \ server.o set.o sock.o sockcallback.o str.o \ ! tclcallbacks.o tclcmds.o tclconf.o tclenv.o tclfile.o tclhttp.o tclimg.o \ tclinit.o tcljob.o tclmisc.o tclobj.o tclobjv.o tclrequest.o tclresp.o \ tclsched.o tclset.o tclshare.o tclsock.o tclthread.o tcltime.o tclvar.o \ --- 46,50 ---- quotehtml.o random.o request.o return.o rollfile.o sched.o \ server.o set.o sock.o sockcallback.o str.o \ ! tclcache.o tclcallbacks.o tclcmds.o tclconf.o tclenv.o tclfile.o tclhttp.o tclimg.o \ tclinit.o tcljob.o tclmisc.o tclobj.o tclobjv.o tclrequest.o tclresp.o \ tclsched.o tclset.o tclshare.o tclsock.o tclthread.o tcltime.o tclvar.o \ --- NEW FILE: tclcache.c --- /* * The contents of this file are subject to the AOLserver Public License * Version 1.1 (the "License"); you may not use this file except in * compliance with the License. You may obtain a copy of the License at * http://aolserver.com/. * * Software distributed under the License is distributed on an "AS IS" * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See * the License for the specific language governing rights and limitations * under the License. * * The Original Code is AOLserver Code and related documentation * distributed by AOL. * * The Initial Developer of the Original Code is America Online, * Inc. Portions created by AOL are Copyright (C) 1999 America Online, * Inc. All Rights Reserved. * * Alternatively, the contents of this file may be used under the terms * of the GNU General Public License (the "GPL"), in which case the * provisions of GPL are applicable instead of those above. If you wish * to allow use of your version of this file only under the terms of the * GPL and not to allow others to use your version of this file under the * License, indicate your decision by deleting the provisions above and * replace them with the notice and other provisions required by the GPL. * If you do not delete the provisions above, a recipient may use your * version of this file under either the License or the GPL. */ /* * tclcache.c -- * * Tcl cache commands. */ #include "nsd.h" NS_RCSID("@(#) $Header: /cvsroot/naviserver/naviserver/nsd/tclcache.c,v 1.1 2005/12/30 11:07:34 sdeasey Exp $"); /* * Local functions defined in this file */ static int CacheAppendObjCmd(ClientData arg, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], int append); static Ns_Entry *CreateEntry(NsInterp *itPtr, Ns_Cache *cache, char *key, int *newPtr, int timeout); static void SetEntry(Tcl_Interp *interp, Ns_Entry *entry, Tcl_Obj *valObj, int ttl); static Ns_ObjvProc ObjvCache; /* *---------------------------------------------------------------------- * * NsTclCacheCreateObjCmd -- * * Create a new Tcl cache. * * Results: * TCL result. * * Side effects: * None. * *---------------------------------------------------------------------- */ int NsTclCacheCreateObjCmd(ClientData arg, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) { NsInterp *itPtr = arg; NsServer *servPtr = itPtr->servPtr; Tcl_HashEntry *hPtr; Ns_Cache *cache; char *name; int new, maxSize, ttl = 0; Ns_ObjvSpec opts[] = { {"-ttl", Ns_ObjvInt, &ttl, NULL}, {"--", Ns_ObjvBreak, NULL, NULL}, {NULL, NULL, NULL, NULL} }; Ns_ObjvSpec args[] = { {"cache", Ns_ObjvString, &name, NULL}, {"size", Ns_ObjvInt, &maxSize, NULL}, {NULL, NULL, NULL, NULL} }; if (Ns_ParseObjv(opts, args, interp, 1, objc, objv) != NS_OK) { return TCL_ERROR; } Ns_MutexLock(&servPtr->tcl.cachelock); hPtr = Tcl_CreateHashEntry(&servPtr->tcl.caches, name, &new); if (new) { cache = Ns_CacheCreateEx(name, TCL_STRING_KEYS, ttl, maxSize, ns_free); Tcl_SetHashValue(hPtr, cache); } Ns_MutexUnlock(&servPtr->tcl.cachelock); if (!new) { Tcl_AppendResult(interp, "duplicate cache name: ", name, NULL); return TCL_ERROR; } return TCL_OK; } /* *---------------------------------------------------------------------- * * NsTclCacheEvalObjCmd -- * * Get data from a cache by key. If key is not present or data * is stale, script is evaluated (with args appended, if present), * and the result is stored in the cache and returned. Script * errors are propagated. * * Results: * TCL result. * * Side effects: * None. * *---------------------------------------------------------------------- */ int NsTclCacheEvalObjCmd(ClientData arg, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) { NsInterp *itPtr = arg; Ns_Cache *cache; Ns_Entry *entry; char *key; int new, status = TCL_OK; int nargs, timeout = -1, ttl = 0; Ns_ObjvSpec opts[] = { {"-timeout", Ns_ObjvInt, &timeout, NULL}, {"-ttl", Ns_ObjvInt, &ttl, NULL}, {"--", Ns_ObjvBreak, NULL, NULL}, {NULL, NULL, NULL, NULL} }; Ns_ObjvSpec args[] = { {"cache", ObjvCache, &cache, arg}, {"key", Ns_ObjvString, &key, NULL}, {"args", Ns_ObjvArgs, &nargs, NULL}, {NULL, NULL, NULL, NULL} }; if (Ns_ParseObjv(opts, args, interp, 1, objc, objv) != NS_OK) { return TCL_ERROR; } if ((entry = CreateEntry(itPtr, cache, key, &new, timeout)) == NULL) { return TCL_ERROR; } if (!new) { Tcl_SetStringObj(Tcl_GetObjResult(interp), Ns_CacheGetValue(entry), Ns_CacheGetSize(entry)); } else { Ns_CacheUnlock(cache); if (nargs == 1) { status = Tcl_EvalObjEx(interp, objv[objc-1], 0); } else { status = Tcl_EvalObjv(interp, nargs, objv + (objc-nargs), 0); } Ns_CacheLock(cache); entry = Ns_CacheCreateEntry(cache, key, &new); if (status != TCL_OK && status != TCL_RETURN) { status = TCL_ERROR; Ns_CacheFlushEntry(entry); } else { status = TCL_OK; SetEntry(interp, entry, NULL, ttl); } Ns_CacheBroadcast(cache); } Ns_CacheUnlock(cache); return status; } /* *---------------------------------------------------------------------- * * NsTclCacheIncrObjCmd -- * * Treat the value of the cached object as in integer and * increment it. No value is trated as starting at zero.a * * Results: * TCL result. * * Side effects: * None. * *---------------------------------------------------------------------- */ int NsTclCacheIncrObjCmd(ClientData arg, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) { NsInterp *itPtr = arg; Ns_Cache *cache; Ns_Entry *entry; char *key; int new, cur, incr = 1; int timeout = -1, ttl = 0; Ns_ObjvSpec opts[] = { {"-timeout", Ns_ObjvInt, &timeout, NULL}, {"-ttl", Ns_ObjvInt, &ttl, NULL}, {"--", Ns_ObjvBreak, NULL, NULL}, {NULL, NULL, NULL, NULL} }; Ns_ObjvSpec args[] = { {"cache", ObjvCache, &cache, arg}, {"key", Ns_ObjvString, &key, NULL}, {"?incr", Ns_ObjvInt, &incr, NULL}, {NULL, NULL, NULL, NULL} }; if (Ns_ParseObjv(opts, args, interp, 1, objc, objv) != NS_OK) { return TCL_ERROR; } if ((entry = CreateEntry(itPtr, cache, key, &new, timeout)) == NULL) { return TCL_ERROR; } if (new) { cur = 0; } else if (Tcl_GetInt(interp, Ns_CacheGetValue(entry), &cur) != TCL_OK) { Ns_CacheUnlock(cache); return TCL_ERROR; } SetEntry(interp, entry, Tcl_NewIntObj(cur + incr), ttl); Ns_CacheUnlock(cache); return TCL_OK; } /* *---------------------------------------------------------------------- * * NsTclCacheAppendObjCmd, NsTclCacheLappendObjCmd -- * * Append one or more elements to cache value. * * Results: * TCL result. * * Side effects: * None. * *---------------------------------------------------------------------- */ int NsTclCacheAppendObjCmd(ClientData arg, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) { return CacheAppendObjCmd(arg, interp, objc, objv, 1); } int NsTclCacheLappendObjCmd(ClientData arg, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) { return CacheAppendObjCmd(arg, interp, objc, objv, 0); } static int CacheAppendObjCmd(ClientData arg, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], int append) { NsInterp *itPtr = arg; Ns_Cache *cache; Ns_Entry *entry; Tcl_Obj *resultObj; char *key; int i, new, nelements; int timeout = -1, ttl = 0; Ns_ObjvSpec opts[] = { {"-timeout", Ns_ObjvInt, &timeout, NULL}, {"-ttl", Ns_ObjvInt, &ttl, NULL}, {"--", Ns_ObjvBreak, NULL, NULL}, {NULL, NULL, NULL, NULL} }; Ns_ObjvSpec args[] = { {"cache", ObjvCache, &cache, arg}, {"key", Ns_ObjvString, &key, NULL}, {"args", Ns_ObjvArgs, &nelements, NULL}, {NULL, NULL, NULL, NULL} }; if (Ns_ParseObjv(opts, args, interp, 1, objc, objv) != NS_OK) { return TCL_ERROR; } if ((entry = CreateEntry(itPtr, cache, key, &new, timeout)) == NULL) { return TCL_ERROR; } resultObj = Tcl_GetObjResult(interp); if (!new) { Tcl_SetStringObj(resultObj, Ns_CacheGetValue(entry), Ns_CacheGetSize(entry)); } for (i = objc - nelements; i < objc; i++) { if (append) { Tcl_AppendObjToObj(resultObj, objv[i]); } else if (Tcl_ListObjAppendElement(interp, resultObj, objv[i]) != TCL_OK) { Ns_CacheUnlock(cache); return TCL_ERROR; } } SetEntry(interp, entry, NULL, ttl); Ns_CacheUnlock(cache); return TCL_OK; } /* *---------------------------------------------------------------------- * * NsTclCacheNamesObjCmd -- * * Spit back a list of cache names. * * Results: * Tcl result. * * Side effects: * A list of cache names will be appended to the interp result. * *---------------------------------------------------------------------- */ int NsTclCacheNamesObjCmd(ClientData arg, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) { NsInterp *itPtr = arg; NsServer *servPtr = itPtr->servPtr; Tcl_HashEntry *hPtr; Tcl_HashSearch search; Ns_MutexLock(&servPtr->tcl.cachelock); hPtr = Tcl_FirstHashEntry(&servPtr->tcl.caches, &search); while (hPtr != NULL) { Tcl_AppendElement(interp, Tcl_GetHashKey(&servPtr->tcl.caches, hPtr)); hPtr = Tcl_NextHashEntry(&search); } Ns_MutexUnlock(&servPtr->tcl.cachelock); return TCL_OK; } /* *---------------------------------------------------------------------- * * NsTclCacheKeysObjCmd -- * * Get a list of all keys in a cache, or only those matching * pattern, if given. * * Results: * TCL result. * * Side effects: * None. * *---------------------------------------------------------------------- */ int NsTclCacheKeysObjCmd(ClientData arg, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) { Ns_Cache *cache; Ns_Entry *entry; Ns_CacheSearch search; char *key, *pattern = NULL; Ns_DString ds; Ns_ObjvSpec args[] = { {"cache", ObjvCache, &cache, arg}, {"?pattern", Ns_ObjvString, &pattern, NULL}, {NULL, NULL, NULL, NULL} }; if (Ns_ParseObjv(NULL, args, interp, 1, objc, objv) != NS_OK) { return TCL_ERROR; } Ns_DStringInit(&ds); Ns_CacheLock(cache); entry = Ns_CacheFirstEntry(cache, &search); while (entry != NULL) { key = Ns_CacheKey(entry); if (pattern == NULL || Tcl_StringMatch(key, pattern)) { Tcl_AppendElement(interp, key); } entry = Ns_CacheNextEntry(&search); } Ns_CacheUnlock(cache); Ns_DStringFree(&ds); return TCL_OK; } /* *---------------------------------------------------------------------- * * NsTclCacheFlushObjCmd -- * * Flush all entries from a cache, or the single entry identified * by key. Return the number of entries flushed. * * Results: * TCL result. * * Side effects: * None. * *---------------------------------------------------------------------- */ int NsTclCacheFlushObjCmd(ClientData arg, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) { Ns_Cache *cache; Ns_Entry *entry; Ns_CacheSearch search; char *key, *pattern; int i, nflushed = 0, glob = NS_FALSE, npatterns = 0; Ns_ObjvSpec opts[] = { {"-glob", Ns_ObjvBool, &glob, (void *) NS_TRUE}, {"--", Ns_ObjvBreak, NULL, NULL}, {NULL, NULL, NULL, NULL} }; Ns_ObjvSpec args[] = { {"cache", ObjvCache, &cache, arg}, {"?args", Ns_ObjvArgs, &npatterns, NULL}, {NULL, NULL, NULL, NULL} }; if (Ns_ParseObjv(opts, args, interp, 1, objc, objv) != NS_OK) { return TCL_ERROR; } Ns_CacheLock(cache); if (npatterns == 0) { nflushed = Ns_CacheFlush(cache); } else if (!glob) { for (i = npatterns; i > 0; i--) { entry = Ns_CacheFindEntry(cache, Tcl_GetString(objv[objc-i])); if (entry != NULL) { Ns_CacheFlushEntry(entry); nflushed++; } } } else { entry = Ns_CacheFirstEntry(cache, &search); while (entry != NULL) { key = Ns_CacheKey(entry); for (i = npatterns; i > 0; i--) { pattern = Tcl_GetString(objv[objc-i]); if (Tcl_StringMatch(key, pattern)) { Ns_CacheFlushEntry(entry); nflushed++; break; } } entry = Ns_CacheNextEntry(&search); } } Ns_CacheUnlock(cache); Tcl_SetIntObj(Tcl_GetObjResult(interp), nflushed); return TCL_OK; } /* *---------------------------------------------------------------------- * * NsTclCacheStatsObjCmds -- * * Returns stats on a cache. * * Results: * Tcl result. * * Side effects: * Results will be appended to interp. * *---------------------------------------------------------------------- */ int NsTclCacheStatsObjCmd(ClientData arg, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) { Ns_Cache *cache; Ns_DString ds; Ns_ObjvSpec args[] = { {"cache", ObjvCache, &cache, arg}, {NULL, NULL, NULL, NULL} }; if (Ns_ParseObjv(NULL, args, interp, 1, objc, objv) != NS_OK) { return TCL_ERROR; } Ns_DStringInit(&ds); Ns_CacheLock(cache); Ns_CacheStats(cache, &ds); Ns_CacheUnlock(cache); Tcl_DStringResult(interp, &ds); return TCL_OK; } /* *---------------------------------------------------------------------- * * CreateEntry -- * * Lock the cache and create a new entry or return existing entry, * waiting up to timeout seconds for another thread to complete * an update. * * Results: * Pointer to entry, or NULL on flush or timeout. * * Side effects: * Cache will be left locked if function returns entry. * *---------------------------------------------------------------------- */ static Ns_Entry * CreateEntry(NsInterp *itPtr, Ns_Cache *cache, char *key, int *newPtr, int timeout) { Ns_Entry *entry; if (timeout < 0) { timeout = itPtr->servPtr->tcl.cacheTimeout; } Ns_CacheLock(cache); entry = Ns_CacheWaitCreateEntry(cache, key, newPtr, timeout); if (entry == NULL) { Ns_CacheUnlock(cache); Tcl_AppendResult(itPtr->interp, "timeout waiting for update or entry flushed: ", key, NULL); } return entry; } /* *---------------------------------------------------------------------- * * SetEntry -- * * Set the value of the cache entry using valObj. If interp * is not NULL, also set it as the Tcl result. * * Results: * None. * * Side effects: * valObj will be owned by interp if not NULL. * *---------------------------------------------------------------------- */ static void SetEntry(Tcl_Interp *interp, Ns_Entry *entry, Tcl_Obj *valObj, int ttl) { char *string, *value; int len; Tcl_Obj *objPtr = valObj; if (objPtr == NULL) { objPtr = Tcl_GetObjResult(interp); } string = Tcl_GetStringFromObj(objPtr, &len); value = ns_malloc(len + 1); memcpy(value, string, len + 1); Ns_CacheSetValueExpires(entry, value, len, ttl); if (valObj != NULL) { Tcl_SetObjResult(interp, valObj); } } /* *---------------------------------------------------------------------- * * ObjvCache -- * * Get a cache by name. * * Results: * TCL_OK or TCL_ERROR. * * Side effects: * Tcl obj will be converted to ns:cache type. * *---------------------------------------------------------------------- */ static int ObjvCache(Ns_ObjvSpec *spec, Tcl_Interp *interp, int *objcPtr, Tcl_Obj *CONST objv[]) { Ns_Cache **cachePtrPtr = spec->dest; NsInterp *itPtr = spec->arg; NsServer *servPtr = itPtr->servPtr; Tcl_HashEntry *hPtr; static CONST char *cacheType = "ns:cache"; if (*objcPtr < 1) { return TCL_ERROR; } if (Ns_TclGetOpaqueFromObj(objv[0], cacheType, (void **) cachePtrPtr) != TCL_OK) { Ns_MutexLock(&servPtr->tcl.cachelock); hPtr = Tcl_FindHashEntry(&servPtr->tcl.caches, Tcl_GetString(objv[0])); Ns_MutexUnlock(&servPtr->tcl.cachelock); if (hPtr == NULL) { Tcl_AppendResult(interp, "no such cache: ", Tcl_GetString(objv[0]), NULL); return TCL_ERROR; } *cachePtrPtr = Tcl_GetHashValue(hPtr); Ns_TclSetOpaqueObj(objv[0], cacheType, *cachePtrPtr); } *objcPtr -= 1; return TCL_OK; } Index: server.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/server.c,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** server.c 11 Dec 2005 04:44:05 -0000 1.15 --- server.c 30 Dec 2005 11:07:34 -0000 1.16 *************** *** 293,296 **** --- 293,300 ---- Ns_RWLockInit(&servPtr->tcl.lock); Tcl_InitHashTable(&servPtr->tcl.runTable, TCL_STRING_KEYS); + Ns_MutexInit(&servPtr->tcl.cachelock); + Tcl_InitHashTable(&servPtr->tcl.caches, TCL_STRING_KEYS); + servPtr->tcl.cacheTimeout = + Ns_ConfigIntRange(path, "cachetimeout", 3, 0, INT_MAX); servPtr->nsv.nbuckets = Ns_ConfigIntRange(path, "nsvbuckets", 8, 1, INT_MAX); servPtr->nsv.buckets = NsTclCreateBuckets(server, servPtr->nsv.nbuckets); Index: proc.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/proc.c,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** proc.c 11 Dec 2005 11:19:50 -0000 1.11 --- proc.c 30 Dec 2005 11:07:34 -0000 1.12 *************** *** 74,78 **** {(void *) NsTclServerRoot, "ns:tclserverroot", Ns_TclCallbackArgProc}, {(void *) NsTclSockProc, "ns:tclsockcallback", NsTclSockArgProc}, - {(void *) NsCachePurge, "ns:cachepurge", NsCacheArgProc}, {(void *) NsConnThread, "ns:connthread", NsConnArgProc}, {(void *) NsTclFilterProc, "ns:tclfilter", Ns_TclCallbackArgProc}, --- 74,77 ---- Index: tclcmds.c =================================================================== RCS file: /cvsroot/naviserver/naviserver/nsd/tclcmds.c,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** tclcmds.c 11 Dec 2005 11:19:50 -0000 1.27 --- tclcmds.c 30 Dec 2005 11:07:34 -0000 1.28 *************** *** 70,73 **** --- 70,82 ---- NsTclAtSignalObjCmd, NsTclAtStartupObjCmd, + NsTclCacheAppendObjCmd, + NsTclCacheCreateObjCmd, + NsTclCacheEvalObjCmd, + NsTclCacheFlushObjCmd, + NsTclCacheIncrObjCmd, + NsTclCacheKeysObjCmd, + NsTclCacheLappendObjCmd, + NsTclCacheNamesObjCmd, + NsTclCacheStatsObjCmd, NsTclCancelObjCmd, NsTclChanObjCmd, *************** *** 194,202 **** NsTclAdpRegisterProcCmd, NsTclAdpStatsCmd, - NsTclCacheFlushCmd, - NsTclCacheKeysCmd, - NsTclCacheNamesCmd, - NsTclCacheSizeCmd, - NsTclCacheStatsCmd, NsTclCharsetsCmd, NsTclConfigCmd, --- 203,206 ---- *************** *** 248,256 **** {"ns_base64decode", NULL, NsTclHTUUDecodeObjCmd}, {"ns_base64encode", NULL, NsTclHTUUEncodeObjCmd}, ! {"ns_cache_flush", NsTclCacheFlushCmd, NULL}, ! {"ns_cache_keys", NsTclCacheKeysCmd, NULL}, ! {"ns_cache_names", NsTclCacheNamesCmd, NULL}, ! {"ns_cache_size", NsTclCacheSizeCmd, NULL}, ! {"ns_cache_stats", NsTclCacheStatsCmd, NULL}, {"ns_cancel", NULL, NsTclCancelObjCmd}, {"ns_charsets", NsTclCharsetsCmd, NULL}, --- 252,264 ---- {"ns_base64decode", NULL, NsTclHTUUDecodeObjCmd}, {"ns_base64encode", NULL, NsTclHTUUEncodeObjCmd}, ! {"ns_cache_append", NULL, NsTclCacheAppendObjCmd}, ! {"ns_cache_create", NULL, NsTclCacheCreateObjCmd}, ! {"ns_cache_eval", NULL, NsTclCacheEvalObjCmd}, ! {"ns_cache_flush", NULL, NsTclCacheFlushObjCmd}, ! {"ns_cache_incr", NULL, NsTclCacheIncrObjCmd}, ! {"ns_cache_keys", NULL, NsTclCacheKeysObjCmd}, ! {"ns_cache_lappend", NULL, NsTclCacheLappendObjCmd}, ! {"ns_cache_names", NULL, NsTclCacheNamesObjCmd}, ! {"ns_cache_stats", NULL, NsTclCacheStatsObjCmd}, {"ns_cancel", NULL, NsTclCancelObjCmd}, {"ns_charsets", NsTclCharsetsCmd, NULL}, |
