Changed udp-nak.xml -> udp-new.xml

belaban · Nov 22, 2024 · 990710a · 990710a
1 parent 6e3bfd9
commit 990710a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/build.xml b/build.xml
@@ -521,7 +521,7 @@
         	<antcall target="functional"/>
             <antcall target="encrypt"/>
             <antcall target="udp"/>
-            <antcall target="udp-nak"/>
+            <antcall target="udp-new"/>
             <antcall target="tcp"/>
             <antcall target="tcp-nak"/>
             <antcall target="tcp-nio"/>
@@ -537,7 +537,7 @@
             <antcall target="functional"/>
             <sequential>
                 <antcall target="udp"/>
-                <antcall target="udp-nak"/>
+                <antcall target="udp-new"/>
             </sequential>
             <sequential>
                 <antcall target="tcp"/>
@@ -620,17 +620,17 @@
                 />
     </target>
 
-    <target name="udp-nak" depends="postcompile,define-testng-task" description="Runs UDP tests">
-        <mkdir dir="${tmp.dir}/test-results/xml/udp-nak"/>
-        <runtest suitename="udp-nak"
+    <target name="udp-new" depends="postcompile,define-testng-task" description="Runs UDP tests">
+        <mkdir dir="${tmp.dir}/test-results/xml/udp-new"/>
+        <runtest suitename="udp-new"
                  groups="base,stack-dependent"
                  excludedgroups="stack-independent,broken"
                  parallel="${parallel.classes}"
                  threadcount="20"
                  initial.mcast.addr="${jgroups.udp.mcast_addr}"
                  initial.mcast.port="26000"
                  initial.tcp.port="26000"
-                 jvmarg1="-Dchannel.conf=udp-nak.xml"
+                 jvmarg1="-Dchannel.conf=udp-new.xml"
         />
     </target>
 

diff --git a/conf/udp-nak.xml → conf/udp-new.xml b/conf/udp-nak.xml → conf/udp-new.xml
@@ -1,6 +1,6 @@
 
 <!--
-  Default stack using IP multicasting (UDP) +NAKACK4 -STABLE -MFC
+  Default stack using IP multicasting (UDP) +NAKACK4 +UNICAST4 -STABLE -MFC - UFC
   author: Bela Ban
 -->
 <config xmlns="urn:org:jgroups"
@@ -21,11 +21,9 @@
     <FD_ALL3/>
     <VERIFY_SUSPECT2 timeout="1.5s"  />
     <BARRIER />
-    <NAKACK4 xmit_interval="0.5s" capacity="6000"/>
-    <UNICAST3 xmit_interval="0.5s" />
+    <NAKACK4  xmit_interval="0.5s" capacity="6000"/>
+    <UNICAST4 xmit_interval="0.5s" capacity="2048"/>
     <pbcast.GMS print_local_addr="true" join_timeout="1s"/>
-    <UFC max_credits="4M"
-             min_threshold="0.4"/>
     <FRAG2 frag_size="60K"  />
     <pbcast.STATE_TRANSFER />
 </config>