January 2008 - jbosscache-commits

JBoss Cache SVN: r5284 - core/tags/2.1.0.CR2B/src/main/java/org/jboss/cache/notifications.

by jbosscache-commits＠lists.jboss.org

Author: manik.surtani(a)jboss.com Date: 2008-01-31 13:56:11 -0500 (Thu, 31 Jan 2008) New Revision: 5284 Modified: core/tags/2.1.0.CR2B/src/main/java/org/jboss/cache/notifications/Notifier.java Log: Modified: core/tags/2.1.0.CR2B/src/main/java/org/jboss/cache/notifications/Notifier.java =================================================================== --- core/tags/2.1.0.CR2B/src/main/java/org/jboss/cache/notifications/Notifier.java 2008-01-31 18:50:02 UTC (rev 5283) +++ core/tags/2.1.0.CR2B/src/main/java/org/jboss/cache/notifications/Notifier.java 2008-01-31 18:56:11 UTC (rev 5284) @@ -232,14 +232,13 @@ */ public void notifyNodeModified(Fqn fqn, boolean pre, NodeModifiedEvent.ModificationType modificationType, Map data, InvocationContext ctx) { - boolean originLocal = ctx.isOriginLocal(); - Map dataCopy = copy(data); - Transaction tx = ctx.getTransaction(); - List<ListenerInvocation> listeners = listenerInvocations.get(NodeModified.class); if (listeners != null && listeners.size() > 0) { + boolean originLocal = ctx.isOriginLocal(); + Map dataCopy = copy(data); + Transaction tx = ctx.getTransaction(); InvocationContext backup = resetInvocationContext(ctx); EventImpl e = new EventImpl(); e.setCache(cache); @@ -265,14 +264,14 @@ */ public void notifyNodeRemoved(Fqn fqn, boolean pre, Map data, InvocationContext ctx) { - boolean originLocal = ctx.isOriginLocal(); - Map dataCopy = copy(data); - Transaction tx = ctx.getTransaction(); - List<ListenerInvocation> listeners = listenerInvocations.get(NodeRemoved.class); if (listeners != null && listeners.size() > 0) { + boolean originLocal = ctx.isOriginLocal(); + Map dataCopy = copy(data); + Transaction tx = ctx.getTransaction(); + InvocationContext backup = resetInvocationContext(ctx); EventImpl e = new EventImpl(); e.setCache(cache); @@ -296,12 +295,11 @@ */ public void notifyNodeVisited(Fqn fqn, boolean pre, InvocationContext ctx) { - Transaction tx = ctx.getTransaction(); - List<ListenerInvocation> listeners = listenerInvocations.get(NodeVisited.class); if (listeners != null && listeners.size() > 0) { + Transaction tx = ctx.getTransaction(); InvocationContext backup = resetInvocationContext(ctx); EventImpl e = new EventImpl(); e.setCache(cache); @@ -316,13 +314,12 @@ public void notifyNodeMoved(Fqn originalFqn, Fqn newFqn, boolean pre, InvocationContext ctx) { - boolean originLocal = ctx.isOriginLocal(); - Transaction tx = ctx.getTransaction(); - List<ListenerInvocation> listeners = listenerInvocations.get(NodeMoved.class); if (listeners != null && listeners.size() > 0) { + boolean originLocal = ctx.isOriginLocal(); + Transaction tx = ctx.getTransaction(); InvocationContext backup = resetInvocationContext(ctx); EventImpl e = new EventImpl(); e.setCache(cache); @@ -347,13 +344,12 @@ */ public void notifyNodeEvicted(final Fqn fqn, final boolean pre, InvocationContext ctx) { - final boolean originLocal = ctx.isOriginLocal(); - Transaction tx = ctx.getTransaction(); - List<ListenerInvocation> listeners = listenerInvocations.get(NodeEvicted.class); if (listeners != null && listeners.size() > 0) { + final boolean originLocal = ctx.isOriginLocal(); + Transaction tx = ctx.getTransaction(); InvocationContext backup = resetInvocationContext(ctx); EventImpl e = new EventImpl(); e.setCache(cache); @@ -377,14 +373,13 @@ */ public void notifyNodeLoaded(Fqn fqn, boolean pre, Map data, InvocationContext ctx) { - boolean originLocal = ctx.isOriginLocal(); - Map dataCopy = copy(data); - Transaction tx = ctx.getTransaction(); - List<ListenerInvocation> listeners = listenerInvocations.get(NodeLoaded.class); if (listeners != null && listeners.size() > 0) { + boolean originLocal = ctx.isOriginLocal(); + Map dataCopy = copy(data); + Transaction tx = ctx.getTransaction(); InvocationContext backup = resetInvocationContext(ctx); EventImpl e = new EventImpl(); e.setCache(cache); @@ -409,14 +404,13 @@ */ public void notifyNodeActivated(Fqn fqn, boolean pre, Map data, InvocationContext ctx) { - boolean originLocal = ctx.isOriginLocal(); - Map dataCopy = copy(data); - Transaction tx = ctx.getTransaction(); - List<ListenerInvocation> listeners = listenerInvocations.get(NodeActivated.class); if (listeners != null && listeners.size() > 0) { + boolean originLocal = ctx.isOriginLocal(); + Map dataCopy = copy(data); + Transaction tx = ctx.getTransaction(); InvocationContext backup = resetInvocationContext(ctx); EventImpl e = new EventImpl(); e.setCache(cache); @@ -441,13 +435,12 @@ */ public void notifyNodePassivated(Fqn fqn, boolean pre, Map data, InvocationContext ctx) { - Map dataCopy = copy(data); - Transaction tx = ctx.getTransaction(); - List<ListenerInvocation> listeners = listenerInvocations.get(NodePassivated.class); if (listeners != null && listeners.size() > 0) { + Map dataCopy = copy(data); + Transaction tx = ctx.getTransaction(); InvocationContext backup = resetInvocationContext(ctx); EventImpl e = new EventImpl(); e.setCache(cache); @@ -534,12 +527,11 @@ */ public void notifyTransactionCompleted(Transaction transaction, boolean successful, InvocationContext ctx) { - Transaction tx = ctx.getTransaction(); - boolean isOriginLocal = ctx.isOriginLocal(); List<ListenerInvocation> listeners = listenerInvocations.get(TransactionCompleted.class); - if (listeners != null && listeners.size() > 0) { + Transaction tx = ctx.getTransaction(); + boolean isOriginLocal = ctx.isOriginLocal(); InvocationContext backup = resetInvocationContext(ctx); EventImpl e = new EventImpl(); e.setCache(cache); @@ -559,12 +551,13 @@ */ public void notifyTransactionRegistered(Transaction transaction, InvocationContext ctx) { - Transaction tx = ctx.getTransaction(); - boolean isOriginLocal = ctx.isOriginLocal(); List<ListenerInvocation> listeners = listenerInvocations.get(TransactionRegistered.class); if (listeners != null && listeners.size() > 0) { + Transaction tx = ctx.getTransaction(); + boolean isOriginLocal = ctx.isOriginLocal(); + InvocationContext backup = resetInvocationContext(ctx); EventImpl e = new EventImpl(); e.setCache(cache);

16 years, 11 months

1
0
0 / 0

JBoss Cache SVN: r5283 - core/tags.

by jbosscache-commits＠lists.jboss.org

Author: manik.surtani(a)jboss.com Date: 2008-01-31 13:50:02 -0500 (Thu, 31 Jan 2008) New Revision: 5283 Added: core/tags/2.1.0.CR2B/ Log: Copied: core/tags/2.1.0.CR2B (from rev 5282, core/tags/2.1.0.CR2)

16 years, 11 months

1
0
0 / 0

JBoss Cache SVN: r5282 - in core/trunk/src/main/docbook: images and 2 other directories.

by jbosscache-commits＠lists.jboss.org

Author: manik.surtani(a)jboss.com Date: 2008-01-31 11:36:51 -0500 (Thu, 31 Jan 2008) New Revision: 5282 Added: core/trunk/src/main/docbook/images/ClusteredCacheLoader.doc core/trunk/src/main/docbook/images/ClusteredCacheLoader.png core/trunk/src/main/docbook/images/logo.gif Modified: core/trunk/src/main/docbook/faq/en/master.xml core/trunk/src/main/docbook/tutorial/en/master.xml core/trunk/src/main/docbook/userguide/en/master.xml Log: Updated Modified: core/trunk/src/main/docbook/faq/en/master.xml =================================================================== --- core/trunk/src/main/docbook/faq/en/master.xml 2008-01-31 11:52:54 UTC (rev 5281) +++ core/trunk/src/main/docbook/faq/en/master.xml 2008-01-31 16:36:51 UTC (rev 5282) @@ -53,6 +53,15 @@ document pertaining to PojoCache specifics. </para> </abstract> + +  + <copyright> + <year>2005</year> + <year>2006</year> + <year>2007</year> + <year>2008</year> + <holder>JBoss, a division of Red Hat Inc.</holder> + </copyright> </bookinfo> @@ -336,47 +345,48 @@ JBoss MBean. Here is a code snippet: </para> - <programlisting> - import org.jboss.mx.util.MBeanServerLocator; - import org.jboss.mx.util.MBeanProxyExt; - import org.jboss.cache.TreeCacheMBean; - import javax.management.MBeanServer; - ... + <programlisting><![CDATA[ - MBeanServer server; - TreeCacheMBean cache; +import org.jboss.mx.util.MBeanServerLocator; +import org.jboss.mx.util.MBeanProxyExt; +import org.jboss.cache.TreeCacheMBean; +import javax.management.MBeanServer; +... - public init() throws Exception - { - try - { - server = MBeanServerLocator.locateJBoss(); - cache = (TreeCacheMBean) MBeanProxyExt.create(TreeCacheMBean.class, "jboss.cache:service=TreeCache", - server); - } - catch (Exception ex) - { - // handle exception - } - } +MBeanServer server; +TreeCacheMBean cache; - public void myBusinessMethod() - { - Object value = cache.get("/my/node", "myKey"); +public init() throws Exception +{ + try + { + server = MBeanServerLocator.locateJBoss(); + cache = (TreeCacheMBean) MBeanProxyExt.create(TreeCacheMBean.class, + "jboss.cache:service=TreeCache", server); + } + catch (Exception ex) + { + // handle exception + } +} - HashMap stuff = new HashMap(); - stuff.put("key1", "value1"); - stuff.put("key2", "value2"); - stuff.put("key3", "value3"); +public void myBusinessMethod() +{ + Object value = cache.get("/my/node", "myKey"); - cache.put("/my/new/node", stuff); + HashMap stuff = new HashMap(); + stuff.put("key1", "value1"); + stuff.put("key2", "value2"); + stuff.put("key3", "value3"); - cache.remove("/my/node"); + cache.put("/my/new/node", stuff); - ... - } + cache.remove("/my/node"); - </programlisting> + ... +} + + ]]></programlisting> </answer> </qandaentry> Added: core/trunk/src/main/docbook/images/ClusteredCacheLoader.doc =================================================================== (Binary files differ) Property changes on: core/trunk/src/main/docbook/images/ClusteredCacheLoader.doc ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: core/trunk/src/main/docbook/images/ClusteredCacheLoader.png =================================================================== (Binary files differ) Property changes on: core/trunk/src/main/docbook/images/ClusteredCacheLoader.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: core/trunk/src/main/docbook/images/logo.gif =================================================================== (Binary files differ) Property changes on: core/trunk/src/main/docbook/images/logo.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: core/trunk/src/main/docbook/tutorial/en/master.xml =================================================================== --- core/trunk/src/main/docbook/tutorial/en/master.xml 2008-01-31 11:52:54 UTC (rev 5281) +++ core/trunk/src/main/docbook/tutorial/en/master.xml 2008-01-31 16:36:51 UTC (rev 5282) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <article lang="en"> <articleinfo> - <title>JBoss Cache core Cache Tutorial</title> + <title>JBoss Cache Core Edition Tutorial</title>  <releaseinfo>Release 2.1.0 Alegrias</releaseinfo> <pubdate>March 2008</pubdate> @@ -11,6 +11,16 @@ <surname>Surtani</surname> <email>manik(a)jboss.org</email> </author> + +  + <copyright> + <year>2005</year> + <year>2006</year> + <year>2007</year> + <year>2008</year> + <holder>JBoss, a division of Red Hat Inc.</holder> + </copyright> + </articleinfo> <section> Modified: core/trunk/src/main/docbook/userguide/en/master.xml =================================================================== --- core/trunk/src/main/docbook/userguide/en/master.xml 2008-01-31 11:52:54 UTC (rev 5281) +++ core/trunk/src/main/docbook/userguide/en/master.xml 2008-01-31 16:36:51 UTC (rev 5282) @@ -74,6 +74,7 @@ <year>2005</year> <year>2006</year> <year>2007</year> + <year>2008</year> <holder>JBoss, a division of Red Hat Inc.</holder> </copyright>

16 years, 11 months

1
0
0 / 0

JBoss Cache SVN: r5281 - benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators.

by jbosscache-commits＠lists.jboss.org

Author: manik.surtani(a)jboss.com Date: 2008-01-31 06:52:54 -0500 (Thu, 31 Jan 2008) New Revision: 5281 Modified: benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/ChartGenerator.java Log: sorting of keys Modified: benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/ChartGenerator.java =================================================================== --- benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/ChartGenerator.java 2008-01-31 11:32:39 UTC (rev 5280) +++ benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/ChartGenerator.java 2008-01-31 11:52:54 UTC (rev 5281) @@ -16,7 +16,10 @@ import java.io.FilenameFilter; import java.io.IOException; import java.util.Date; +import java.util.Map; +import java.util.SortedMap; import java.util.StringTokenizer; +import java.util.TreeMap; /** * Manual chart generator. Grabs CSVs generated by {@link org.cachebench.reportgenerators.ClusterReportGenerator} and spits out @@ -134,8 +137,44 @@ { readData(f); } + + sort(averageThroughput); + sort(totalThroughput); } + /** + * Crappy that the JFReechart data set doesn't order columns and rows by default or even as an option. Need to do this manually. + * + * @param data + */ + private void sort(DefaultCategoryDataset data) + { + SortedMap<Comparable, SortedMap<Comparable, Number>> raw = new TreeMap<Comparable, SortedMap<Comparable, Number>>(); + for (int i = 0; i < data.getRowCount(); i++) + { + Comparable row = data.getRowKey(i); + SortedMap<Comparable, Number> rowData = new TreeMap<Comparable, Number>(); + for (int j = 0; j < data.getColumnCount(); j++) + { + Comparable column = data.getColumnKey(j); + Number value = data.getValue(i, j); + rowData.put(column, value); + } + raw.put(row, rowData); + } + + data.clear(); + for (Comparable row : raw.keySet()) + { + Map<Comparable, Number> rowData = raw.get(row); + for (Comparable column : rowData.keySet()) + { + data.addValue(rowData.get(column), row, column); + } + } + } + + private void readData(File f) throws IOException { // chop up the file name to get productAndConfiguration and clusterSize.

16 years, 11 months

1
0
0 / 0

JBoss Cache SVN: r5280 - core/trunk/src/main/java/org/jboss/cache/notifications.

by jbosscache-commits＠lists.jboss.org

Author: manik.surtani(a)jboss.com Date: 2008-01-31 06:32:39 -0500 (Thu, 31 Jan 2008) New Revision: 5280 Modified: core/trunk/src/main/java/org/jboss/cache/notifications/Notifier.java Log: Added a null check Modified: core/trunk/src/main/java/org/jboss/cache/notifications/Notifier.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/notifications/Notifier.java 2008-01-31 02:47:28 UTC (rev 5279) +++ core/trunk/src/main/java/org/jboss/cache/notifications/Notifier.java 2008-01-31 11:32:39 UTC (rev 5280) @@ -159,6 +159,8 @@ private void removeListenerInvocation(Class annotation, Object listener) { + if (listener == null) return; + List<ListenerInvocation> l = listenerInvocations.get(annotation); Set<Object> markedForRemoval = new HashSet<Object>(); if (l != null)

16 years, 11 months

1
0
0 / 0

JBoss Cache SVN: r5279 - in benchmarks/benchmark-fwk/trunk/cache-products: jbosscache-2.1.0/conf and 1 other directory.

by jbosscache-commits＠lists.jboss.org

Author: manik.surtani(a)jboss.com Date: 2008-01-30 21:47:28 -0500 (Wed, 30 Jan 2008) New Revision: 5279 Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pess-repl-async-br.xml benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pess-repl-async.xml benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pess-repl-sync.xml benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pess-repl-async-br.xml benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pess-repl-async.xml benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pess-repl-sync.xml Log: Updated cfgs Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pess-repl-async-br.xml =================================================================== --- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pess-repl-async-br.xml 2008-01-31 02:36:50 UTC (rev 5278) +++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pess-repl-async-br.xml 2008-01-31 02:47:28 UTC (rev 5279) @@ -44,8 +44,8 @@ thread_pool.rejection_policy="discard" oob_thread_pool.enabled="true" - oob_thread_pool.min_threads="4" - oob_thread_pool.max_threads="8" + oob_thread_pool.min_threads="1" + oob_thread_pool.max_threads="4" oob_thread_pool.keep_alive_time="5000" oob_thread_pool.queue_enabled="false" oob_thread_pool.queue_max_size="100" @@ -56,7 +56,7 @@ <MERGE2 max_interval="30000" min_interval="10000"/> <FD_SOCK/> - <FD timeout="1000" max_tries="2" shun="true"/> + <FD timeout="10000" max_tries="5" shun="true"/> <VERIFY_SUSPECT timeout="1500"/> <BARRIER/> <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0" Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pess-repl-async.xml =================================================================== --- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pess-repl-async.xml 2008-01-31 02:36:50 UTC (rev 5278) +++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pess-repl-async.xml 2008-01-31 02:47:28 UTC (rev 5279) @@ -33,13 +33,12 @@ max_bundle_size="64000" max_bundle_timeout="30" use_incoming_packet_handler="true" - use_outgoing_packet_handler="false" ip_ttl="1" enable_bundling="false"/> <PING timeout="2000" num_initial_members="2"/> <MERGE2 max_interval="100000" min_interval="20000"/> <FD_SOCK/> - <FD timeout="1000" max_tries="2" shun="true"/> + <FD timeout="10000" max_tries="5" shun="true"/> <VERIFY_SUSPECT timeout="1500"/> <pbcast.NAKACK max_xmit_size="60000" use_mcast_xmit="false" gc_lag="0" @@ -48,13 +47,13 @@ <UNICAST timeout="300,600,1200,2400,3600"/> <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000" max_bytes="400000"/> - <pbcast.GMS print_local_addr="true" join_timeout="3000" use_flush="true" flush_timeout="3000" + <pbcast.GMS print_local_addr="true" join_timeout="3000" join_retry_timeout="2000" shun="false" view_bundling="true"/> <FC max_credits="10000000" min_threshold="0.20"/> - <FRAG2 frag_size="60000" down_thread="false" up_thread="false"/> + <FRAG2 frag_size="60000"/> <pbcast.STATE_TRANSFER/> - <pbcast.FLUSH timeout="8000" auto_flush_conf="false"/> + <pbcast.FLUSH timeout="8000"/> </config> </attribute> <attribute name="FetchInMemoryState">false</attribute> Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pess-repl-sync.xml =================================================================== --- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pess-repl-sync.xml 2008-01-31 02:36:50 UTC (rev 5278) +++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pess-repl-sync.xml 2008-01-31 02:47:28 UTC (rev 5279) @@ -33,14 +33,12 @@ max_bundle_size="64000" max_bundle_timeout="30" use_incoming_packet_handler="true" - use_outgoing_packet_handler="false" ip_ttl="1" - bind_addr="127.0.0.1" enable_bundling="false"/> <PING timeout="2000" num_initial_members="2"/> <MERGE2 max_interval="100000" min_interval="20000"/> <FD_SOCK/> - <FD timeout="1000" max_tries="2" shun="true"/> + <FD timeout="10000" max_tries="5" shun="true"/> <VERIFY_SUSPECT timeout="1500"/> <pbcast.NAKACK max_xmit_size="60000" use_mcast_xmit="false" gc_lag="0" @@ -49,14 +47,14 @@ <UNICAST timeout="300,600,1200,2400,3600"/> <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000" max_bytes="400000"/> - <pbcast.GMS print_local_addr="true" join_timeout="3000" use_flush="true" flush_timeout="3000" + <pbcast.GMS print_local_addr="true" join_timeout="3000" join_retry_timeout="2000" shun="false" view_bundling="true"/> <FC max_credits="10000000" min_threshold="0.20"/> <FRAG2 frag_size="60000"/> <pbcast.STATE_TRANSFER/> - <pbcast.FLUSH timeout="8000" auto_flush_conf="false"/> + <pbcast.FLUSH timeout="8000"/> </config> </attribute> <attribute name="FetchInMemoryState">false</attribute> Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pess-repl-async-br.xml =================================================================== --- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pess-repl-async-br.xml 2008-01-31 02:36:50 UTC (rev 5278) +++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pess-repl-async-br.xml 2008-01-31 02:47:28 UTC (rev 5279) @@ -44,8 +44,8 @@ thread_pool.rejection_policy="discard" oob_thread_pool.enabled="true" - oob_thread_pool.min_threads="4" - oob_thread_pool.max_threads="8" + oob_thread_pool.min_threads="1" + oob_thread_pool.max_threads="4" oob_thread_pool.keep_alive_time="5000" oob_thread_pool.queue_enabled="false" oob_thread_pool.queue_max_size="100" @@ -56,7 +56,7 @@ <MERGE2 max_interval="30000" min_interval="10000"/> <FD_SOCK/> - <FD timeout="1000" max_tries="2" shun="true"/> + <FD timeout="10000" max_tries="5" shun="true"/> <VERIFY_SUSPECT timeout="1500"/> <BARRIER/> <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0" Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pess-repl-async.xml =================================================================== --- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pess-repl-async.xml 2008-01-31 02:36:50 UTC (rev 5278) +++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pess-repl-async.xml 2008-01-31 02:47:28 UTC (rev 5279) @@ -33,13 +33,12 @@ max_bundle_size="64000" max_bundle_timeout="30" use_incoming_packet_handler="true" - use_outgoing_packet_handler="false" ip_ttl="1" enable_bundling="false"/> <PING timeout="2000" num_initial_members="2"/> <MERGE2 max_interval="100000" min_interval="20000"/> <FD_SOCK/> - <FD timeout="1000" max_tries="2" shun="true"/> + <FD timeout="10000" max_tries="5" shun="true"/> <VERIFY_SUSPECT timeout="1500"/> <pbcast.NAKACK max_xmit_size="60000" use_mcast_xmit="false" gc_lag="0" @@ -48,13 +47,13 @@ <UNICAST timeout="300,600,1200,2400,3600"/> <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000" max_bytes="400000"/> - <pbcast.GMS print_local_addr="true" join_timeout="3000" use_flush="true" flush_timeout="3000" + <pbcast.GMS print_local_addr="true" join_timeout="3000" join_retry_timeout="2000" shun="false" view_bundling="true"/> <FC max_credits="10000000" min_threshold="0.20"/> - <FRAG2 frag_size="60000" down_thread="false" up_thread="false"/> + <FRAG2 frag_size="60000"/> <pbcast.STATE_TRANSFER/> - <pbcast.FLUSH timeout="8000" auto_flush_conf="false"/> + <pbcast.FLUSH timeout="8000"/> </config> </attribute> <attribute name="FetchInMemoryState">false</attribute> Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pess-repl-sync.xml =================================================================== --- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pess-repl-sync.xml 2008-01-31 02:36:50 UTC (rev 5278) +++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pess-repl-sync.xml 2008-01-31 02:47:28 UTC (rev 5279) @@ -33,14 +33,12 @@ max_bundle_size="64000" max_bundle_timeout="30" use_incoming_packet_handler="true" - use_outgoing_packet_handler="false" ip_ttl="1" - bind_addr="127.0.0.1" enable_bundling="false"/> <PING timeout="2000" num_initial_members="2"/> <MERGE2 max_interval="100000" min_interval="20000"/> <FD_SOCK/> - <FD timeout="1000" max_tries="2" shun="true"/> + <FD timeout="10000" max_tries="5" shun="true"/> <VERIFY_SUSPECT timeout="1500"/> <pbcast.NAKACK max_xmit_size="60000" use_mcast_xmit="false" gc_lag="0" @@ -49,14 +47,14 @@ <UNICAST timeout="300,600,1200,2400,3600"/> <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000" max_bytes="400000"/> - <pbcast.GMS print_local_addr="true" join_timeout="3000" use_flush="true" flush_timeout="3000" + <pbcast.GMS print_local_addr="true" join_timeout="3000" join_retry_timeout="2000" shun="false" view_bundling="true"/> <FC max_credits="10000000" min_threshold="0.20"/> <FRAG2 frag_size="60000"/> <pbcast.STATE_TRANSFER/> - <pbcast.FLUSH timeout="8000" auto_flush_conf="false"/> + <pbcast.FLUSH timeout="8000"/> </config> </attribute> <attribute name="FetchInMemoryState">false</attribute>

16 years, 11 months

1
0
0 / 0

JBoss Cache SVN: r5278 - in benchmarks/benchmark-fwk/trunk/cache-products: jbosscache-2.1.0/conf and 1 other directory.

by jbosscache-commits＠lists.jboss.org

Author: manik.surtani(a)jboss.com Date: 2008-01-30 21:36:50 -0500 (Wed, 30 Jan 2008) New Revision: 5278 Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pess-repl-async-br.xml benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pess-repl-async.xml benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pess-repl-sync.xml benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pess-repl-async-br.xml benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pess-repl-async.xml benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pess-repl-sync.xml Log: Updated cfgs Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pess-repl-async-br.xml =================================================================== --- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pess-repl-async-br.xml 2008-01-31 02:29:46 UTC (rev 5277) +++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pess-repl-async-br.xml 2008-01-31 02:36:50 UTC (rev 5278) @@ -11,7 +11,8 @@ <depends>jboss:service=Naming</depends> <depends>jboss:service=TransactionManager</depends> - <attribute name="TransactionManagerLookupClass">org.jboss.cache.transaction.GenericTransactionManagerLookup</attribute> + <attribute name="TransactionManagerLookupClass">org.jboss.cache.transaction.GenericTransactionManagerLookup + </attribute> <attribute name="IsolationLevel">REPEATABLE_READ</attribute> <attribute name="CacheMode">REPL_ASYNC</attribute> <attribute name="UseReplQueue">false</attribute> @@ -20,59 +21,58 @@ <attribute name="ClusterName">JBossCache-Cluster</attribute> <attribute name="ClusterConfig"> <config> - <TCP start_port="7580" - loopback="false" - discard_incompatible_packets="true" - max_bundle_size="64000" - max_bundle_timeout="30" - use_incoming_packet_handler="true" - enable_bundling="true" - enable_diagnostics="true" - thread_naming_pattern="cl" + <TCP start_port="7580" + loopback="false" + discard_incompatible_packets="true" + max_bundle_size="64000" + max_bundle_timeout="30" + use_incoming_packet_handler="true" + enable_bundling="true" + enable_diagnostics="true" + thread_naming_pattern="cl" + use_concurrent_stack="true" - use_concurrent_stack="true" + recv_buf_size="20000000" + send_buf_size="20000000" - recv_buf_size="20000000" - send_buf_size="20000000" + thread_pool.enabled="true" + thread_pool.min_threads="2" + thread_pool.max_threads="4" + thread_pool.keep_alive_time="5000" + thread_pool.queue_enabled="true" + thread_pool.queue_max_size="100000" + thread_pool.rejection_policy="discard" - thread_pool.enabled="true" - thread_pool.min_threads="2" - thread_pool.max_threads="4" - thread_pool.keep_alive_time="5000" - thread_pool.queue_enabled="true" - thread_pool.queue_max_size="100000" - thread_pool.rejection_policy="discard" + oob_thread_pool.enabled="true" + oob_thread_pool.min_threads="4" + oob_thread_pool.max_threads="8" + oob_thread_pool.keep_alive_time="5000" + oob_thread_pool.queue_enabled="false" + oob_thread_pool.queue_max_size="100" + oob_thread_pool.rejection_policy="Run"/> - oob_thread_pool.enabled="true" - oob_thread_pool.min_threads="4" - oob_thread_pool.max_threads="8" - oob_thread_pool.keep_alive_time="5000" - oob_thread_pool.queue_enabled="false" - oob_thread_pool.queue_max_size="100" - oob_thread_pool.rejection_policy="Run"/> + <MPING timeout="2000" mcast_addr="232.1.2.3" + num_initial_members="2"/> + <MERGE2 max_interval="30000" + min_interval="10000"/> + <FD_SOCK/> + <FD timeout="1000" max_tries="2" shun="true"/> + <VERIFY_SUSPECT timeout="1500"/> + <BARRIER/> + <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0" + retransmit_timeout="50,300,600,1200" + discard_delivered_msgs="true"/> + <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000" + max_bytes="1000000"/> + <VIEW_SYNC avg_send_interval="60000"/> + <pbcast.GMS print_local_addr="true" join_timeout="3000" + shun="false" + view_bundling="true"/> + <FC max_credits="10000000" + min_threshold="0.20"/> + <FRAG2 frag_size="60000"/> + <pbcast.STATE_TRANSFER/> - <MPING timeout="2000" mcast_addr="232.1.2.3" - num_initial_members="3"/> - <MERGE2 max_interval="30000" - min_interval="10000"/> - <FD_SOCK/> - <FD timeout="1000" max_tries="2" shun="true"/> - <VERIFY_SUSPECT timeout="1500" /> - <BARRIER /> - <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0" - retransmit_timeout="50,300,600,1200" - discard_delivered_msgs="true"/> - <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000" - max_bytes="1000000"/> - <VIEW_SYNC avg_send_interval="60000" /> - <pbcast.GMS print_local_addr="true" join_timeout="3000" - shun="false" - view_bundling="true"/> - <FC max_credits="10000000" - min_threshold="0.20"/> - <FRAG2 frag_size="60000" /> - <pbcast.STATE_TRANSFER /> - </config> </attribute> <attribute name="FetchInMemoryState">true</attribute> Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pess-repl-async.xml =================================================================== --- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pess-repl-async.xml 2008-01-31 02:29:46 UTC (rev 5277) +++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pess-repl-async.xml 2008-01-31 02:36:50 UTC (rev 5278) @@ -11,7 +11,8 @@ <depends>jboss:service=Naming</depends> <depends>jboss:service=TransactionManager</depends> - <attribute name="TransactionManagerLookupClass">org.jboss.cache.transaction.GenericTransactionManagerLookup</attribute> + <attribute name="TransactionManagerLookupClass">org.jboss.cache.transaction.GenericTransactionManagerLookup + </attribute> <attribute name="IsolationLevel">REPEATABLE_READ</attribute> <attribute name="CacheMode">REPL_ASYNC</attribute> <attribute name="UseReplQueue">false</attribute> @@ -33,37 +34,27 @@ max_bundle_timeout="30" use_incoming_packet_handler="true" use_outgoing_packet_handler="false" - ip_ttl="2" - down_thread="false" up_thread="false" + ip_ttl="1" enable_bundling="false"/> - <PING timeout="2000" - down_thread="false" up_thread="false" num_initial_members="3"/> - <MERGE2 max_interval="100000" - down_thread="false" up_thread="false" min_interval="20000"/> - <FD_SOCK down_thread="false" up_thread="false"/> + <PING timeout="2000" num_initial_members="2"/> + <MERGE2 max_interval="100000" min_interval="20000"/> + <FD_SOCK/> <FD timeout="1000" max_tries="2" shun="true"/> - <VERIFY_SUSPECT timeout="1500" down_thread="false" up_thread="false"/> + <VERIFY_SUSPECT timeout="1500"/> <pbcast.NAKACK max_xmit_size="60000" use_mcast_xmit="false" gc_lag="0" retransmit_timeout="300,600,1200,2400,4800" - down_thread="false" up_thread="false" discard_delivered_msgs="true"/> - <UNICAST timeout="300,600,1200,2400,3600" - down_thread="false" up_thread="false"/> + <UNICAST timeout="300,600,1200,2400,3600"/> <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000" - down_thread="false" up_thread="false" max_bytes="400000"/> <pbcast.GMS print_local_addr="true" join_timeout="3000" use_flush="true" flush_timeout="3000" - down_thread="false" up_thread="false" - join_retry_timeout="2000" shun="false" - view_bundling="true"/> - <FC max_credits="2000000" down_thread="false" up_thread="false" + join_retry_timeout="2000" shun="false" view_bundling="true"/> + <FC max_credits="10000000" min_threshold="0.20"/> <FRAG2 frag_size="60000" down_thread="false" up_thread="false"/> -  - <pbcast.STATE_TRANSFER down_thread="false" up_thread="false" use_flush="true" flush_timeout="3000"/> - <pbcast.FLUSH down_thread="false" up_thread="false" timeout="8000" auto_flush_conf="false"/> + <pbcast.STATE_TRANSFER/> + <pbcast.FLUSH timeout="8000" auto_flush_conf="false"/> </config> </attribute> <attribute name="FetchInMemoryState">false</attribute> Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pess-repl-sync.xml =================================================================== --- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pess-repl-sync.xml 2008-01-31 02:29:46 UTC (rev 5277) +++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pess-repl-sync.xml 2008-01-31 02:36:50 UTC (rev 5278) @@ -11,7 +11,8 @@ <depends>jboss:service=Naming</depends> <depends>jboss:service=TransactionManager</depends> - <attribute name="TransactionManagerLookupClass">org.jboss.cache.transaction.GenericTransactionManagerLookup</attribute> + <attribute name="TransactionManagerLookupClass">org.jboss.cache.transaction.GenericTransactionManagerLookup + </attribute> <attribute name="IsolationLevel">REPEATABLE_READ</attribute> <attribute name="CacheMode">REPL_SYNC</attribute> <attribute name="UseReplQueue">false</attribute> @@ -20,7 +21,7 @@ <attribute name="ClusterName">JBossCache-Cluster</attribute> <attribute name="ClusterConfig"> <config> - <UDP mcast_addr="224.10.10.10" + <UDP mcast_addr="232.10.10.10" mcast_port="45599" tos="8" ucast_recv_buf_size="20000000" @@ -33,38 +34,29 @@ max_bundle_timeout="30" use_incoming_packet_handler="true" use_outgoing_packet_handler="false" - ip_ttl="2" - down_thread="false" up_thread="false" + ip_ttl="1" bind_addr="127.0.0.1" enable_bundling="false"/> - <PING timeout="2000" - down_thread="false" up_thread="false" num_initial_members="3"/> - <MERGE2 max_interval="100000" - down_thread="false" up_thread="false" min_interval="20000"/> - <FD_SOCK down_thread="false" up_thread="false"/> + <PING timeout="2000" num_initial_members="2"/> + <MERGE2 max_interval="100000" min_interval="20000"/> + <FD_SOCK/> <FD timeout="1000" max_tries="2" shun="true"/> - <VERIFY_SUSPECT timeout="1500" down_thread="false" up_thread="false"/> + <VERIFY_SUSPECT timeout="1500"/> <pbcast.NAKACK max_xmit_size="60000" use_mcast_xmit="false" gc_lag="0" retransmit_timeout="300,600,1200,2400,4800" - down_thread="false" up_thread="false" discard_delivered_msgs="true"/> - <UNICAST timeout="300,600,1200,2400,3600" - down_thread="false" up_thread="false"/> + <UNICAST timeout="300,600,1200,2400,3600"/> <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000" - down_thread="false" up_thread="false" max_bytes="400000"/> <pbcast.GMS print_local_addr="true" join_timeout="3000" use_flush="true" flush_timeout="3000" - down_thread="false" up_thread="false" join_retry_timeout="2000" shun="false" view_bundling="true"/> - <FC max_credits="2000000" down_thread="false" up_thread="false" + <FC max_credits="10000000" min_threshold="0.20"/> - <FRAG2 frag_size="60000" down_thread="false" up_thread="false"/> -  - <pbcast.STATE_TRANSFER down_thread="false" up_thread="false" use_flush="true" flush_timeout="3000"/> - <pbcast.FLUSH down_thread="false" up_thread="false" timeout="8000" auto_flush_conf="false"/> + <FRAG2 frag_size="60000"/> + <pbcast.STATE_TRANSFER/> + <pbcast.FLUSH timeout="8000" auto_flush_conf="false"/> </config> </attribute> <attribute name="FetchInMemoryState">false</attribute> Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pess-repl-async-br.xml =================================================================== --- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pess-repl-async-br.xml 2008-01-31 02:29:46 UTC (rev 5277) +++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pess-repl-async-br.xml 2008-01-31 02:36:50 UTC (rev 5278) @@ -11,7 +11,8 @@ <depends>jboss:service=Naming</depends> <depends>jboss:service=TransactionManager</depends> - <attribute name="TransactionManagerLookupClass">org.jboss.cache.transaction.GenericTransactionManagerLookup</attribute> + <attribute name="TransactionManagerLookupClass">org.jboss.cache.transaction.GenericTransactionManagerLookup + </attribute> <attribute name="IsolationLevel">REPEATABLE_READ</attribute> <attribute name="CacheMode">REPL_ASYNC</attribute> <attribute name="UseReplQueue">false</attribute> @@ -20,61 +21,58 @@ <attribute name="ClusterName">JBossCache-Cluster</attribute> <attribute name="ClusterConfig"> <config> - <TCP start_port="7580" - loopback="false" - discard_incompatible_packets="true" - max_bundle_size="64000" - max_bundle_timeout="30" - use_incoming_packet_handler="true" - enable_bundling="true" - enable_diagnostics="true" - thread_naming_pattern="cl" + <TCP start_port="7580" + loopback="false" + discard_incompatible_packets="true" + max_bundle_size="64000" + max_bundle_timeout="30" + use_incoming_packet_handler="true" + enable_bundling="true" + enable_diagnostics="true" + thread_naming_pattern="cl" + use_concurrent_stack="true" - use_concurrent_stack="true" + recv_buf_size="20000000" + send_buf_size="20000000" - recv_buf_size="20000000" - send_buf_size="20000000" + thread_pool.enabled="true" + thread_pool.min_threads="2" + thread_pool.max_threads="4" + thread_pool.keep_alive_time="5000" + thread_pool.queue_enabled="true" + thread_pool.queue_max_size="100000" + thread_pool.rejection_policy="discard" - thread_pool.enabled="true" - thread_pool.min_threads="2" - thread_pool.max_threads="4" - thread_pool.keep_alive_time="5000" - thread_pool.queue_enabled="true" - thread_pool.queue_max_size="100000" - thread_pool.rejection_policy="discard" + oob_thread_pool.enabled="true" + oob_thread_pool.min_threads="4" + oob_thread_pool.max_threads="8" + oob_thread_pool.keep_alive_time="5000" + oob_thread_pool.queue_enabled="false" + oob_thread_pool.queue_max_size="100" + oob_thread_pool.rejection_policy="Run"/> - oob_thread_pool.enabled="true" - oob_thread_pool.min_threads="4" - oob_thread_pool.max_threads="8" - oob_thread_pool.keep_alive_time="5000" - oob_thread_pool.queue_enabled="false" - oob_thread_pool.queue_max_size="100" - oob_thread_pool.rejection_policy="Run"/> + <MPING timeout="2000" mcast_addr="232.1.2.3" + num_initial_members="2"/> + <MERGE2 max_interval="30000" + min_interval="10000"/> + <FD_SOCK/> + <FD timeout="1000" max_tries="2" shun="true"/> + <VERIFY_SUSPECT timeout="1500"/> + <BARRIER/> + <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0" + retransmit_timeout="50,300,600,1200" + discard_delivered_msgs="true"/> + <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000" + max_bytes="1000000"/> + <VIEW_SYNC avg_send_interval="60000"/> + <pbcast.GMS print_local_addr="true" join_timeout="3000" + shun="false" + view_bundling="true"/> + <FC max_credits="10000000" + min_threshold="0.20"/> + <FRAG2 frag_size="60000"/> + <pbcast.STATE_TRANSFER/> - <MPING timeout="2000" mcast_addr="232.1.2.3" - num_initial_members="3"/> - <MERGE2 max_interval="30000" - min_interval="10000"/> - <FD_SOCK/> - <FD timeout="1000" max_tries="2" shun="true"/> - <VERIFY_SUSPECT timeout="1500" /> - <BARRIER /> - <pbcast.NAKACK use_stats_for_retransmission="false" - exponential_backoff="150" - use_mcast_xmit="false" gc_lag="0" - retransmit_timeout="50,300,600,1200" - discard_delivered_msgs="true"/> - <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000" - max_bytes="1000000"/> - <VIEW_SYNC avg_send_interval="60000" /> - <pbcast.GMS print_local_addr="true" join_timeout="3000" - shun="false" - view_bundling="true"/> - <FC max_credits="10000000" - min_threshold="0.20"/> - <FRAG2 frag_size="60000" /> - <pbcast.STATE_TRANSFER /> - </config> </attribute> <attribute name="FetchInMemoryState">false</attribute> Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pess-repl-async.xml =================================================================== --- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pess-repl-async.xml 2008-01-31 02:29:46 UTC (rev 5277) +++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pess-repl-async.xml 2008-01-31 02:36:50 UTC (rev 5278) @@ -11,7 +11,8 @@ <depends>jboss:service=Naming</depends> <depends>jboss:service=TransactionManager</depends> - <attribute name="TransactionManagerLookupClass">org.jboss.cache.transaction.GenericTransactionManagerLookup</attribute> + <attribute name="TransactionManagerLookupClass">org.jboss.cache.transaction.GenericTransactionManagerLookup + </attribute> <attribute name="IsolationLevel">REPEATABLE_READ</attribute> <attribute name="CacheMode">REPL_ASYNC</attribute> <attribute name="UseReplQueue">false</attribute> @@ -33,37 +34,27 @@ max_bundle_timeout="30" use_incoming_packet_handler="true" use_outgoing_packet_handler="false" - ip_ttl="2" - down_thread="false" up_thread="false" + ip_ttl="1" enable_bundling="false"/> - <PING timeout="2000" - down_thread="false" up_thread="false" num_initial_members="3"/> - <MERGE2 max_interval="100000" - down_thread="false" up_thread="false" min_interval="20000"/> - <FD_SOCK down_thread="false" up_thread="false"/> + <PING timeout="2000" num_initial_members="2"/> + <MERGE2 max_interval="100000" min_interval="20000"/> + <FD_SOCK/> <FD timeout="1000" max_tries="2" shun="true"/> - <VERIFY_SUSPECT timeout="1500" down_thread="false" up_thread="false"/> + <VERIFY_SUSPECT timeout="1500"/> <pbcast.NAKACK max_xmit_size="60000" use_mcast_xmit="false" gc_lag="0" retransmit_timeout="300,600,1200,2400,4800" - down_thread="false" up_thread="false" discard_delivered_msgs="true"/> - <UNICAST timeout="300,600,1200,2400,3600" - down_thread="false" up_thread="false"/> + <UNICAST timeout="300,600,1200,2400,3600"/> <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000" - down_thread="false" up_thread="false" max_bytes="400000"/> <pbcast.GMS print_local_addr="true" join_timeout="3000" use_flush="true" flush_timeout="3000" - down_thread="false" up_thread="false" - join_retry_timeout="2000" shun="false" - view_bundling="true"/> - <FC max_credits="2000000" down_thread="false" up_thread="false" + join_retry_timeout="2000" shun="false" view_bundling="true"/> + <FC max_credits="10000000" min_threshold="0.20"/> <FRAG2 frag_size="60000" down_thread="false" up_thread="false"/> -  - <pbcast.STATE_TRANSFER down_thread="false" up_thread="false" use_flush="true" flush_timeout="3000"/> - <pbcast.FLUSH down_thread="false" up_thread="false" timeout="8000" auto_flush_conf="false"/> + <pbcast.STATE_TRANSFER/> + <pbcast.FLUSH timeout="8000" auto_flush_conf="false"/> </config> </attribute> <attribute name="FetchInMemoryState">false</attribute> Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pess-repl-sync.xml =================================================================== --- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pess-repl-sync.xml 2008-01-31 02:29:46 UTC (rev 5277) +++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/conf/pess-repl-sync.xml 2008-01-31 02:36:50 UTC (rev 5278) @@ -11,7 +11,8 @@ <depends>jboss:service=Naming</depends> <depends>jboss:service=TransactionManager</depends> - <attribute name="TransactionManagerLookupClass">org.jboss.cache.transaction.GenericTransactionManagerLookup</attribute> + <attribute name="TransactionManagerLookupClass">org.jboss.cache.transaction.GenericTransactionManagerLookup + </attribute> <attribute name="IsolationLevel">REPEATABLE_READ</attribute> <attribute name="CacheMode">REPL_SYNC</attribute> <attribute name="UseReplQueue">false</attribute> @@ -20,7 +21,7 @@ <attribute name="ClusterName">JBossCache-Cluster</attribute> <attribute name="ClusterConfig"> <config> - <UDP mcast_addr="224.10.10.10" + <UDP mcast_addr="232.10.10.10" mcast_port="45599" tos="8" ucast_recv_buf_size="20000000" @@ -33,38 +34,29 @@ max_bundle_timeout="30" use_incoming_packet_handler="true" use_outgoing_packet_handler="false" - ip_ttl="2" - down_thread="false" up_thread="false" + ip_ttl="1" bind_addr="127.0.0.1" enable_bundling="false"/> - <PING timeout="2000" - down_thread="false" up_thread="false" num_initial_members="3"/> - <MERGE2 max_interval="100000" - down_thread="false" up_thread="false" min_interval="20000"/> - <FD_SOCK down_thread="false" up_thread="false"/> + <PING timeout="2000" num_initial_members="2"/> + <MERGE2 max_interval="100000" min_interval="20000"/> + <FD_SOCK/> <FD timeout="1000" max_tries="2" shun="true"/> - <VERIFY_SUSPECT timeout="1500" down_thread="false" up_thread="false"/> + <VERIFY_SUSPECT timeout="1500"/> <pbcast.NAKACK max_xmit_size="60000" use_mcast_xmit="false" gc_lag="0" retransmit_timeout="300,600,1200,2400,4800" - down_thread="false" up_thread="false" discard_delivered_msgs="true"/> - <UNICAST timeout="300,600,1200,2400,3600" - down_thread="false" up_thread="false"/> + <UNICAST timeout="300,600,1200,2400,3600"/> <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000" - down_thread="false" up_thread="false" max_bytes="400000"/> <pbcast.GMS print_local_addr="true" join_timeout="3000" use_flush="true" flush_timeout="3000" - down_thread="false" up_thread="false" join_retry_timeout="2000" shun="false" view_bundling="true"/> - <FC max_credits="2000000" down_thread="false" up_thread="false" + <FC max_credits="10000000" min_threshold="0.20"/> - <FRAG2 frag_size="60000" down_thread="false" up_thread="false"/> -  - <pbcast.STATE_TRANSFER down_thread="false" up_thread="false" use_flush="true" flush_timeout="3000"/> - <pbcast.FLUSH down_thread="false" up_thread="false" timeout="8000" auto_flush_conf="false"/> + <FRAG2 frag_size="60000"/> + <pbcast.STATE_TRANSFER/> + <pbcast.FLUSH timeout="8000" auto_flush_conf="false"/> </config> </attribute> <attribute name="FetchInMemoryState">false</attribute>

16 years, 11 months

1
0
0 / 0

JBoss Cache SVN: r5277 - benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf.

by jbosscache-commits＠lists.jboss.org

Author: manik.surtani(a)jboss.com Date: 2008-01-30 21:29:46 -0500 (Wed, 30 Jan 2008) New Revision: 5277 Removed: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/opt-repl-async.xml benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/opt-repl-sync.xml benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pess-repl-sync-br.xml Log: removed noise Deleted: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/opt-repl-async.xml =================================================================== --- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/opt-repl-async.xml 2008-01-31 02:21:20 UTC (rev 5276) +++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/opt-repl-async.xml 2008-01-31 02:29:46 UTC (rev 5277) @@ -1,81 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<server> - - <classpath codebase="./lib" archives="jboss-cache.jar, jgroups.jar"/> - - - <mbean code="org.jboss.cache.CacheImpl" - name="jboss.cache:service=TreeCache"> - - <depends>jboss:service=Naming</depends> - <depends>jboss:service=TransactionManager</depends> - - <attribute name="TransactionManagerLookupClass">org.jboss.cache.transaction.GenericTransactionManagerLookup</attribute> - <attribute name="NodeLockingScheme">OPTIMISTIC</attribute> - <attribute name="CacheMode">REPL_ASYNC</attribute> - <attribute name="UseReplQueue">false</attribute> - <attribute name="ReplQueueInterval">0</attribute> - <attribute name="ReplQueueMaxElements">0</attribute> - <attribute name="ClusterName">JBossCache-Cluster</attribute> - <attribute name="ClusterConfig"> - <config> - <UDP mcast_addr="229.10.10.10" - mcast_port="45599" - tos="8" - ucast_recv_buf_size="20000000" - ucast_send_buf_size="640000" - mcast_recv_buf_size="25000000" - mcast_send_buf_size="640000" - loopback="false" - discard_incompatible_packets="true" - max_bundle_size="64000" - max_bundle_timeout="30" - use_incoming_packet_handler="true" - use_outgoing_packet_handler="false" - ip_ttl="2" - down_thread="false" up_thread="false" - enable_bundling="false"/> - <PING timeout="2000" - down_thread="false" up_thread="false" num_initial_members="3"/> - <MERGE2 max_interval="100000" - down_thread="false" up_thread="false" min_interval="20000"/> - <FD_SOCK down_thread="false" up_thread="false"/> - <FD timeout="10000" max_tries="5" down_thread="false" up_thread="false" shun="true"/> - <VERIFY_SUSPECT timeout="1500" down_thread="false" up_thread="false"/> - <pbcast.NAKACK max_xmit_size="60000" - use_mcast_xmit="false" gc_lag="0" - retransmit_timeout="300,600,1200,2400,4800" - down_thread="false" up_thread="false" - discard_delivered_msgs="true"/> - <UNICAST timeout="300,600,1200,2400,3600" - down_thread="false" up_thread="false"/> - <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000" - down_thread="false" up_thread="false" - max_bytes="400000"/> - <pbcast.GMS print_local_addr="true" join_timeout="3000" use_flush="true" flush_timeout="3000" - down_thread="false" up_thread="false" - join_retry_timeout="2000" shun="false" - view_bundling="true"/> - <FC max_credits="2000000" down_thread="false" up_thread="false" - min_threshold="0.20"/> - <FRAG2 frag_size="60000" down_thread="false" up_thread="false"/> -  - <pbcast.STATE_TRANSFER down_thread="false" up_thread="false" use_flush="true" flush_timeout="3000"/> - <pbcast.FLUSH down_thread="false" up_thread="false" timeout="8000" auto_flush_conf="false"/> - </config> - </attribute> - <attribute name="FetchInMemoryState">true</attribute> - <attribute name="InitialStateRetrievalTimeout">15000</attribute> - <attribute name="SyncReplTimeout">60000</attribute> - <attribute name="LockAcquisitionTimeout">10000</attribute> - <attribute name="EvictionPolicyConfig"> - </attribute> - - <attribute name="CacheLoaderConfiguration"> - </attribute> - - <attribute name="UseRegionBasedMarshalling">false</attribute> - </mbean> -</server> Deleted: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/opt-repl-sync.xml =================================================================== --- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/opt-repl-sync.xml 2008-01-31 02:21:20 UTC (rev 5276) +++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/opt-repl-sync.xml 2008-01-31 02:29:46 UTC (rev 5277) @@ -1,81 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<server> - - <classpath codebase="./lib" archives="jboss-cache.jar, jgroups.jar"/> - - - <mbean code="org.jboss.cache.CacheImpl" - name="jboss.cache:service=TreeCache"> - - <depends>jboss:service=Naming</depends> - <depends>jboss:service=TransactionManager</depends> - - <attribute name="TransactionManagerLookupClass">org.jboss.cache.transaction.GenericTransactionManagerLookup</attribute> - <attribute name="NodeLockingScheme">PESSIMISTIC</attribute> - <attribute name="CacheMode">REPL_SYNC</attribute> - <attribute name="UseReplQueue">false</attribute> - <attribute name="ReplQueueInterval">0</attribute> - <attribute name="ReplQueueMaxElements">0</attribute> - <attribute name="ClusterName">JBossCache-Cluster</attribute> - <attribute name="ClusterConfig"> - <config> - <UDP mcast_addr="229.10.10.10" - mcast_port="45599" - tos="8" - ucast_recv_buf_size="20000000" - ucast_send_buf_size="640000" - mcast_recv_buf_size="25000000" - mcast_send_buf_size="640000" - loopback="false" - discard_incompatible_packets="true" - max_bundle_size="64000" - max_bundle_timeout="30" - use_incoming_packet_handler="true" - use_outgoing_packet_handler="false" - ip_ttl="2" - down_thread="false" up_thread="false" - enable_bundling="false"/> - <PING timeout="2000" - down_thread="false" up_thread="false" num_initial_members="3"/> - <MERGE2 max_interval="100000" - down_thread="false" up_thread="false" min_interval="20000"/> - <FD_SOCK down_thread="false" up_thread="false"/> - <FD timeout="10000" max_tries="5" down_thread="false" up_thread="false" shun="true"/> - <VERIFY_SUSPECT timeout="1500" down_thread="false" up_thread="false"/> - <pbcast.NAKACK max_xmit_size="60000" - use_mcast_xmit="false" gc_lag="0" - retransmit_timeout="300,600,1200,2400,4800" - down_thread="false" up_thread="false" - discard_delivered_msgs="true"/> - <UNICAST timeout="300,600,1200,2400,3600" - down_thread="false" up_thread="false"/> - <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000" - down_thread="false" up_thread="false" - max_bytes="400000"/> - <pbcast.GMS print_local_addr="true" join_timeout="3000" use_flush="true" flush_timeout="3000" - down_thread="false" up_thread="false" - join_retry_timeout="2000" shun="false" - view_bundling="true"/> - <FC max_credits="2000000" down_thread="false" up_thread="false" - min_threshold="0.20"/> - <FRAG2 frag_size="60000" down_thread="false" up_thread="false"/> -  - <pbcast.STATE_TRANSFER down_thread="false" up_thread="false" use_flush="true" flush_timeout="3000"/> - <pbcast.FLUSH down_thread="false" up_thread="false" timeout="8000" auto_flush_conf="false"/> - </config> - </attribute> - <attribute name="FetchInMemoryState">true</attribute> - <attribute name="InitialStateRetrievalTimeout">15000</attribute> - <attribute name="SyncReplTimeout">60000</attribute> - <attribute name="LockAcquisitionTimeout">10000</attribute> - <attribute name="EvictionPolicyConfig"> - </attribute> - - <attribute name="CacheLoaderConfiguration"> - </attribute> - - <attribute name="UseRegionBasedMarshalling">false</attribute> - </mbean> -</server> Deleted: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pess-repl-sync-br.xml =================================================================== --- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pess-repl-sync-br.xml 2008-01-31 02:21:20 UTC (rev 5276) +++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.0.0/conf/pess-repl-sync-br.xml 2008-01-31 02:29:46 UTC (rev 5277) @@ -1,117 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<server> - - <classpath codebase="./lib" archives="jboss-cache.jar, jgroups.jar"/> - - - <mbean code="org.jboss.cache.CacheImpl" - name="jboss.cache:service=TreeCache"> - - <depends>jboss:service=Naming</depends> - <depends>jboss:service=TransactionManager</depends> - - <attribute name="TransactionManagerLookupClass">org.jboss.cache.transaction.GenericTransactionManagerLookup</attribute> - <attribute name="IsolationLevel">READ_COMMITTED</attribute> - <attribute name="CacheMode">REPL_SYNC</attribute> - <attribute name="UseReplQueue">false</attribute> - <attribute name="ReplQueueInterval">0</attribute> - <attribute name="ReplQueueMaxElements">0</attribute> - <attribute name="ClusterName">JBossCache-Cluster</attribute> - <attribute name="ClusterConfig"> - <config> - <UDP mcast_addr="228.10.10.10" - mcast_port="45588" - tos="8" - ucast_recv_buf_size="20000000" - ucast_send_buf_size="640000" - mcast_recv_buf_size="25000000" - mcast_send_buf_size="640000" - loopback="false" - discard_incompatible_packets="true" - max_bundle_size="64000" - max_bundle_timeout="30" - use_incoming_packet_handler="true" - ip_ttl="2" - enable_bundling="false" - enable_diagnostics="true" - - use_concurrent_stack="true" - - thread_naming_pattern="pl" - - thread_pool.enabled="true" - thread_pool.min_threads="1" - thread_pool.max_threads="25" - thread_pool.keep_alive_time="30000" - thread_pool.queue_enabled="true" - thread_pool.queue_max_size="10" - thread_pool.rejection_policy="Run" - - oob_thread_pool.enabled="true" - oob_thread_pool.min_threads="1" - oob_thread_pool.max_threads="4" - oob_thread_pool.keep_alive_time="10000" - oob_thread_pool.queue_enabled="true" - oob_thread_pool.queue_max_size="10" - oob_thread_pool.rejection_policy="Run"/> - - <PING timeout="2000" num_initial_members="3"/> - <MERGE2 max_interval="30000" min_interval="10000"/> - <FD_SOCK/> - <FD timeout="1000" max_tries="2" shun="true"/> - <VERIFY_SUSPECT timeout="1500"/> - <pbcast.NAKACK max_xmit_size="60000" - use_mcast_xmit="false" gc_lag="0" - retransmit_timeout="300,600,1200,2400,4800" - discard_delivered_msgs="true"/> - <UNICAST timeout="300,600,1200,2400,3600"/> - <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000" - max_bytes="400000"/> - <pbcast.GMS print_local_addr="true" join_timeout="5000" - join_retry_timeout="2000" shun="false" - view_bundling="true" view_ack_collection_timeout="5000"/> - <FRAG2 frag_size="60000"/> - <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/> -  - <pbcast.FLUSH timeout="0"/> - </config> - </attribute> - <attribute name="FetchInMemoryState">true</attribute> - <attribute name="InitialStateRetrievalTimeout">15000</attribute> - <attribute name="SyncReplTimeout">60000</attribute> - <attribute name="LockAcquisitionTimeout">10000</attribute> - <attribute name="EvictionPolicyConfig"> - </attribute> - - <attribute name="CacheLoaderConfiguration"> - </attribute> - - <attribute name="UseRegionBasedMarshalling">false</attribute> - -  - <attribute name="BuddyReplicationConfig"> - <config> - <buddyReplicationEnabled>true</buddyReplicationEnabled> - <buddyLocatorClass>org.jboss.cache.buddyreplication.NextMemberBuddyLocator</buddyLocatorClass> - <buddyLocatorProperties> - numBuddies = 1 - ignoreColocatedBuddies = true - </buddyLocatorProperties> - - <buddyPoolName>myBuddyPoolReplicationGroup</buddyPoolName> - - <buddyCommunicationTimeout>2000</buddyCommunicationTimeout> - - - <autoDataGravitation>false</autoDataGravitation> - - <dataGravitationRemoveOnFind>true</dataGravitationRemoveOnFind> - - <dataGravitationSearchBackupTrees>true</dataGravitationSearchBackupTrees> - - </config> - </attribute> - - </mbean> -</server>

16 years, 11 months

1
0
0 / 0

JBoss Cache SVN: r5276 - benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators.

by jbosscache-commits＠lists.jboss.org

Author: manik.surtani(a)jboss.com Date: 2008-01-30 21:21:20 -0500 (Wed, 30 Jan 2008) New Revision: 5276 Modified: benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/ChartGenerator.java Log: better graphs Modified: benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/ChartGenerator.java =================================================================== --- benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/ChartGenerator.java 2008-01-31 01:53:26 UTC (rev 5275) +++ benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/ChartGenerator.java 2008-01-31 02:21:20 UTC (rev 5276) @@ -5,14 +5,17 @@ import org.jfree.chart.ChartUtilities; import org.jfree.chart.JFreeChart; import org.jfree.chart.plot.PlotOrientation; -import org.jfree.chart.title.DateTitle; +import org.jfree.chart.title.TextTitle; +import org.jfree.data.category.CategoryDataset; import org.jfree.data.category.DefaultCategoryDataset; +import java.awt.*; import java.io.BufferedReader; import java.io.File; import java.io.FileReader; import java.io.FilenameFilter; import java.io.IOException; +import java.util.Date; import java.util.StringTokenizer; /** @@ -33,8 +36,8 @@ { static String reportDirectory; static boolean singleChart = true; - DefaultCategoryDataset dataset; - static String chartName = "chart.png"; + DefaultCategoryDataset averageThroughput, totalThroughput; + static String chartNameAverage = "chart-averageThroughput.png", chartNameTotal = "chart-totalThroughput.png"; private static void help() @@ -74,26 +77,43 @@ if (!singleChart) throw new RuntimeException("Multiple charts not yet implemented"); new ChartGenerator().generateChart(); - System.out.println("Finished in " + ((System.currentTimeMillis() - startTime) / 1000) + " seconds! Chart saved as " + chartName); + System.out.println("Finished in " + ((System.currentTimeMillis() - startTime) / 1000) + " seconds! Charts saved as " + chartNameAverage + " and " + chartNameTotal); } private void generateChart() throws IOException { readData(); - JFreeChart chart = ChartFactory.createLineChart("CacheBenchFwk Report", "Cluster size", "Throughput (reqs/sec)", - dataset, PlotOrientation.VERTICAL, true, false, false); - chart.addSubtitle(new DateTitle()); - File chartFile = new File(chartName); + File chartFile = new File(chartNameAverage); if (chartFile.exists()) { - chartFile.renameTo(new File(chartName + "." + System.currentTimeMillis())); - chartFile = new File(chartName); + chartFile.renameTo(new File(chartNameAverage + "." + System.currentTimeMillis())); + chartFile = new File(chartNameAverage); } - ChartUtilities.saveChartAsPNG(chartFile, chart, 600, 800); + ChartUtilities.saveChartAsPNG(chartFile, createChart(averageThroughput, "Report: Average throughput per cache instance", "Throughput per cache instance (reqs/sec)"), 1024, 768); + + chartFile = new File(chartNameTotal); + if (chartFile.exists()) + { + chartFile.renameTo(new File(chartNameTotal + "." + System.currentTimeMillis())); + chartFile = new File(chartNameTotal); + } + + ChartUtilities.saveChartAsPNG(chartFile, createChart(totalThroughput, "Report: Total throughput for cluster", "Overall throughput (reqs/sec)"), 1024, 768); } + private JFreeChart createChart(CategoryDataset data, String title, String yLabel) + { + JFreeChart chart = ChartFactory.createLineChart(title, "Cluster size (number of cache instances)", yLabel, data, PlotOrientation.VERTICAL, true, false, false); + chart.addSubtitle(new TextTitle("Generated on " + new Date() + " by The CacheBenchFwk")); + chart.setBorderVisible(true); + chart.setAntiAlias(true); + chart.setTextAntiAlias(true); + chart.setBackgroundPaint(new Color(0x61, 0x9e, 0xa1)); + return chart; + } + private void readData() throws IOException { File file = new File(reportDirectory); @@ -108,7 +128,8 @@ } }); - dataset = new DefaultCategoryDataset(); + averageThroughput = new DefaultCategoryDataset(); + totalThroughput = new DefaultCategoryDataset(); for (File f : files) { readData(f); @@ -144,7 +165,8 @@ if (throughput != -1) stats.addValue(throughput); } - dataset.addValue(stats.getMean(), productNameAndConfiguration, clusterSize); + averageThroughput.addValue(stats.getMean(), productNameAndConfiguration, clusterSize); + totalThroughput.addValue(stats.getSum(), productNameAndConfiguration, clusterSize); } private double getThroughput(String line)

16 years, 11 months

1
0
0 / 0

JBoss Cache SVN: r5275 - in benchmarks/benchmark-fwk/trunk: src/org/cachebench/reportgenerators and 1 other directory.

by jbosscache-commits＠lists.jboss.org

Author: manik.surtani(a)jboss.com Date: 2008-01-30 20:53:26 -0500 (Wed, 30 Jan 2008) New Revision: 5275 Modified: benchmarks/benchmark-fwk/trunk/allJBossCacheTests.sh benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/ChartGenerator.java Log: User friendly output Modified: benchmarks/benchmark-fwk/trunk/allJBossCacheTests.sh =================================================================== --- benchmarks/benchmark-fwk/trunk/allJBossCacheTests.sh 2008-01-31 01:39:17 UTC (rev 5274) +++ benchmarks/benchmark-fwk/trunk/allJBossCacheTests.sh 2008-01-31 01:53:26 UTC (rev 5275) @@ -1,8 +1,9 @@ #!/bin/bash +scaling="2 4 6 8" #scaling="2 4 6 8 10" -scaling="2 4" -configs="pess-repl-async.xml pess-repl-sync.xml" # pess-repl-async-br.xml" +#scaling="2 4" +configs="pess-repl-async.xml pess-repl-sync.xml pess-repl-async-br.xml" products="jbosscache-2.0.0 jbosscache-2.1.0" mkdir output @@ -26,3 +27,8 @@ done done done + + +echo Generating charts ... + +./generateChart -reportDir output Modified: benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/ChartGenerator.java =================================================================== --- benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/ChartGenerator.java 2008-01-31 01:39:17 UTC (rev 5274) +++ benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/ChartGenerator.java 2008-01-31 01:53:26 UTC (rev 5275) @@ -5,6 +5,7 @@ import org.jfree.chart.ChartUtilities; import org.jfree.chart.JFreeChart; import org.jfree.chart.plot.PlotOrientation; +import org.jfree.chart.title.DateTitle; import org.jfree.data.category.DefaultCategoryDataset; import java.io.BufferedReader; @@ -12,8 +13,6 @@ import java.io.FileReader; import java.io.FilenameFilter; import java.io.IOException; -import java.util.Collections; -import java.util.Date; import java.util.StringTokenizer; /** @@ -35,6 +34,7 @@ static String reportDirectory; static boolean singleChart = true; DefaultCategoryDataset dataset; + static String chartName = "chart.png"; private static void help() @@ -45,6 +45,7 @@ public static void main(String[] args) throws IOException { + long startTime = System.currentTimeMillis(); System.out.println("Welcome to the ChartGenerator."); // the params we expect: for (int i = 0; i < args.length; i++) @@ -72,16 +73,25 @@ } if (!singleChart) throw new RuntimeException("Multiple charts not yet implemented"); new ChartGenerator().generateChart(); + + System.out.println("Finished in " + ((System.currentTimeMillis() - startTime) / 1000) + " seconds! Chart saved as " + chartName); } private void generateChart() throws IOException { readData(); JFreeChart chart = ChartFactory.createLineChart("CacheBenchFwk Report", "Cluster size", "Throughput (reqs/sec)", - dataset, PlotOrientation.HORIZONTAL, true, false, false); + dataset, PlotOrientation.VERTICAL, true, false, false); + chart.addSubtitle(new DateTitle()); - chart.setSubtitles(Collections.singletonList("" + new Date())); - ChartUtilities.saveChartAsPNG(new File("chart.png"), chart, 600, 800); + File chartFile = new File(chartName); + if (chartFile.exists()) + { + chartFile.renameTo(new File(chartName + "." + System.currentTimeMillis())); + chartFile = new File(chartName); + } + + ChartUtilities.saveChartAsPNG(chartFile, chart, 600, 800); } private void readData() throws IOException

16 years, 11 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbosscache-commits January 2008