Index: xml-cocoon2/src/org/apache/cocoon/components/store/MRUMemoryStore.java =================================================================== RCS file: /home/cvspublic/xml-cocoon2/src/org/apache/cocoon/components/store/MRUMemoryStore.java,v retrieving revision 1.4 diff -u -r1.4 MRUMemoryStore.java --- xml-cocoon2/src/org/apache/cocoon/components/store/MRUMemoryStore.java 2001/07/15 20:47:22 1.4 +++ xml-cocoon2/src/org/apache/cocoon/components/store/MRUMemoryStore.java 2001/07/16 22:15:28 @@ -82,11 +82,6 @@ private boolean filesystem; /** - * Indicates the interval of the WriterThread - */ - private int writerthreadinterval; - - /** * The heart of the cache */ private HashMap cache; @@ -97,6 +92,7 @@ private File cachefile; private Store fsstore; private Stack writerstack; + private Thread writer; /** the component manager */ protected ComponentManager manager; @@ -121,7 +117,6 @@ *
  • maxobjects = how many objects will be stored in memory (Default: 10o objects)
    • *
  • threadpriority = priority of the thread (1-10). (Default: 10)
    • *
  • filesystem = use filesystem storage to keep object persistent (Default: false)
    • - *
  • writerthreadinterval = time in millis to sleep between writing onto the filesystem (Default: 100 millis)
    • *
  • usecleanupthread = use a cleanup daemon thread. (Default: true)
    • * */ @@ -138,13 +133,9 @@ this.maxobjects = params.getParameterAsInteger("maxobjects",100); this.priority = params.getParameterAsInteger("threadpriority",Thread.currentThread().getPriority()); this.filesystem = params.getParameterAsBoolean("filesystem",false); - this.writerthreadinterval = params.getParameterAsInteger("writerthreadinterval",100); if ((this.priority < 1) || (this.priority > 10)) { throw new ConfigurationException("MRUMemoryStore cleanup thread priority must be between 1 and 10!"); } - if ((this.writerthreadinterval < 1)) { - throw new ConfigurationException("MRUMemoryStore writer thread interval must be at least 1 millis!"); - } if ((this.maxobjects < 1)) { throw new ConfigurationException("MRUMemoryStore maxobjects must be at least 1 milli second!"); } @@ -165,7 +156,7 @@ if (this.filesystem) { getLogger().debug("MRUMemoryStore intializing writer thread"); - Thread writer = new Thread(this); + writer = new Thread(this); writer.setPriority(this.priority); writer.setDaemon(true); writer.setName("writer"); @@ -195,8 +186,9 @@ Thread.currentThread().sleep(this.cleanupthreadinterval * 1000); } catch (InterruptedException ignore) {} } else if(Thread.currentThread().getName().equals("writer")) { - if(!writerstack.empty()) { + while(!writerstack.empty()) { try { + getLogger().debug("MRUMemoryStore writerthread awake!"); TmpStackObject tmpstackobject = new TmpStackObject(); Object key = new Object(); Object object = new Object(); @@ -213,9 +205,13 @@ getLogger().error("Error in MRUMemoryStore",ex); } } - try { - Thread.currentThread().sleep(this.writerthreadinterval); - } catch (InterruptedException ignore) {} + synchronized (this.writer) { + try { + writer.wait(); + } catch (InterruptedException e) { + getLogger().error("Error in MRUMemoryStore:",e); + } + } } } } @@ -235,7 +231,8 @@ * It also can store the objects onto the filesystem if configured. */ public void hold(Object key, Object value) { - getLogger().debug("MRUMemoryStore holding object in memory. Key: " + key); + getLogger().debug("MRUMemoryStore holding object in memory. key: " + key); + getLogger().debug("MRUMemoryStore holding object in memory. value: " + value); boolean serialisedFlag; /** ...first test if the max. objects in cache is reached... */ @@ -251,6 +248,9 @@ this.writerstack.push(new TmpStackObject(key,value)); getLogger().debug("MRUMemoryStore stack size=" + writerstack.size()); serialisedFlag = true; + synchronized (this.writer) { + this.writer.notify(); + } } else { serialisedFlag = false; } @@ -268,7 +268,6 @@ */ public Object get(Object key) { getLogger().debug("MRUMemoryStore getting object from memory. Key: " + key); - //CacheObject tmpobject = new CacheObject(); Object tmpobject = new Object(); try { @@ -284,8 +283,7 @@ if (tmpobject == null) { return null; } else { - getLogger().debug("MRUMemoryStor found object on fs"); - + getLogger().debug("MRUMemoryStore found object on fs"); try { tmpobject = IOUtils.deserializeObject((File)tmpobject); this.hold(key,tmpobject); @@ -337,19 +335,21 @@ * It removes the last element in the cache. */ public void free() { - if(this.checkSeriazable(cache.get(this.mrulist.getLast()))) { - this.writerstack.push(new TmpStackObject(this.mrulist.getLast(),cache.get(this.mrulist.getLast()))); + try { + getLogger().debug("MRUMemoryStore freeing store"); + this.cache.remove(this.mrulist.getLast()); + this.mrulist.removeLast(); + } catch (Exception e) { + getLogger().error("Error in MRUMemoryStore:",e); } - this.cache.remove(this.mrulist.getLast()); - this.mrulist.removeLast(); } /** * This method checks if an object is seriazable */ private boolean checkSeriazable(Object object) { - getLogger().debug("MRUMemoryStore checkSeriazable(): " + object.getClass().getName()); try { + getLogger().debug("MRUMemoryStore object=" + object); if((object.getClass().getName().equals("org.apache.cocoon.caching.CachedEventObject")) || (object.getClass().getName().equals("org.apache.cocoon.caching.CachedStreamObject")) || (ClassUtils.implementsInterface(object.getClass().getName(),"org.apache.cocoon.caching.CacheValidity"))) { Index: xml-cocoon2/webapp/cocoon.xconf =================================================================== RCS file: /home/cvspublic/xml-cocoon2/webapp/cocoon.xconf,v retrieving revision 1.19 diff -u -r1.19 cocoon.xconf --- xml-cocoon2/webapp/cocoon.xconf 2001/07/16 13:35:13 1.19 +++ xml-cocoon2/webapp/cocoon.xconf 2001/07/16 22:15:33 @@ -31,9 +31,6 @@ threadpriority: Indicates the priority of the cleanup thread. (1 is the lowest priority and 10 is the highest). filesystem: Turns the filesystem storage for objects on or off. - writerthreadinterval: Inidicates the interval of the writer thread in millis. - This background threads writes objects onto the - filesystem. --> @@ -42,8 +39,7 @@ - - + - @database-url@ - @database-user@ - @database-password@ + jdbc:hsqldb:${install.war}/cocoon/WEB-INF/db/cocoondb + sa + @@ -209,9 +201,6 @@ threadpriority: Indicates the priority of the cleanup thread. (1 is the lowest priority and 10 is the highest). filesystem: Turns the filesystem storage for objects on or off. - writerthreadinterval: Inidicates the interval of the writer thread in millis. - This background threads writes objects onto the - filesystem. --> @@ -220,8 +209,7 @@ - - +