Permalink
Browse files

merge with patches for 2.2.9.3 (aka 2.2.9.1 sp3)

  • Loading branch information...
1 parent f191d38 commit e8dc968347a5743ca945e8848ae6eb9defadb37d mimbert committed Aug 8, 2006
View
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<!-- $Id: build.xml,v 1.34.4.1 2006/05/21 09:36:50 mimbert Exp $ -->
+<!-- $Id: build.xml,v 1.34.4.2 2006/08/08 08:58:13 mimbert Exp $ -->
<project name="JGroups" default="compile" basedir=".">
<description>
@@ -29,7 +29,7 @@
<property name="javadoc.packages" value="org.jgroups.*"/>
<property name="unittest.timeout.low" value="120000"/>
<property name="unittest.timeout.high" value="280000"/>
- <property name="version" value="2.2.9.1"/>
+ <property name="version" value="2.2.9.3-cdc"/>
<path id="jg.classpath">
@@ -450,6 +450,7 @@
depends="compile, makeKeystore"
description="Runs all unit tests in tests/junit and prints results to stdout">
<junit printsummary="yes" timeout="${unittest.timeout.low}" fork="yes">
+ <jvmarg value="-Djava.net.preferIPv4Stack=true"/>
<classpath refid="jg.classpath"/>
<formatter type="brief" usefile="false"/>
<batchtest todir="${tmp.dir}">
@@ -487,8 +488,8 @@
<delete dir="${tmp.dir}/tests-results"/>
<mkdir dir="${tmp.dir}/tests-results"/>
<junit printsummary="yes" timeout="${unittest.timeout.low}" fork="yes">
+ <jvmarg value="-Djava.net.preferIPv4Stack=true"/>
<jvmarg value="-Dtests.tmp.dir=${tmp.dir}"/>
- <jvmarg value="-Dlog4j.configuration=file:c:\log4j.properties"/>
<classpath refid="jg.classpath"/>
<formatter type="xml" usefile="true"/>
<batchtest todir="${tmp.dir}/tests-results">
@@ -1,5 +1,54 @@
<!-- ************ JGroups Protocol Stack Configuration ************** -->
+<!-- generated by XmlConfigurator on Mon Apr 26 11:20:10 PDT 2004 -->
+<!-- input file: fc-fast.old.xml -->
+
+<!--
+Best result with perf.Test (2 members, 1 sender, laptop, 20000 1K msgs
+100Mbps switch)
+
+- March 2005: **2700** msgs/sec (on 192.168.5.1)
+
+- April 18 2005: **4450** msgs/sec (on 192.168.5.1):
+ -Xmx500M -Xms500M -XX:NewRatio=1 -XX:+AggressiveHeap -verbose:gc -XX:+DisableExplicitGC
+ -XX:ThreadStackSize=32 -XX:CompileThreshold=100:
+ combined: num_msgs_expected=20000, num_msgs_received=20000 (loss rate=0%), received=20MB,
+ time=4496ms, msgs/sec=4448.4, throughput=4.45MB/sec
+
+- April 20 2005: **5006** msgs/sec (on 192.168.5.1):
+ -Xmx500M -Xms500M -XX:NewRatio=1 -XX:+AggressiveHeap -verbose:gc -XX:+DisableExplicitGC
+ -XX:ThreadStackSize=32 -XX:CompileThreshold=100:
+ combined: num_msgs_expected=20000, num_msgs_received=20000 (loss rate=0%), received=20MB,
+ time=3995ms, msgs/sec=5006.26, throughput=5.01MB/sec
+
+- June 15 2005: **5296** msgs/sec (on 192.168.5.1):
+ -Xmx500M -Xms500M -XX:NewRatio=1 -XX:+AggressiveHeap -verbose:gc -XX:+DisableExplicitGC
+ -XX:ThreadStackSize=32 -XX:CompileThreshold=100:
+ combined: num_msgs_expected=20000, num_msgs_received=20000 (loss rate=0%), received=20MB,
+ time=3776ms, msgs/sec=5296.61, throughput=5.3MB/sec
+- June 23 2005: **5625** msgs/sec (on 192.168.5.1):
+ -Xmx500M -Xms500M -XX:NewRatio=1 -XX:+AggressiveHeap -verbose:gc -XX:+DisableExplicitGC
+ -XX:ThreadStackSize=32 -XX:CompileThreshold=100:
+ combined: num_msgs_expected=20000, num_msgs_received=20000 (loss rate=0%), received=20MB,
+ time=3555ms, msgs/sec=5625.88, throughput=5.63MB/sec
+- July 4 2005: **5800** msgs/sec (on 192.168.5.1):
+ -Xmx500M -Xms500M -XX:NewRatio=1 -XX:+AggressiveHeap -verbose:gc -XX:+DisableExplicitGC
+ -XX:ThreadStackSize=32 -XX:CompileThreshold=100:
+ combined: num_msgs_expected=20000, num_msgs_received=20000 (loss rate=0%), received=20MB,
+ time=3445ms, msgs/sec=5805.52, throughput=5.81MB/sec
+
+- July 12 2005: **5960** msgs/sec (on 192.168.5.1):
+ -Xmx500M -Xms500M -XX:NewRatio=1 -XX:+AggressiveHeap -verbose:gc -XX:+DisableExplicitGC
+ -XX:ThreadStackSize=32 -XX:CompileThreshold=100:
+ combined: num_msgs_expected=20000, num_msgs_received=20000 (loss rate=0%), received=20MB,
+ time=3355ms, msgs/sec=5961.25, throughput=5.96MB/sec
+
+- July 13 2005: **6300** msgs/sec (on 192.168.5.1):
+ -Xmx500M -Xms500M -XX:NewRatio=1 -XX:+AggressiveHeap -verbose:gc -XX:+DisableExplicitGC
+ -XX:ThreadStackSize=32 -XX:CompileThreshold=100:
+ combined: num_msgs_expected=20000, num_msgs_received=20000 (loss rate=0%), received=20MB,
+ time=3165ms, msgs/sec=6319.12, throughput=6.32MB/sec
+ -->
<config>
<UDP
mcast_port="45566"
@@ -23,7 +72,7 @@
<!-- MERGE2 max_interval="100000"
down_thread="false" up_thread="false" min_interval="20000"/ -->
<FD_SOCK down_thread="false" up_thread="false"/>
- <VERIFY_SUSPECT timeout="1500" down_thread="false" up_thread="false"/>
+ <!--VERIFY_SUSPECT timeout="1500" down_thread="false"/-->
<pbcast.NAKACK max_xmit_size="60000"
use_mcast_xmit="false" gc_lag="0"
retransmit_timeout="100,200,300,600,1200,2400,4800"
@@ -38,8 +87,8 @@
<pbcast.GMS print_local_addr="true" join_timeout="3000"
down_thread="false" up_thread="false"
join_retry_timeout="2000" shun="true"/>
- <FC max_credits="2000000" down_thread="false" up_thread="false"
- min_threshold="0.10"/>
- <FRAG2 frag_size="60000" down_thread="false" up_thread="false"/>
+ <FC max_credits="2000000" down_thread="false" up_thread="false"
+ min_threshold="0.10"/>
+ <FRAG2 frag_size="60000" down_thread="false" up_thread="true"/>
<pbcast.STATE_TRANSFER down_thread="false" up_thread="false"/>
</config>
View
@@ -1,4 +1,4 @@
Manifest-Version: 1.0
Created-By: Apache Ant 1.5Beta2
Main-Class: org.jgroups.Version
-Implementation-Version: 2.3 beta 3
+Implementation-Version: 2.2.9 SP3 CDC
Oops, something went wrong.

0 comments on commit e8dc968

Please sign in to comment.