Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Patch to revert back to 2.4.7 (to work around corrupted git repo)

git cherry-pick 2e82eaf..0ace60e
then backed out files that just change version to 2.4.9
  • Loading branch information...
commit a5d445b4adfc7ed094bbfeed38efe9af8aa5ea2a 1 parent 0d35ce8
@dereed dereed authored
Showing with 784 additions and 1,057 deletions.
  1. +13 −0 .gitignore
  2. +0 −109 EULA
  3. +1 −1  conf/EncryptNoKeyStore.xml
  4. +2 −2 conf/auth_X509.xml
  5. +2 −2 conf/auth_fixedlist.xml
  6. +2 −2 conf/auth_md5.xml
  7. +2 −2 conf/auth_simple.xml
  8. +1 −1  conf/bsh.xml
  9. +2 −2 conf/causal.xml
  10. +2 −2 conf/compress.xml
  11. +9 −9 conf/discard.xml
  12. +18 −18 conf/encrypt-entire-message.xml
  13. +1 −1  conf/encrypt.xml
  14. +9 −9 conf/jboss-service.xml
  15. +4 −4 conf/mping.xml
  16. +1 −1  conf/pbcast.xml
  17. +14 −14 conf/pulltheplug.xml
  18. +16 −16 conf/sequencer.xml
  19. +3 −3 conf/smack.xml
  20. +3 −3 conf/smack_tunnel.xml
  21. +14 −14 conf/streaming-state-transfer.xml
  22. +15 −15 conf/tcp-nio.xml
  23. +0 −63 conf/tcp_nio.xml
  24. +3 −3 conf/tcpgossip.xml
  25. +1 −1  conf/total-token.xml
  26. +15 −15 conf/total.xml
  27. +17 −17 conf/udp.xml
  28. +1 −1  conf/vsync.xml
  29. +1 −1  doc/CONFIGURATIONS
  30. +2 −2 doc/RELEASE_INSTRUCTIONS
  31. +0 −86 doc/design/ThreadlessStack.txt
  32. +2 −4 src/org/jgroups/ChannelClosedException.java
  33. +2 −4 src/org/jgroups/ChannelException.java
  34. +1 −1  src/org/jgroups/ChannelListener.java
  35. +2 −4 src/org/jgroups/ChannelNotConnectedException.java
  36. +2 −4 src/org/jgroups/blocks/LockMultiLockedException.java
  37. +1 −3 src/org/jgroups/blocks/LockNotGrantedException.java
  38. +1 −3 src/org/jgroups/blocks/LockNotReleasedException.java
  39. +2 −5 src/org/jgroups/blocks/LockingException.java
  40. +1 −1  src/org/jgroups/blocks/RequestHandler.java
  41. +2 −4 src/org/jgroups/blocks/UpdateException.java
  42. +1 −3 src/org/jgroups/blocks/VoteException.java
  43. +1 −1  src/org/jgroups/conf/ProtocolStackConfigurator.java
  44. +26 −5 src/org/jgroups/debug/Debugger.java
  45. +1 −1  src/org/jgroups/debug/ProtocolSpecificView.java
  46. +41 −29 src/org/jgroups/debug/ProtocolView.java
  47. +1 −1  src/org/jgroups/debug/QUEUEView.java
  48. +11 −5 src/org/jgroups/demos/Draw.java
  49. +2 −1  src/org/jgroups/demos/Draw2Channels.java
  50. +0 −2  src/org/jgroups/persistence/CannotConnectException.java
  51. +0 −2  src/org/jgroups/persistence/CannotCreateSchemaException.java
  52. +0 −2  src/org/jgroups/persistence/CannotPersistException.java
  53. +1 −3 src/org/jgroups/persistence/CannotRemoveException.java
  54. +0 −2  src/org/jgroups/persistence/CannotRetrieveException.java
  55. +4 −1 src/org/jgroups/protocols/BSH.java
  56. +1 −1  src/org/jgroups/protocols/FlushRsp.java
  57. +2 −5 src/org/jgroups/protocols/JMS.java
  58. +2 −1  src/org/jgroups/protocols/STATS.java
  59. +2 −5 src/org/jgroups/protocols/WanPipeAddress.java
  60. +1 −3 src/org/jgroups/protocols/ring/TokenLostException.java
  61. +1 −1  src/org/jgroups/stack/Interval.java
  62. +2 −5 src/org/jgroups/stack/IpAddress.java
  63. +2 −5 src/org/jgroups/stack/LogicalAddress.java
  64. +9 −6 src/org/jgroups/stack/ProtocolObserver.java
  65. +1 −1  src/org/jgroups/util/Queue.java.concurrent
  66. +2 −4 src/org/jgroups/util/QueueClosedException.java
  67. +1 −1  src/org/jgroups/util/todo.txt
  68. +2 −2 tests/junit/org/jgroups/blocks/TotalTokenProtocolObserver.java
  69. +1 −3 tests/junit/org/jgroups/protocols/ENCRYPT14KeystoreTest.java
  70. +16 −115 tests/junit/org/jgroups/tests/ChannelTest.java
  71. +31 −13 tests/junit/org/jgroups/tests/ConnectTest.java
  72. +13 −13 tests/junit/org/jgroups/tests/Deadlock2Test.java
  73. +11 −19 tests/junit/org/jgroups/tests/JoinTest.java
  74. +4 −1 tests/junit/org/jgroups/tests/NakackTest.java
  75. +360 −321 tests/junit/org/jgroups/tests/StreamingStateTransferTest.java
  76. +1 −1  tests/other/org/jgroups/tests/ContinousThroughputTest.java
  77. +9 −4 tests/other/org/jgroups/tests/HashtableTest.java
  78. +12 −6 tests/other/org/jgroups/tests/MessageDispatcherTestAsync.java
  79. +10 −6 tests/other/org/jgroups/tests/SpeedTest.java
  80. +9 −5 tests/other/org/jgroups/tests/SpeedTest_NIO.java
View
13 .gitignore
@@ -0,0 +1,13 @@
+*~
+*.iws
+*.ipr
+*.iml
+.idea/
+.idea
+classes/
+build.properties
+dist/
+atlassian*
+keystore/
+tmp/
+bla*.java
View
109 EULA
@@ -1,109 +0,0 @@
-// $Id: EULA,v 1.1 2006/11/02 08:04:26 belaban Exp $
-
-LICENSE AGREEMENT
-JBOSS(r)
-
-This License Agreement governs the use of the Software Packages and any updates to the Software
-Packages, regardless of the delivery mechanism. Each Software Package is a collective work
-under U.S. Copyright Law. Subject to the following terms, Red Hat, Inc. ("Red Hat") grants to
-the user ("Client") a license to the applicable collective work(s) pursuant to the
-GNU Lesser General Public License v. 2.1 except for the following Software Packages:
-(a) JBoss Portal Forums and JBoss Transactions JTS, each of which is licensed pursuant to the
-GNU General Public License v.2;
-
-(b) JBoss Rules, which is licensed pursuant to the Apache License v.2.0;
-
-(c) an optional download for JBoss Cache for the Berkeley DB for Java database, which is licensed under the
-(open source) Sleepycat License (if Client does not wish to use the open source version of this database,
-it may purchase a license from Sleepycat Software);
-
-and (d) the BPEL extension for JBoss jBPM, which is licensed under the Common Public License v.1,
-and, pursuant to the OASIS BPEL4WS standard, requires parties wishing to redistribute to enter various
-royalty-free patent licenses.
-
-Each of the foregoing licenses is available at http://www.opensource.org/licenses/index.php.
-
-1. The Software. "Software Packages" refer to the various software modules that are created and made available
-for distribution by the JBoss.org open source community at http://www.jboss.org. Each of the Software Packages
-may be comprised of hundreds of software components. The end user license agreement for each component is located in
-the component's source code. With the exception of certain image files identified in Section 2 below,
-the license terms for the components permit Client to copy, modify, and redistribute the component,
-in both source code and binary code forms. This agreement does not limit Client's rights under,
-or grant Client rights that supersede, the license terms of any particular component.
-
-2. Intellectual Property Rights. The Software Packages are owned by Red Hat and others and are protected under copyright
-and other laws. Title to the Software Packages and any component, or to any copy, modification, or merged portion shall
-remain with the aforementioned, subject to the applicable license. The "JBoss" trademark, "Red Hat" trademark, the
-individual Software Package trademarks, and the "Shadowman" logo are registered trademarks of Red Hat and its affiliates
-in the U.S. and other countries. This agreement permits Client to distribute unmodified copies of the Software Packages
-using the Red Hat trademarks that Red Hat has inserted in the Software Packages on the condition that Client follows Red Hat's
-trademark guidelines for those trademarks located at http://www.redhat.com/about/corporate/trademark/. Client must abide by
-these trademark guidelines when distributing the Software Packages, regardless of whether the Software Packages have been modified.
-If Client modifies the Software Packages, then Client must replace all Red Hat trademarks and logos identified at
-http://www.jboss.com/company/logos, unless a separate agreement with Red Hat is executed or other permission granted.
-Merely deleting the files containing the Red Hat trademarks may corrupt the Software Packages.
-
-3. Limited Warranty. Except as specifically stated in this Paragraph 3 or a license for a particular
-component, to the maximum extent permitted under applicable law, the Software Packages and the
-components are provided and licensed "as is" without warranty of any kind, expressed or implied,
-including the implied warranties of merchantability, non-infringement or fitness for a particular purpose.
-Red Hat warrants that the media on which Software Packages may be furnished will be free from defects in
-materials and manufacture under normal use for a period of 30 days from the date of delivery to Client.
-Red Hat does not warrant that the functions contained in the Software Packages will meet Client's requirements
-or that the operation of the Software Packages will be entirely error free or appear precisely as described
-in the accompanying documentation. This warranty extends only to the party that purchases the Services
-pertaining to the Software Packages from Red Hat or a Red Hat authorized distributor.
-
-4. Limitation of Remedies and Liability. To the maximum extent permitted by applicable law, the remedies
-described below are accepted by Client as its only remedies. Red Hat's entire liability, and Client's
-exclusive remedies, shall be: If the Software media is defective, Client may return it within 30 days of
-delivery along with a copy of Client's payment receipt and Red Hat, at its option, will replace it or
-refund the money paid by Client for the Software. To the maximum extent permitted by applicable law,
-Red Hat or any Red Hat authorized dealer will not be liable to Client for any incidental or consequential
-damages, including lost profits or lost savings arising out of the use or inability to use the Software,
-even if Red Hat or such dealer has been advised of the possibility of such damages. In no event shall
-Red Hat's liability under this agreement exceed the amount that Client paid to Red Hat under this
-Agreement during the twelve months preceding the action.
-
-5. Export Control. As required by U.S. law, Client represents and warrants that it:
-(a) understands that the Software Packages are subject to export controls under the
-U.S. Commerce Department's Export Administration Regulations ("EAR");
-
-(b) is not located in a prohibited destination country under the EAR or U.S. sanctions regulations
-(currently Cuba, Iran, Iraq, Libya, North Korea, Sudan and Syria);
-
-(c) will not export, re-export, or transfer the Software Packages to any prohibited destination, entity,
-or individual without the necessary export license(s) or authorizations(s) from the U.S. Government;
-
-(d) will not use or transfer the Software Packages for use in any sensitive nuclear, chemical or
-biological weapons, or missile technology end-uses unless authorized by the U.S. Government by
-regulation or specific license;
-
-(e) understands and agrees that if it is in the United States and exports or transfers the Software
-Packages to eligible end users, it will, as required by EAR Section 740.17(e), submit semi-annual
-reports to the Commerce Department's Bureau of Industry & Security (BIS), which include the name and
-address (including country) of each transferee;
-
-and (f) understands that countries other than the United States may restrict the import, use, or
-export of encryption products and that it shall be solely responsible for compliance with any such
-import, use, or export restrictions.
-
-6. Third Party Programs. Red Hat may distribute third party software programs with the Software Packages
-that are not part of the Software Packages and which Client must install separately. These third party
-programs are subject to their own license terms. The license terms either accompany the programs or
-can be viewed at http://www.redhat.com/licenses/. If Client does not agree to abide by the applicable
-license terms for such programs, then Client may not install them. If Client wishes to install the programs
-on more than one system or transfer the programs to another party, then Client must contact the licensor
-of the programs.
-
-7. General. If any provision of this agreement is held to be unenforceable, that shall not affect the
-enforceability of the remaining provisions. This License Agreement shall be governed by the laws of the
-State of North Carolina and of the United States, without regard to any conflict of laws provisions,
-except that the United Nations Convention on the International Sale of Goods shall not apply.
-
-Copyright 2006 Red Hat, Inc. All rights reserved.
-"JBoss" and the JBoss logo are registered trademarks of Red Hat, Inc.
-All other trademarks are the property of their respective owners.
-
- Page 1 of 1 18 October 2006
-
View
2  conf/EncryptNoKeyStore.xml
@@ -12,7 +12,7 @@
<pbcast.NAKACK max_xmit_size="8192" use_mcast_xmit="false" gc_lag="50" retransmit_timeout="600,1200,2400,4800"/>
<UNICAST timeout="1200,2400,3600"/>
<pbcast.STABLE stability_delay="1000" desired_avg_gossip="20000" max_bytes="0"/>
- <FRAG frag_size="8192" up_thread="false"/>
+ <FRAG frag_size="8192" down_thread="false" up_thread="false"/>
<pbcast.GMS print_local_addr="true" join_timeout="3000" join_retry_timeout="2000" shun="true"/>
<ENCRYPT sym_init="56" sym_algorithm="Blowfish" asym_init="512" asym_algorithm="RSA"/>
<STATE_TRANSFER />
View
4 conf/auth_X509.xml
@@ -30,9 +30,9 @@
desired_avg_gossip="20000"
max_bytes="0"/>
<FRAG frag_size="8192"
-
+ down_thread="false"
up_thread="false"/>
- <VIEW_SYNC avg_send_interval="60000" up_thread="false" />
+ <VIEW_SYNC avg_send_interval="60000" down_thread="false" up_thread="false" />
<AUTH auth_class="org.jgroups.auth.X509Token1_5"
auth_value="chris"
keystore_path="C\:\Documents and Settings\spare1\.keystore"
View
4 conf/auth_fixedlist.xml
@@ -31,9 +31,9 @@
desired_avg_gossip="20000"
max_bytes="0"/>
<FRAG frag_size="8192"
-
+ down_thread="false"
up_thread="false"/>
- <VIEW_SYNC avg_send_interval="60000" up_thread="false" />
+ <VIEW_SYNC avg_send_interval="60000" down_thread="false" up_thread="false" />
<AUTH auth_class="org.jgroups.auth.FixedMembershipToken"
fixed_members_value="127.0.0.1/1010*127.0.0.1/1011"
fixed_members_seperator="*" />
View
4 conf/auth_md5.xml
@@ -30,9 +30,9 @@
desired_avg_gossip="20000"
max_bytes="0"/>
<FRAG frag_size="8192"
-
+ down_thread="false"
up_thread="false"/>
- <VIEW_SYNC avg_send_interval="60000" up_thread="false" />
+ <VIEW_SYNC avg_send_interval="60000" down_thread="false" up_thread="false" />
<AUTH auth_class="org.jgroups.auth.SimpleToken"
auth_value="chris"
token_hash="MD5"/>
View
4 conf/auth_simple.xml
@@ -21,9 +21,9 @@
desired_avg_gossip="20000"
max_bytes="0"/>
<FRAG frag_size="8192"
-
+ down_thread="false"
up_thread="false"/>
- <VIEW_SYNC avg_send_interval="60000" up_thread="false" />
+ <VIEW_SYNC avg_send_interval="60000" down_thread="false" up_thread="false" />
<AUTH auth_class="org.jgroups.auth.SimpleToken"
auth_value="chris"/>
<pbcast.GMS print_local_addr="true"
View
2  conf/bsh.xml
@@ -14,7 +14,7 @@
<org.jgroups.protocols.UNICAST timeout="1200,2400,3600"/>
<pbcast.STABLE stability_delay="1000"
desired_avg_gossip="20000" max_bytes="0"/>
- <FRAG frag_size="8192" up_thread="false"/>
+ <FRAG frag_size="8192" down_thread="false" up_thread="false"/>
<BSH />
<pbcast.GMS print_local_addr="true" join_timeout="3000" join_retry_timeout="2000" shun="true"/>
</config>
View
4 conf/causal.xml
@@ -6,11 +6,11 @@
<PING timeout="2000" num_initial_members="3"/>
<MERGE2 max_interval="10000" min_interval="5000"/>
<FD timeout="2000" max_tries="4"/>
-<VERIFY_SUSPECT timeout="1500" up_thread="false"/>
+<VERIFY_SUSPECT timeout="1500" down_thread="false" up_thread="false"/>
<pbcast.NAKACK max_xmit_size="8192" use_mcast_xmit="false" gc_lag="50" retransmit_timeout="600,1200,2400,4800"/>
<UNICAST timeout="1200,2400,3600"/>
<pbcast.STABLE stability_delay="1000" desired_avg_gossip="20000" max_bytes="0"/>
-<FRAG frag_size="8192" up_thread="false"/>
+<FRAG frag_size="8192" down_thread="false" up_thread="false"/>
<pbcast.GMS print_local_addr="true" join_timeout="3000" join_retry_timeout="2000" shun="true"/>
<CAUSAL />
</config>
View
4 conf/compress.xml
@@ -13,8 +13,8 @@
<pbcast.NAKACK max_xmit_size="8192" use_mcast_xmit="false" gc_lag="50" retransmit_timeout="600,1200,2400,4800"/>
<UNICAST timeout="1200,2400,3600"/>
<pbcast.STABLE stability_delay="1000" desired_avg_gossip="20000" max_bytes="0"/>
- <FRAG frag_size="8192" up_thread="false"/>
- <VIEW_SYNC avg_send_interval="60000" up_thread="false" />
+ <FRAG frag_size="8192" down_thread="false" up_thread="false"/>
+ <VIEW_SYNC avg_send_interval="60000" down_thread="false" up_thread="false" />
<pbcast.GMS print_local_addr="true" join_timeout="3000" join_retry_timeout="2000" shun="true"/>
<!-- min_size: the min size of a message payload (number of bytes) before compression kicks in -->
View
18 conf/discard.xml
@@ -2,7 +2,7 @@
<!--
Discards 10% of all outgoing packets
Author: Bela Ban
-Version: $Id: discard.xml,v 1.4 2006/11/17 13:39:14 belaban Exp $
+Version: $Id: discard.xml,v 1.3 2005/11/02 12:07:01 belaban Exp $
-->
<config>
<UDP
@@ -19,27 +19,27 @@ Version: $Id: discard.xml,v 1.4 2006/11/17 13:39:14 belaban Exp $
use_incoming_packet_handler="true"
use_outgoing_packet_handler="false"
ip_ttl="2"
- up_thread="false"
+ down_thread="false" up_thread="false"
enable_bundling="true"/>
<DISCARD down="0.1"/>
<PING timeout="2000"
- up_thread="false" num_initial_members="3"/>
+ down_thread="false" up_thread="false" num_initial_members="3"/>
<MERGE2 max_interval="10000"
min_interval="5000"/>
- <FD_SOCK up_thread="false"/>
+ <FD_SOCK down_thread="false" up_thread="false"/>
<pbcast.NAKACK max_xmit_size="60000"
use_mcast_xmit="false" gc_lag="50"
retransmit_timeout="20,300,600,1200,2400,4800"
- up_thread="false"
+ down_thread="false" up_thread="false"
discard_delivered_msgs="true"/>
<UNICAST timeout="300,600,1200,2400,3600"
- up_thread="false"/>
+ down_thread="false" up_thread="false"/>
<pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
- up_thread="false"
+ down_thread="false" up_thread="false"
max_bytes="500000"/>
<pbcast.GMS print_local_addr="true" join_timeout="3000"
- up_thread="false"
+ down_thread="false" up_thread="false"
join_retry_timeout="2000" shun="true"/>
- <FC max_credits="2000000" up_thread="false"
+ <FC max_credits="2000000" down_thread="false" up_thread="false"
min_threshold="0.20"/>
</config>
View
36 conf/encrypt-entire-message.xml
@@ -1,19 +1,19 @@
-<!-- ************ JGroups Protocol Stack Configuration ************** -->
-<!-- This encrypts the entire message, even UNICAST and NAKACK headers (to reveal sequence numbers).
- Note that ENCRYPT could be placed even lower, e.g. just above UDP -->
-
-<config>
- <UDP mcast_recv_buf_size="64000" mcast_send_buf_size="32000" mcast_port="45566" ucast_recv_buf_size="64000"
- use_incoming_packet_handler="false" mcast_addr="228.8.8.8" use_outgoing_packet_handler="false"
- loopback="true" ucast_send_buf_size="32000" ip_ttl="32"/>
- <PING timeout="2000" num_initial_members="3"/>
- <MERGE2 max_interval="10000" min_interval="5000"/>
- <FD timeout="2000" max_tries="3" shun="true"/>
- <VERIFY_SUSPECT timeout="1500"/>
- <ENCRYPT encrypt_entire_message="false" sym_init="128" sym_algorithm="AES/ECB/PKCS5Padding" asym_init="512" asym_algorithm="RSA"/>
- <pbcast.NAKACK max_xmit_size="8192" gc_lag="50" retransmit_timeout="600,1200,2400,4800"/>
- <UNICAST timeout="1200,2400,3600"/>
- <pbcast.STABLE stability_delay="1000" desired_avg_gossip="20000" max_bytes="0"/>
- <FRAG frag_size="8192" up_thread="false"/>
- <pbcast.GMS print_local_addr="true" join_timeout="3000" join_retry_timeout="2000" shun="true"/>
+<!-- ************ JGroups Protocol Stack Configuration ************** -->
+<!-- This encrypts the entire message, even UNICAST and NAKACK headers (to reveal sequence numbers).
+ Note that ENCRYPT could be placed even lower, e.g. just above UDP -->
+
+<config>
+ <UDP mcast_recv_buf_size="64000" mcast_send_buf_size="32000" mcast_port="45566" ucast_recv_buf_size="64000"
+ use_incoming_packet_handler="false" mcast_addr="228.8.8.8" use_outgoing_packet_handler="false"
+ loopback="true" ucast_send_buf_size="32000" ip_ttl="32"/>
+ <PING timeout="2000" num_initial_members="3"/>
+ <MERGE2 max_interval="10000" min_interval="5000"/>
+ <FD timeout="2000" max_tries="3" shun="true"/>
+ <VERIFY_SUSPECT timeout="1500"/>
+ <ENCRYPT encrypt_entire_message="false" sym_init="128" sym_algorithm="AES/ECB/PKCS5Padding" asym_init="512" asym_algorithm="RSA"/>
+ <pbcast.NAKACK max_xmit_size="8192" gc_lag="50" retransmit_timeout="600,1200,2400,4800"/>
+ <UNICAST timeout="1200,2400,3600"/>
+ <pbcast.STABLE stability_delay="1000" desired_avg_gossip="20000" max_bytes="0"/>
+ <FRAG frag_size="8192" down_thread="false" up_thread="false"/>
+ <pbcast.GMS print_local_addr="true" join_timeout="3000" join_retry_timeout="2000" shun="true"/>
</config>
View
2  conf/encrypt.xml
@@ -13,7 +13,7 @@
<pbcast.NAKACK max_xmit_size="8192" gc_lag="50" retransmit_timeout="600,1200,2400,4800"/>
<UNICAST timeout="1200,2400,3600"/>
<pbcast.STABLE stability_delay="1000" desired_avg_gossip="20000" max_bytes="0"/>
- <FRAG frag_size="8192" up_thread="false"/>
+ <FRAG frag_size="8192" down_thread="false" up_thread="false"/>
<ENCRYPT encrypt_entire_message="false" sym_init="128" sym_algorithm="AES/ECB/PKCS5Padding" asym_init="512" asym_algorithm="RSA"/>
<pbcast.GMS print_local_addr="true" join_timeout="3000" join_retry_timeout="2000" shun="true"/>
</config>
View
18 conf/jboss-service.xml
@@ -6,7 +6,7 @@
<!--
A bunch of JGroups channels which can be used by other services
Author: Bela Ban
- Version: $Id: jboss-service.xml,v 1.4 2006/11/17 13:39:14 belaban Exp $
+ Version: $Id: jboss-service.xml,v 1.3 2006/05/02 14:36:27 belaban Exp $
-->
<mbean code="org.jgroups.jmx.JChannel" name="jgroups:name=DemoChannel">
<attribute name="ObjectName">jgroups:name=DemoChannel</attribute>
@@ -28,22 +28,22 @@
ucast_send_buf_size="80000" ucast_recv_buf_size="150000"
loopback="false"/>
<PING timeout="2000" num_initial_members="3"
- up_thread="false" />
+ up_thread="false" down_thread="false"/>
<MERGE2 min_interval="10000" max_interval="20000"/>
- <FD shun="true" up_thread="true" />
+ <FD shun="true" up_thread="true" down_thread="true"/>
<VERIFY_SUSPECT timeout="1500"
- up_thread="false" />
+ up_thread="false" down_thread="false"/>
<pbcast.NAKACK gc_lag="50" retransmit_timeout="600,1200,2400,4800"
- max_xmit_size="8192" up_thread="false" />
+ max_xmit_size="8192" up_thread="false" down_thread="false"/>
<UNICAST timeout="600,1200,2400" window_size="100" min_threshold="10"
- />
+ down_thread="false"/>
<pbcast.STABLE desired_avg_gossip="20000"
- up_thread="false" />
+ up_thread="false" down_thread="false"/>
<FRAG frag_size="8192"
- up_thread="false"/>
+ down_thread="false" up_thread="false"/>
<pbcast.GMS join_timeout="5000" join_retry_timeout="2000"
shun="true" print_local_addr="true"/>
- <pbcast.STATE_TRANSFER up_thread="false" />
+ <pbcast.STATE_TRANSFER up_thread="false" down_thread="false"/>
</config>
</attribute>
</mbean>
View
8 conf/mping.xml
@@ -2,7 +2,7 @@
<!--
TCP-based stack with IP multicast-based discovery
-Version: $Id: mping.xml,v 1.4 2006/11/17 13:39:14 belaban Exp $
+Version: $Id: mping.xml,v 1.3 2005/11/23 12:25:31 belaban Exp $
Author: Bela Ban
-->
@@ -23,17 +23,17 @@ Author: Bela Ban
<FD timeout="2000"
max_tries="3"/>
<VERIFY_SUSPECT timeout="1500"
-
+ down_thread="false"
up_thread="false"/>
<pbcast.NAKACK gc_lag="50"
retransmit_timeout="600,1200,2400,4800"
max_xmit_size="60000"/>
<pbcast.STABLE stability_delay="1000"
desired_avg_gossip="20000"
-
+ down_thread="false"
max_bytes="0"
up_thread="false"/>
- <VIEW_SYNC avg_send_interval="60000" up_thread="false" />
+ <VIEW_SYNC avg_send_interval="60000" down_thread="false" up_thread="false" />
<pbcast.GMS print_local_addr="true"
join_timeout="5000"
join_retry_timeout="2000"
View
2  conf/pbcast.xml
@@ -12,6 +12,6 @@
<VERIFY_SUSPECT timeout="1500"/>
<pbcast.PBCAST desired_avg_gossip="8000" max_queue="20" gc_lag="30" mcast_gossip="true"/>
<UNICAST timeout="1200,2400,3000"/>
- <FRAG frag_size="8192" up_thread="false"/>
+ <FRAG frag_size="8192" down_thread="false" up_thread="false"/>
<pbcast.GMS print_local_addr="true" join_timeout="3000" join_retry_timeout="2000" shun="true"/>
</config>
View
28 conf/pulltheplug.xml
@@ -17,31 +17,31 @@
use_incoming_packet_handler="true"
use_outgoing_packet_handler="false"
ip_ttl="2"
- up_thread="false"
+ down_thread="false" up_thread="false"
enable_bundling="true"/>
<PING timeout="2000"
- up_thread="false" num_initial_members="3"/>
+ down_thread="false" up_thread="false" num_initial_members="3"/>
<MERGE2 max_interval="100000"
- up_thread="false" min_interval="20000"/>
- <FD_SOCK up_thread="false"/>
- <FD timeout="2000" max_tries="3" up_thread="false" />
- <VERIFY_SUSPECT timeout="1500" up_thread="false"/>
+ down_thread="false" up_thread="false" min_interval="20000"/>
+ <FD_SOCK down_thread="false" up_thread="false"/>
+ <FD timeout="2000" max_tries="3" down_thread="false" up_thread="false" />
+ <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="100,200,300,600,1200,2400,4800"
- up_thread="false"
+ down_thread="false" up_thread="false"
discard_delivered_msgs="true"/>
<UNICAST timeout="300,600,1200,2400,3600"
- up_thread="false"/>
+ down_thread="false" up_thread="false"/>
<pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
- up_thread="false"
+ down_thread="false" up_thread="false"
max_bytes="400000"/>
- <VIEW_SYNC avg_send_interval="60000" up_thread="false" />
+ <VIEW_SYNC avg_send_interval="60000" down_thread="false" up_thread="false" />
<pbcast.GMS print_local_addr="true" join_timeout="3000"
- up_thread="false"
+ down_thread="false" up_thread="false"
join_retry_timeout="2000" shun="true"/>
- <FC max_credits="2000000" up_thread="false"
+ <FC max_credits="2000000" down_thread="false" up_thread="false"
min_threshold="0.10"/>
- <FRAG2 frag_size="60000" up_thread="false"/>
- <pbcast.STATE_TRANSFER up_thread="false"/>
+ <FRAG2 frag_size="60000" down_thread="false" up_thread="false"/>
+ <pbcast.STATE_TRANSFER down_thread="false" up_thread="false"/>
</config>
View
32 conf/sequencer.xml
@@ -1,7 +1,7 @@
<!--
Total order protocol stack using the SEQUENCER protocol
-Version: $Id: sequencer.xml,v 1.4 2006/11/17 13:39:14 belaban Exp $
+Version: $Id: sequencer.xml,v 1.3 2006/10/31 06:19:56 belaban Exp $
-->
<config>
<UDP bind_addr="192.168.5.1"
@@ -19,32 +19,32 @@ Version: $Id: sequencer.xml,v 1.4 2006/11/17 13:39:14 belaban Exp $
use_incoming_packet_handler="true"
use_outgoing_packet_handler="false"
ip_ttl="2"
- up_thread="false"
+ down_thread="false" up_thread="false"
enable_bundling="true"/>
<PING timeout="2000"
- up_thread="false" num_initial_members="3"/>
+ down_thread="false" up_thread="false" num_initial_members="3"/>
<MERGE2 max_interval="10000"
- up_thread="false" min_interval="5000"/>
- <FD_SOCK up_thread="false"/>
- <FD timeout="10000" max_tries="5" up_thread="false" shun="true"/>
- <!--VERIFY_SUSPECT timeout="1500" /-->
+ down_thread="false" up_thread="false" min_interval="5000"/>
+ <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"/-->
<pbcast.NAKACK max_xmit_size="60000"
use_mcast_xmit="false" gc_lag="0"
retransmit_timeout="100,200,300,600,1200,2400,4800"
- up_thread="false"
+ down_thread="false" up_thread="false"
discard_delivered_msgs="true"/>
<UNICAST timeout="300,600,1200,2400,3600"
- up_thread="false"/>
+ down_thread="false" up_thread="false"/>
<pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
- up_thread="false"
+ down_thread="false" up_thread="false"
max_bytes="400000"/>
- <VIEW_SYNC avg_send_interval="60000" up_thread="false" />
+ <VIEW_SYNC avg_send_interval="60000" down_thread="false" up_thread="false" />
<pbcast.GMS print_local_addr="true" join_timeout="3000"
- up_thread="false"
+ down_thread="false" up_thread="false"
join_retry_timeout="2000" shun="true" handle_concurrent_startup="true" />
- <SEQUENCER up_thread="false" />
- <FC max_credits="2000000" up_thread="false"
+ <SEQUENCER down_thread="false" up_thread="false" />
+ <FC max_credits="2000000" down_thread="false" up_thread="false"
min_threshold="0.10"/>
- <!-- FRAG2 frag_size="60000" up_thread="true"/ -->
- <!-- pbcast.STATE_TRANSFER up_thread="false"/-->
+ <!-- FRAG2 frag_size="60000" down_thread="false" up_thread="true"/ -->
+ <!-- pbcast.STATE_TRANSFER down_thread="false" up_thread="false"/-->
</config>
View
6 conf/smack.xml
@@ -11,7 +11,7 @@
will be retransmitted). Compared to smack.xml, this stack uses TUNNEL as transport-->
<config>
<UDP mcast_port="45566" use_incoming_packet_handler="false" mcast_addr="228.8.8.8" use_outgoing_packet_handler="false" ip_ttl="32"/>
- <FD_SIMPLE timeout="3000" up_thread="false" interval="2000" max_missed_hbs="3"/>
- <UNICAST timeout="1200,2400,3000" up_thread="false" use_gms="false"/>
- <SMACK max_xmits="20" timeout="1000,1500,2000" up_thread="false"/>
+ <FD_SIMPLE timeout="3000" down_thread="false" up_thread="false" interval="2000" max_missed_hbs="3"/>
+ <UNICAST timeout="1200,2400,3000" down_thread="false" up_thread="false" use_gms="false"/>
+ <SMACK max_xmits="20" timeout="1000,1500,2000" down_thread="false" up_thread="false"/>
</config>
View
6 conf/smack_tunnel.xml
@@ -6,7 +6,7 @@
<config>
<TUNNEL router_port="12001" router_host="localhost"/>
- <FD_SIMPLE timeout="3000" up_thread="false" interval="2000" max_missed_hbs="3"/>
- <UNICAST timeout="1200,2400,3000" up_thread="false" use_gms="false"/>
- <SMACK max_xmits="20" timeout="1000,1500,2000" up_thread="false"/>
+ <FD_SIMPLE timeout="3000" down_thread="false" up_thread="false" interval="2000" max_missed_hbs="3"/>
+ <UNICAST timeout="1200,2400,3000" down_thread="false" up_thread="false" use_gms="false"/>
+ <SMACK max_xmits="20" timeout="1000,1500,2000" down_thread="false" up_thread="false"/>
</config>
View
28 conf/streaming-state-transfer.xml
@@ -16,31 +16,31 @@
use_incoming_packet_handler="true"
use_outgoing_packet_handler="false"
ip_ttl="2"
- up_thread="false"
+ down_thread="false" up_thread="false"
enable_bundling="false"/>
<PING timeout="2000"
- up_thread="false" num_initial_members="3"/>
+ down_thread="false" up_thread="false" num_initial_members="3"/>
<MERGE2 max_interval="100000"
- up_thread="false" min_interval="20000"/>
- <FD_SOCK up_thread="false"/>
- <FD timeout="2000" max_tries="3" up_thread="false" shun="true"/>
- <VERIFY_SUSPECT timeout="1500" up_thread="false"/>
+ down_thread="false" up_thread="false" min_interval="20000"/>
+ <FD_SOCK down_thread="false" up_thread="false"/>
+ <FD timeout="2000" max_tries="3" 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="100,200,300,600,1200,2400,4800"
- up_thread="false"
+ down_thread="false" up_thread="false"
discard_delivered_msgs="true"/>
<UNICAST timeout="300,600,1200,2400,3600"
- up_thread="false"/>
+ down_thread="false" up_thread="false"/>
<pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
- up_thread="false"
+ down_thread="false" up_thread="false"
max_bytes="400000"/>
<pbcast.GMS print_local_addr="true" join_timeout="10000"
- up_thread="false"
+ down_thread="false" up_thread="false"
join_retry_timeout="2000" shun="true"/>
- <FC max_credits="2000000" up_thread="false"
+ <FC max_credits="2000000" down_thread="false" up_thread="false"
min_threshold="0.10"/>
- <FRAG2 frag_size="60000" up_thread="false"/>
- <pbcast.STREAMING_STATE_TRANSFER up_thread="false" use_reading_thread="true"/>
- <pbcast.FLUSH up_thread="false"/>
+ <FRAG2 frag_size="60000" down_thread="false" up_thread="false"/>
+ <pbcast.STREAMING_STATE_TRANSFER down_thread="false" up_thread="false" use_reading_thread="true"/>
+ <pbcast.FLUSH down_thread="false" up_thread="false"/>
</config>
View
30 conf/tcp-nio.xml
@@ -7,7 +7,7 @@
We currently require use_incoming_packet_handler=true (release 2.4 will support use_incoming_packet_handler=false
due to threadless stack support)
author: Bela Ban
- version: $Id: tcp-nio.xml,v 1.2 2006/11/17 13:39:15 belaban Exp $
+ version: $Id: tcp-nio.xml,v 1.1 2006/09/22 12:48:14 belaban Exp $
-->
<config>
<TCP_NIO
@@ -19,7 +19,7 @@
max_bundle_timeout="30"
use_incoming_packet_handler="true"
use_outgoing_packet_handler="false"
- up_thread="false"
+ down_thread="false" up_thread="false"
enable_bundling="true"
start_port="7800"
use_send_queues="false"
@@ -32,32 +32,32 @@
processor_queueSize="100"
processor_keepAliveTime="-1"/>
<TCPPING timeout="3000"
- up_thread="false"
+ down_thread="false" up_thread="false"
initial_hosts="${jgroups.tcpping.initial_hosts:localhost[7800],localhost[7801]}"
port_range="1"
num_initial_members="3"/>
<MERGE2 max_interval="100000"
- up_thread="false" min_interval="20000"/>
- <FD_SOCK up_thread="false"/>
- <FD timeout="10000" max_tries="5" up_thread="false" shun="true"/>
- <VERIFY_SUSPECT timeout="1500" up_thread="false"/>
+ 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"
- up_thread="false"
+ down_thread="false" up_thread="false"
discard_delivered_msgs="true"/>
<pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
- up_thread="false"
+ down_thread="false" up_thread="false"
max_bytes="400000"/>
<pbcast.GMS print_local_addr="true" join_timeout="3000"
- up_thread="false"
+ down_thread="false" up_thread="false"
join_retry_timeout="2000" shun="true"
view_bundling="true"/>
- <FC max_credits="2000000" up_thread="false"
+ <FC max_credits="2000000" down_thread="false" up_thread="false"
min_threshold="0.10"/>
- <FRAG2 frag_size="60000" up_thread="false"/>
- <pbcast.STREAMING_STATE_TRANSFER up_thread="false"
+ <FRAG2 frag_size="60000" down_thread="false" up_thread="false"/>
+ <pbcast.STREAMING_STATE_TRANSFER down_thread="false" up_thread="false"
use_flush="true" use_reading_thread="true"/>
- <!-- pbcast.STATE_TRANSFER up_thread="false" use_flush="false"/ -->
- <pbcast.FLUSH up_thread="false"/>
+ <!-- pbcast.STATE_TRANSFER down_thread="false" up_thread="false" use_flush="false"/ -->
+ <pbcast.FLUSH down_thread="false" up_thread="false"/>
</config>
View
63 conf/tcp_nio.xml
@@ -1,63 +0,0 @@
-
-<!--
- TCP based stack, with flow control and message bundling. This is usually used when IP
- multicasting cannot be used in a network, e.g. because it is disabled (routers discard multicast).
- Note that TCP.bind_addr and TCPPING.initial_hosts should be set, possibly via system properties, e.g.
- -Djgroups.bind_addr=192.168.5.2 and -Djgroups.tcpping.initial_hosts=192.168.5.2[7800]".
- We currently require use_incoming_packet_handler=true (release 2.4 will support use_incoming_packet_handler=false
- due to threadless stack support)
- author: Bela Ban
- version: $Id: tcp_nio.xml,v 1.9 2006/09/22 12:46:54 belaban Exp $
--->
-<config>
- <TCP_NIO
- recv_buf_size="20000000"
- 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"
- down_thread="false" up_thread="false"
- enable_bundling="true"
- start_port="7800"
- use_send_queues="false"
- sock_conn_timeout="300" skip_suspected_members="true"
- reader_threads="8"
- writer_threads="8"
- processor_threads="8"
- processor_minThreads="8"
- processor_maxThreads="8"
- processor_queueSize="100"
- processor_keepAliveTime="-1"/>
- <TCPPING timeout="3000"
- down_thread="false" up_thread="false"
- initial_hosts="${jgroups.tcpping.initial_hosts:localhost[7800],localhost[7801]}"
- port_range="1"
- 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"/>
- <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"
- down_thread="false" up_thread="false"
- join_retry_timeout="2000" shun="true"
- view_bundling="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"/>
- <pbcast.STREAMING_STATE_TRANSFER down_thread="false" up_thread="false"
- use_flush="true" use_reading_thread="true"/>
- <!-- pbcast.STATE_TRANSFER down_thread="false" up_thread="false" use_flush="false"/ -->
- <pbcast.FLUSH down_thread="false" up_thread="false"/>
-</config>
View
6 conf/tcpgossip.xml
@@ -8,9 +8,9 @@
<TCP start_port="7800" bind_addr="localhost" loopback="true"/>
<TCPGOSSIP timeout="3000" initial_hosts="localhost[12000]" num_initial_members="3"/>
<FD timeout="2000" max_tries="4"/>
- <VERIFY_SUSPECT timeout="1500" up_thread="false"/>
+ <VERIFY_SUSPECT timeout="1500" down_thread="false" up_thread="false"/>
<pbcast.NAKACK gc_lag="100" retransmit_timeout="600,1200,2400,4800"/>
- <pbcast.STABLE stability_delay="1000" desired_avg_gossip="20000" max_bytes="0" up_thread="false"/>
- <VIEW_SYNC avg_send_interval="60000" up_thread="false" />
+ <pbcast.STABLE stability_delay="1000" desired_avg_gossip="20000" down_thread="false" max_bytes="0" up_thread="false"/>
+ <VIEW_SYNC avg_send_interval="60000" down_thread="false" up_thread="false" />
<pbcast.GMS print_local_addr="true" join_timeout="5000" join_retry_timeout="2000" shun="true"/>
</config>
View
2  conf/total-token.xml
@@ -11,7 +11,7 @@
<FD_SOCK />
<VERIFY_SUSPECT timeout="1500"/>
<UNICAST timeout="1200,2000,2500"/>
- <FRAG frag_size="8096" up_thread="false"/>
+ <FRAG frag_size="8096" down_thread="false" up_thread="false"/>
<TOTAL_TOKEN unblock_sending="10" block_sending="50"/>
<pbcast.GMS print_local_addr="true" join_timeout="3000" join_retry_timeout="2000" shun="true"/>
<STATE_TRANSFER />
View
30 conf/total.xml
@@ -1,7 +1,7 @@
<!--
Example of a protocol stack based on udp, but with total order (sequencer-based)
-Version: $Id: total.xml,v 1.4 2006/11/17 13:39:15 belaban Exp $
+Version: $Id: total.xml,v 1.3 2006/09/22 12:36:28 belaban Exp $
-->
<config>
<UDP bind_addr="192.168.5.1"
@@ -19,32 +19,32 @@ Version: $Id: total.xml,v 1.4 2006/11/17 13:39:15 belaban Exp $
use_incoming_packet_handler="true"
use_outgoing_packet_handler="false"
ip_ttl="2"
- up_thread="false"
+ down_thread="false" up_thread="false"
enable_bundling="true"/>
<PING timeout="2000"
- up_thread="false" num_initial_members="3"/>
+ down_thread="false" up_thread="false" num_initial_members="3"/>
<!-- MERGE2 max_interval="100000"
- up_thread="false" min_interval="20000"/ -->
- <FD_SOCK up_thread="false"/>
- <!--VERIFY_SUSPECT timeout="1500" /-->
+ down_thread="false" up_thread="false" min_interval="20000"/ -->
+ <FD_SOCK 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"
- up_thread="false"
+ down_thread="false" up_thread="false"
discard_delivered_msgs="true"/>
<UNICAST timeout="300,600,1200,2400,3600"
- up_thread="false"/>
+ down_thread="false" up_thread="false"/>
<pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
- up_thread="false"
+ down_thread="false" up_thread="false"
max_bytes="400000"/>
- <VIEW_SYNC avg_send_interval="60000" up_thread="false" />
+ <VIEW_SYNC avg_send_interval="60000" down_thread="false" up_thread="false" />
<pbcast.GMS print_local_addr="true" join_timeout="3000"
- up_thread="false"
+ down_thread="false" up_thread="false"
join_retry_timeout="2000" shun="true"/>
- <TOTAL up_thread="false" />
- <!-- FRAG2 frag_size="60000" up_thread="true"/ -->
- <!-- pbcast.STATE_TRANSFER up_thread="false"/ -->
- <FC max_credits="2000000" up_thread="false"
+ <TOTAL up_thread="false" down_thread="false" />
+ <!-- FRAG2 frag_size="60000" down_thread="false" up_thread="true"/ -->
+ <!-- pbcast.STATE_TRANSFER down_thread="false" up_thread="false"/ -->
+ <FC max_credits="2000000" down_thread="false" up_thread="false"
min_threshold="0.10"/>
</config>
View
34 conf/udp.xml
@@ -3,7 +3,7 @@
Default stack using IP multicasting. It is similar to the "udp"
stack in stacks.xml, but doesn't use streaming state transfer and flushing
author: Bela Ban
- version: $Id: udp.xml,v 1.5 2006/11/17 13:39:15 belaban Exp $
+ version: $Id: udp.xml,v 1.4 2006/10/27 13:36:55 belaban Exp $
-->
<config>
@@ -22,35 +22,35 @@
use_incoming_packet_handler="true"
use_outgoing_packet_handler="false"
ip_ttl="${jgroups.udp.ip_ttl:2}"
- up_thread="false"
+ down_thread="false" up_thread="false"
enable_bundling="true"/>
<PING timeout="2000"
- up_thread="false" num_initial_members="3"/>
+ down_thread="false" up_thread="false" num_initial_members="3"/>
<MERGE2 max_interval="30000"
- up_thread="false" min_interval="10000"/>
- <FD_SOCK up_thread="false"/>
- <FD timeout="10000" max_tries="5" up_thread="false" shun="true"/>
- <VERIFY_SUSPECT timeout="1500" up_thread="false"/>
+ down_thread="false" up_thread="false" min_interval="10000"/>
+ <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"
- up_thread="false"
+ down_thread="false" up_thread="false"
discard_delivered_msgs="true"/>
<UNICAST timeout="300,600,1200,2400,3600"
- up_thread="false"/>
+ down_thread="false" up_thread="false"/>
<pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
- up_thread="false"
+ down_thread="false" up_thread="false"
max_bytes="400000"/>
- <VIEW_SYNC avg_send_interval="60000" up_thread="false" />
+ <VIEW_SYNC avg_send_interval="60000" down_thread="false" up_thread="false" />
<pbcast.GMS print_local_addr="true" join_timeout="3000"
- up_thread="false"
+ down_thread="false" up_thread="false"
join_retry_timeout="2000" shun="false"
view_bundling="true"/>
- <FC max_credits="2000000" up_thread="false"
+ <FC max_credits="2000000" down_thread="false" up_thread="false"
min_threshold="0.10"/>
- <FRAG2 frag_size="60000" up_thread="false"/>
- <!--pbcast.STREAMING_STATE_TRANSFER up_thread="false"
+ <FRAG2 frag_size="60000" down_thread="false" up_thread="false"/>
+ <!--pbcast.STREAMING_STATE_TRANSFER down_thread="false" up_thread="false"
use_flush="true" use_reading_thread="true"/-->
- <pbcast.STATE_TRANSFER up_thread="false"/>
- <!-- pbcast.FLUSH up_thread="false"/-->
+ <pbcast.STATE_TRANSFER down_thread="false" up_thread="false"/>
+ <!-- pbcast.FLUSH down_thread="false" up_thread="false"/-->
</config>
View
2  conf/vsync.xml
@@ -14,7 +14,7 @@
<VERIFY_SUSPECT timeout="1500"/>
<NAKACK />
<UNICAST timeout="1200,2000,2500"/>
- <FRAG frag_size="8192" up_thread="false"/>
+ <FRAG frag_size="8192" down_thread="false" up_thread="false"/>
<FLUSH />
<GMS />
<VIEW_ENFORCER />
View
2  doc/CONFIGURATIONS
@@ -1,4 +1,4 @@
-## $Id: CONFIGURATIONS,v 1.1 2003/09/09 01:24:04 belaban Exp $
+## $Id: CONFIGURATIONS,v 1.1.1.1 2003/09/09 01:24:04 belaban Exp $
Frequently used protocol stack specifications
View
4 doc/RELEASE_INSTRUCTIONS
@@ -1,4 +1,4 @@
-// $Id: RELEASE_INSTRUCTIONS,v 1.8 2006/11/01 09:28:33 belaban Exp $
+// $Id: RELEASE_INSTRUCTIONS,v 1.7 2006/11/01 08:11:50 belaban Exp $
Things to do before packaging a release
---------------------------------------
@@ -13,7 +13,7 @@
- Create PDF and HTML documentation: ./build.sh docs, upload to web site
- Create javadoc: ./build.sh javadoc and upload to web site (may have
to use JDK 1.4 to create javadoc)
-- Add new release to repository.jboss.com
+
View
86 doc/design/ThreadlessStack.txt
@@ -1,86 +0,0 @@
-
-
-Threadless stack
-================
-
-Author: Bela Ban
-Version: $Id: ThreadlessStack.txt,v 1.5 2006/11/17 17:25:26 belaban Exp $
-JIRAs:
-http://jira.jboss.com/jira/browse/JGRP-180 (harden stack),
-http://jira.jboss.com/jira/browse/JGRP-181 (threadless stack),
-http://jira.jboss.com/jira/browse/JGRP-205 (out-of-band messages)
-
-
-Threadless stack
-----------------
-
-We will get rid of all queues in the protocols, and their associated threads. This is the same as setting all
-down_thread and up_thread vars to false, but now it is the default.
-
-On the receiver's side there will be 2 thread pools (Executors): one for regular messages and one for OOB messages.
-Whenever an OOB message is encountered, the receiver thread (which called receive()) will call Executor.execute() on the
-OOB threadpool with the message as argument, and if it is a regular message it will call Executor.execute() on the
-regular thread pool.
-
-The type of Executor is chosen by the user (through configuration): DirectExecutor means we will *not* use a separate
-thread, PooledExecutor uses a real thread pool plus a queue in front.
-
-Both thread pools have their own instance of SchedulingPolicy (whose main method is handle(msg)). The purpose of the
-SchedulingPolicy is to schedule handling of messages with respect to others. For example, we could have a sender-based
-policy, which uses queues and places all messages from the same sender into the same queue. Combined with a message
-priority, after placing the message into the correct queue, the processing thread could then pick the message with the
-highest priority first. Other policies: longest queue first, round robin, random, FIFO etc.
-
-
-
-Out-of-band messages (OOB)
---------------------------
-
-Could be the same as priorities, e.g. prio=0 is always OOB
-
-
-Adding priorities to messages
------------------------------
-
-
-Reliable events
----------------
-
-
-
-
-Implementation
-==============
-
-
-Buffer pool
------------
-Unicast and multicast thread have access to a buffer pool with a fixed size. Before every receive(),
-they get a buffer from the pool (blocking until they get a free one). The buffer is locked and passed into the
-queue of the first thread pool. (Ideally, there are as many buffers as max threads in that pool).
-The alloted thread from the thread pool then unmarshalls the buffer into a Message and returns the buffer to the
-buffer pool, releasing the lock so it can be used for a new packet.
-
-Advantage: we don't need to *copy* the packet (unlike in the old solution where we copied the byte buffer into the
-incoming queue)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
View
6 src/org/jgroups/ChannelClosedException.java
@@ -1,4 +1,4 @@
-// $Id: ChannelClosedException.java,v 1.4 2006/11/13 17:42:11 bstansberry Exp $
+// $Id: ChannelClosedException.java,v 1.3 2005/07/17 11:38:05 chrislott Exp $
package org.jgroups;
@@ -7,9 +7,7 @@
*/
public class ChannelClosedException extends ChannelException {
- private static final long serialVersionUID = -5172168752255182905L;
-
- public ChannelClosedException() {
+ public ChannelClosedException() {
super();
}
View
6 src/org/jgroups/ChannelException.java
@@ -1,4 +1,4 @@
-// $Id: ChannelException.java,v 1.7 2006/11/13 17:42:11 bstansberry Exp $
+// $Id: ChannelException.java,v 1.6 2005/07/17 11:38:05 chrislott Exp $
package org.jgroups;
@@ -8,9 +8,7 @@
*/
public class ChannelException extends Exception {
- private static final long serialVersionUID = 6041194633384856098L;
-
- public ChannelException() {
+ public ChannelException() {
super();
}
View
2  src/org/jgroups/ChannelListener.java
@@ -1,4 +1,4 @@
-// $Id: ChannelListener.java,v 1.1 2003/09/09 01:24:07 belaban Exp $
+// $Id: ChannelListener.java,v 1.1.1.1 2003/09/09 01:24:07 belaban Exp $
package org.jgroups;
View
6 src/org/jgroups/ChannelNotConnectedException.java
@@ -1,4 +1,4 @@
-// $Id: ChannelNotConnectedException.java,v 1.3 2006/11/13 17:42:11 bstansberry Exp $
+// $Id: ChannelNotConnectedException.java,v 1.2 2005/07/17 11:38:05 chrislott Exp $
package org.jgroups;
@@ -7,9 +7,7 @@
*/
public class ChannelNotConnectedException extends ChannelException {
- private static final long serialVersionUID = -6701630538465783064L;
-
- public ChannelNotConnectedException() {
+ public ChannelNotConnectedException() {
}
public ChannelNotConnectedException(String reason) {
View
6 src/org/jgroups/blocks/LockMultiLockedException.java
@@ -6,13 +6,11 @@
* by multiple DistributedLockManagers. This can happen after a merge for example.
*
* @author Robert Schaffar-Taurok (robert@fusion.at)
- * @version $Id: LockMultiLockedException.java,v 1.3 2006/11/13 17:42:10 bstansberry Exp $
+ * @version $Id: LockMultiLockedException.java,v 1.2 2005/07/17 11:36:40 chrislott Exp $
*/
public class LockMultiLockedException extends Exception {
- private static final long serialVersionUID = 3719208228960070835L;
-
- public LockMultiLockedException() {
+ public LockMultiLockedException() {
super();
}
View
4 src/org/jgroups/blocks/LockNotGrantedException.java
@@ -8,9 +8,7 @@
*/
public class LockNotGrantedException extends Exception {
- private static final long serialVersionUID = 4074824788210185433L;
-
- public LockNotGrantedException() {
+ public LockNotGrantedException() {
super();
}
View
4 src/org/jgroups/blocks/LockNotReleasedException.java
@@ -8,9 +8,7 @@
*/
public class LockNotReleasedException extends Exception {
- private static final long serialVersionUID = -350403929687059570L;
-
- public LockNotReleasedException() {
+ public LockNotReleasedException() {
super();
}
View
7 src/org/jgroups/blocks/LockingException.java
@@ -1,4 +1,4 @@
-// $Id: LockingException.java,v 1.2 2006/11/13 17:42:10 bstansberry Exp $
+// $Id: LockingException.java,v 1.1.1.1 2003/09/09 01:24:08 belaban Exp $
package org.jgroups.blocks;
@@ -7,10 +7,7 @@
public class LockingException extends Exception {
-
- private static final long serialVersionUID = -712594616520011007L;
-
- Map failed_lockers=null; // list of members who failed acquiring locks (keys=Address, values=exception string)
+ Map failed_lockers=null; // list of members who failed acquiring locks (keys=Address, values=exception string)
public LockingException(String msg) {
super(msg);
View
2  src/org/jgroups/blocks/RequestHandler.java
@@ -1,4 +1,4 @@
-// $Id: RequestHandler.java,v 1.1 2003/09/09 01:24:08 belaban Exp $
+// $Id: RequestHandler.java,v 1.1.1.1 2003/09/09 01:24:08 belaban Exp $
package org.jgroups.blocks;
View
6 src/org/jgroups/blocks/UpdateException.java
@@ -1,4 +1,4 @@
-// $Id: UpdateException.java,v 1.2 2006/11/13 17:42:10 bstansberry Exp $
+// $Id: UpdateException.java,v 1.1.1.1 2003/09/09 01:24:08 belaban Exp $
package org.jgroups.blocks;
@@ -7,9 +7,7 @@
public class UpdateException extends Exception {
- private static final long serialVersionUID = -4196360091623991749L;
-
- public UpdateException(String msg) {
+ public UpdateException(String msg) {
super(msg);
}
View
4 src/org/jgroups/blocks/VoteException.java
@@ -10,7 +10,5 @@
*/
public class VoteException extends ChannelException {
- private static final long serialVersionUID = -878345689312038489L;
-
- public VoteException(String msg) { super(msg); }
+ public VoteException(String msg) { super(msg); }
}
View
2  src/org/jgroups/conf/ProtocolStackConfigurator.java
@@ -1,4 +1,4 @@
-// $Id: ProtocolStackConfigurator.java,v 1.1 2003/09/09 01:24:08 belaban Exp $
+// $Id: ProtocolStackConfigurator.java,v 1.1.1.1 2003/09/09 01:24:08 belaban Exp $
package org.jgroups.conf;
View
31 src/org/jgroups/debug/Debugger.java
@@ -1,4 +1,4 @@
-// $Id: Debugger.java,v 1.7 2006/11/17 13:39:18 belaban Exp $
+// $Id: Debugger.java,v 1.6 2006/01/23 13:03:09 belaban Exp $
package org.jgroups.debug;
@@ -27,6 +27,7 @@
DefaultTableModel table_model;
JScrollPane scroll_pane;
public static final Font helvetica_12=new Font("Helvetica", Font.PLAIN, 12);
+ public boolean cummulative=false; // shows added up/down events instead of up/down queue_size
@@ -46,6 +47,19 @@ public Debugger(JChannel channel, String name) {
this.channel=channel;
}
+ public Debugger(JChannel channel, boolean cummulative) {
+ super("Debugger Window");
+ this.channel=channel;
+ this.cummulative=cummulative;
+ }
+
+
+ public Debugger(JChannel channel, boolean cummulative, String name) {
+ super(name);
+ this.channel=channel;
+ this.cummulative=cummulative;
+ }
+
public void setChannel(JChannel channel) {
this.channel=channel;
@@ -73,11 +87,18 @@ public void start() {
for(int i=0; i < prots.size(); i++) {
prot=(Protocol)prots.elementAt(i);
- view=new ProtocolView(prot, table_model, i);
+ view=new ProtocolView(prot, table_model, i, cummulative);
prot.setObserver(view);
- table_model.insertRow(i, new Object[]{String.valueOf((i + 1)),
- prot.getName(), String.valueOf(prot.getUpQueue().size()),
- "0", "0", "0"});
+ table_model.insertRow(i, new Object[]{"" + (i + 1),
+ prot.getName(), prot.getUpQueue().size() + "",
+ prot.getDownQueue().size() + "", "0", "0"});
+
+ //prot_view=CreateProtocolView(prot.getName());
+ //if(prot_view != null) {
+ //JFrame f=new JFrame("New View for " + prot.GetName());
+ //f.getContentPane().add(prot_view);
+ //f.show();
+ //}
}
}
View
2  src/org/jgroups/debug/ProtocolSpecificView.java
@@ -1,4 +1,4 @@
-// $Id: ProtocolSpecificView.java,v 1.1 2003/09/09 01:24:09 belaban Exp $
+// $Id: ProtocolSpecificView.java,v 1.1.1.1 2003/09/09 01:24:09 belaban Exp $
package org.jgroups.debug;
View
70 src/org/jgroups/debug/ProtocolView.java
@@ -1,71 +1,83 @@
-// $Id: ProtocolView.java,v 1.3 2006/11/17 13:39:18 belaban Exp $
+// $Id: ProtocolView.java,v 1.2 2004/09/23 16:29:16 belaban Exp $
package org.jgroups.debug;
-import org.jgroups.Event;
+import javax.swing.*;
+import javax.swing.table.DefaultTableModel;
import org.jgroups.stack.Protocol;
import org.jgroups.stack.ProtocolObserver;
+import org.jgroups.Event;
-import javax.swing.*;
-import javax.swing.table.DefaultTableModel;
/**
* Graphical view of a protocol instance
- * @author Bela Ban, created July 22 2000
+ * @author Bela Ban, created July 22 2000
*/
public class ProtocolView implements ProtocolObserver {
- final DefaultTableModel model;
- int my_index=-1;
- Protocol prot=null;
- String prot_name=null;
- final JButton down_label=new JButton("0");
+ final DefaultTableModel model;
+ int my_index=-1;
+ Protocol prot=null;
+ String prot_name=null;
+ final JButton down_label=new JButton("0");
final JButton up_label=new JButton("0");
- long tot_up=0, tot_down=0;
+ boolean cummulative=false;
+ long tot_up=0, tot_down=0;
+
public ProtocolView(Protocol p, DefaultTableModel model, int my_index) {
- prot=p;
- prot_name=p.getName();
- this.model=model;
- this.my_index=my_index;
+ prot=p; prot_name=p.getName(); this.model=model; this.my_index=my_index;
}
+ public ProtocolView(Protocol p, DefaultTableModel model, int my_index, boolean cummulative) {
+ prot=p; prot_name=p.getName(); this.model=model; this.my_index=my_index; this.cummulative=cummulative;
+ }
+
+
+
/* ----------------------- ProtocolObserver interface ----------------------- */
public void setProtocol(Protocol prot) {
- this.prot=prot;
+ this.prot=prot;
}
-
+
public boolean up(Event evt, int num_evts) {
- tot_up++;
- model.setValueAt(String.valueOf(tot_up), my_index, 2);
- return true;
+ tot_up++;
+ if(cummulative)
+ model.setValueAt("" + tot_up, my_index, 2);
+ else
+ model.setValueAt("" + num_evts, my_index, 2);
+ return true;
}
public boolean passUp(Event evt) {
- return true;
+ return true;
}
-
-
- public boolean down(Event evt) {
- tot_down++;
- model.setValueAt(String.valueOf(tot_down), my_index, 3);
- return true;
+
+
+ public boolean down(Event evt, int num_evts) {
+ tot_down++;
+ if(cummulative)
+ model.setValueAt("" + tot_down, my_index, 3);
+ else
+ model.setValueAt("" + num_evts, my_index, 3);
+ return true;
}
public boolean passDown(Event evt) {
- return true;
+ return true;
}
/* ------------------- End of ProtocolObserver interface ---------------------- */
+
public String toString() {
- return prot != null? prot.getName() : "<n|a>";
+ return prot != null ? prot.getName() : "<n|a>";
}
View
2  src/org/jgroups/debug/QUEUEView.java
@@ -1,4 +1,4 @@
-// $Id: QUEUEView.java,v 1.1 2003/09/09 01:24:09 belaban Exp $
+// $Id: QUEUEView.java,v 1.1.1.1 2003/09/09 01:24:09 belaban Exp $
package org.jgroups.debug;
View
16 src/org/jgroups/demos/Draw.java
@@ -1,4 +1,4 @@
-// $Id: Draw.java,v 1.34 2006/11/17 13:39:18 belaban Exp $
+// $Id: Draw.java,v 1.33 2006/10/27 16:25:58 belaban Exp $
package org.jgroups.demos;
@@ -29,6 +29,7 @@
private int member_size=1;
Debugger debugger=null;
final boolean first=true;
+ final boolean cummulative=true;
private JFrame mainFrame=null;
private JPanel sub_panel=null;
private DrawPanel panel=null;
@@ -41,7 +42,7 @@
boolean jmx;
- public Draw(String props, boolean debug, boolean no_channel, boolean jmx) throws Exception {
+ public Draw(String props, boolean debug, boolean cummulative, boolean no_channel, boolean jmx) throws Exception {
this.no_channel=no_channel;
this.jmx=jmx;
if(no_channel)
@@ -50,7 +51,7 @@ public Draw(String props, boolean debug, boolean no_channel, boolean jmx) throws
channel=new JChannel(props);
// channel.setOpt(Channel.BLOCK, Boolean.TRUE);
if(debug) {
- debugger=new Debugger((JChannel)channel);
+ debugger=new Debugger((JChannel)channel, cummulative);
debugger.start();
}
channel.setOpt(Channel.AUTO_RECONNECT, Boolean.TRUE);
@@ -80,6 +81,7 @@ public static void main(String[] args) {
Draw draw=null;
String props=null;
boolean debug=false;
+ boolean cummulative=false;
boolean no_channel=false;
boolean jmx=false;
String group_name=null;
@@ -93,6 +95,10 @@ public static void main(String[] args) {
debug=true;
continue;
}
+ if("-cummulative".equals(args[i])) {
+ cummulative=true;
+ continue;
+ }
if("-props".equals(args[i])) {
props=args[++i];
continue;
@@ -139,7 +145,7 @@ public static void main(String[] args) {
try {
- draw=new Draw(props, debug, no_channel, jmx);
+ draw=new Draw(props, debug, cummulative, no_channel, jmx);
if(group_name != null)
draw.setGroupName(group_name);
draw.go();
@@ -152,7 +158,7 @@ public static void main(String[] args) {
static void help() {
- System.out.println("\nDraw [-help] [-debug] [-no_channel] [-props <protocol stack definition>]" +
+ System.out.println("\nDraw [-help] [-debug] [-cummulative] [-no_channel] [-props <protocol stack definition>]" +
" [-groupname <name>]");
System.out.println("-debug: brings up a visual debugger");
System.out.println("-no_channel: doesn't use JGroups at all, any drawing will be relected on the " +
View
3  src/org/jgroups/demos/Draw2Channels.java
@@ -1,4 +1,4 @@
-// $Id: Draw2Channels.java,v 1.11 2006/11/17 13:39:18 belaban Exp $
+// $Id: Draw2Channels.java,v 1.10 2006/10/09 11:35:19 belaban Exp $
package org.jgroups.demos;
@@ -29,6 +29,7 @@
private Receiver data_receiver=null;
private int member_size=1;
final boolean first=true;
+ final boolean cummulative=true;
private JFrame mainFrame=null;
private JPanel sub_panel=null;
private DrawPanel panel=null;
View
2  src/org/jgroups/persistence/CannotConnectException.java
@@ -11,8 +11,6 @@
public class CannotConnectException extends Exception
{
- private static final long serialVersionUID = 7472528586067210747L;
-
/**
* @param t
* @param reason implementor-specified runtime reason
View
2  src/org/jgroups/persistence/CannotCreateSchemaException.java
@@ -11,8 +11,6 @@
public class CannotCreateSchemaException extends Exception
{
- private static final long serialVersionUID = 291582260022140141L;
-
/**
* @param t
* @param reason implementor-specified runtime reason
View
2  src/org/jgroups/persistence/CannotPersistException.java
@@ -10,8 +10,6 @@
public class CannotPersistException extends Exception
{
- private static final long serialVersionUID = -5157400778265186170L;
-
/**
* @param t
* @param reason implementor-specified runtime reason
View
4 src/org/jgroups/persistence/CannotRemoveException.java
@@ -10,9 +10,7 @@
public class CannotRemoveException extends Exception
{
- private static final long serialVersionUID = -5777024088921236116L;
-
- /**
+ /**
* @param t
* @param reason implementor-specified runtime reason
*/
View
2  src/org/jgroups/persistence/CannotRetrieveException.java
@@ -10,8 +10,6 @@
public class CannotRetrieveException extends Exception
{
- private static final long serialVersionUID = -2523227229540681597L;
-
/**
* @param t
* @param reason implementor-specified runtime reason
View
5 src/org/jgroups/protocols/BSH.java
@@ -1,4 +1,4 @@
-// $Id: BSH.java,v 1.13 2006/11/17 13:39:19 belaban Exp $
+// $Id: BSH.java,v 1.12 2005/08/08 12:45:41 belaban Exp $
package org.jgroups.protocols;
@@ -60,6 +60,9 @@ public void destroy() {
public void startUpHandler() {
}
+ /** We have no down handler thread */
+ public void startDownHandler() {
+ }
public void up(Event evt) {
Header h;
View
2  src/org/jgroups/protocols/FlushRsp.java
@@ -1,4 +1,4 @@
-// $Id: FlushRsp.java,v 1.1 2003/09/09 01:24:10 belaban Exp $
+// $Id: FlushRsp.java,v 1.1.1.1 2003/09/09 01:24:10 belaban Exp $
package org.jgroups.protocols;
View
7 src/org/jgroups/protocols/JMS.java
@@ -1,4 +1,4 @@
-// $Id: JMS.java,v 1.15 2006/11/13 17:50:14 bstansberry Exp $
+// $Id: JMS.java,v 1.14 2006/06/23 09:01:24 belaban Exp $
package org.jgroups.protocols;
@@ -523,10 +523,7 @@ protected String generateLocalAddress() throws java.net.UnknownHostException {
* Simple {@link Address} representing the JMS node ID or JMS topic group.
*/
public static class JMSAddress implements Address {
-
- private static final long serialVersionUID = -2311584492745452246L;
-
- private String address;
+ private String address;
private boolean isMCast;
View
3  src/org/jgroups/protocols/STATS.java
@@ -11,7 +11,7 @@
/**
* Provides various stats
* @author Bela Ban
- * @version $Id: STATS.java,v 1.4 2006/11/17 13:39:19 belaban Exp $
+ * @version $Id: STATS.java,v 1.3 2006/01/14 14:00:38 belaban Exp $
*/
public class STATS extends Protocol {
long sent_msgs, sent_bytes, sent_ucasts, sent_mcasts, received_ucasts, received_mcasts;
@@ -33,6 +33,7 @@ public String getName() {
public boolean setProperties(Properties props) {
super.setProperties(props);
+ down_thread=false; // never use a down thread
up_thread=false; // never use an up thread
if(props.size() > 0) {
View
7 src/org/jgroups/protocols/WanPipeAddress.java
@@ -1,4 +1,4 @@
-// $Id: WanPipeAddress.java,v 1.10 2006/11/13 17:50:13 bstansberry Exp $
+// $Id: WanPipeAddress.java,v 1.9 2005/08/08 12:45:46 belaban Exp $
package org.jgroups.protocols;
@@ -14,10 +14,7 @@
* Logical address for a WAN pipe (logical link)
*/
public class WanPipeAddress implements Address {
-
- private static final long serialVersionUID = -7341271304287013960L;
-
- String logical_name=null;
+ String logical_name=null;
static final Log log=LogFactory.getLog(WanPipeAddress.class);
View
4 src/org/jgroups/protocols/ring/TokenLostException.java
@@ -1,4 +1,4 @@
-//$Id: TokenLostException.java,v 1.4 2006/11/13 17:42:11 bstansberry Exp $
+//$Id: TokenLostException.java,v 1.3 2004/09/15 17:40:59 belaban Exp $
package org.jgroups.protocols.ring;
@@ -9,8 +9,6 @@
public class TokenLostException extends InterruptedIOException
{
- private static final long serialVersionUID = 5113234317099931071L;
-
public static final int UNDEFINED = 0;
public static final int WHILE_RECEIVING = 1;
public static final int WHILE_SENDING =2;
View
2  src/org/jgroups/stack/Interval.java
@@ -1,4 +1,4 @@
-// $Id: Interval.java,v 1.1 2003/09/09 01:24:12 belaban Exp $
+// $Id: Interval.java,v 1.1.1.1 2003/09/09 01:24:12 belaban Exp $
package org.jgroups.stack;
View
7 src/org/jgroups/stack/IpAddress.java
@@ -1,4 +1,4 @@
-// $Id: IpAddress.java,v 1.37 2006/11/13 17:50:16 bstansberry Exp $
+// $Id: IpAddress.java,v 1.36 2006/09/11 13:57:57 belaban Exp $
package org.jgroups.stack;
@@ -19,10 +19,7 @@
* @author Bela Ban
*/
public class IpAddress implements Address {
-
- private static final long serialVersionUID = 2592301708270771474L;
-
- private InetAddress ip_addr=null;
+ private InetAddress ip_addr=null;
private int port=0;
private byte[] additional_data;
protected static final Log log=LogFactory.getLog(IpAddress.class);
View
7 src/org/jgroups/stack/LogicalAddress.java
@@ -1,4 +1,4 @@
-// $Id: LogicalAddress.java,v 1.10 2006/11/13 17:50:19 bstansberry Exp $
+// $Id: LogicalAddress.java,v 1.9 2005/07/17 11:34:20 chrislott Exp $
package org.jgroups.stack;
@@ -30,10 +30,7 @@
* @author Bela Ban, Dec 23 2003
*/
public class LogicalAddress implements Address {
-
- private static final long serialVersionUID = 1264428178481495773L;
-
- protected static int count=1;
+ protected static int count=1;
protected String host=null;
protected long timestamp=0;
protected int id=0;
View
15 src/org/jgroups/stack/ProtocolObserver.java
@@ -1,4 +1,4 @@
-// $Id: ProtocolObserver.java,v 1.2 2006/11/17 13:39:20 belaban Exp $
+// $Id: ProtocolObserver.java,v 1.1.1.1 2003/09/09 01:24:12 belaban Exp $
package org.jgroups.stack;
@@ -55,12 +55,15 @@
to block indefinitely, and only process single events at a time, e.g. for single-stepping.
For example, upon clicking on a button "Step" in the Debugger GUI, the method would unblock
(waiting on a mutex, GUI thread notifies mutex).
- @param evt The event to be processed by the protocol. <em>This is not a copy, so changes
- to the event will be seen by the protocol !</em>
- @return boolean If true the event is processed, else it will be discarded (not be given
- to the protocol layer to process).
+ @param evt The event to be processed by the protocol. <em>This is not a copy, so changes
+ to the event will be seen by the protocol !</em>
+ @param num_evts The number of events currently in the down-queue (including this event).
+ This number may increase while we're in the callback as the down-handler thread in the
+ upper protocol layer puts new events into the down queue.
+ @return boolean If true the event is processed, else it will be discarded (not be given
+ to the protocol layer to process).
*/
- boolean down(Event evt);
+ boolean down(Event evt, int num_evts);
View
2  src/org/jgroups/util/Queue.java.concurrent
@@ -1,4 +1,4 @@
-// $Id: Queue.java.concurrent,v 1.1 2003/09/09 01:24:12 belaban Exp $
+// $Id: Queue.java.concurrent,v 1.1.1.1 2003/09/09 01:24:12 belaban Exp $
package org.jgroups.util;
View
6 src/org/jgroups/util/QueueClosedException.java
@@ -1,13 +1,11 @@
-// $Id: QueueClosedException.java,v 1.3 2006/11/13 17:42:11 bstansberry Exp $
+// $Id: QueueClosedException.java,v 1.2 2006/07/13 07:16:14 belaban Exp $
package org.jgroups.util;
public class QueueClosedException extends Exception {
- private static final long serialVersionUID = -7575787375592873964L;
-
- public QueueClosedException() {
+ public QueueClosedException() {
}