Permalink
Browse files

removed unneeded cruft

  • Loading branch information...
1 parent d00de88 commit f8fe0f311dbf5cac3c96db4536444b2c7c2eac09 Bela Ban committed Apr 13, 2011
View
@@ -1,19 +0,0 @@
-
-
-<!-- ************ JGroups Protocol Stack Configuration ************** -->
-<!-- generated by XmlConfigurator on Mon Apr 26 11:26:12 PDT 2004 -->
-<!-- input file: smack.old.xml -->
-
-<!--Stack based on SMACK and minimal threads. SMACK is a
- simple reliable multicast transport based on positive
- acks (sender sends message, receiver sends ack, if
- sender doesn't receive ack within timeout, message
- will be retransmitted). Compared to smack.xml, this stack uses TUNNEL as transport-->
-<config xmlns="urn:org:jgroups"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:org:jgroups http://www.jgroups.org/schema/JGroups-3.0.xsd">
- <UDP mcast_port="45566" ip_ttl="32"/>
- <FD_SIMPLE timeout="3000" interval="2000" max_missed_hbs="3"/>
- <UNICAST timeout="1200,2400,3000" />
- <SMACK max_xmits="20" timeout="1000,1500,2000" />
-</config>
@@ -8,7 +8,6 @@
import org.jgroups.annotations.GuardedBy;
import org.jgroups.logging.Log;
import org.jgroups.logging.LogFactory;
-import org.jgroups.util.Command;
import org.jgroups.util.FutureListener;
import org.jgroups.util.NotifyingFuture;
@@ -25,23 +24,7 @@
*
* @author Bela Ban
*/
-public abstract class Request implements RspCollector, Command, NotifyingFuture {
- /** return only first response *//*
- public static final int GET_FIRST=1;
-
- *//** return all responses *//*
- public static final int GET_ALL=2;
-
- *//** return majority (of all non-faulty members) *//*
- public static final int GET_MAJORITY=3;
-
- *//** return majority (of all members, may block) *//*
- public static final int GET_ABS_MAJORITY=4;
-
- *//** return no response (async call) *//*
- public static final int GET_NONE=6;*/
-
-
+public abstract class Request implements RspCollector, NotifyingFuture {
protected static final Log log=LogFactory.getLog(Request.class);
/** To generate unique request IDs (see getRequestId()) */
@@ -4,6 +4,7 @@
import org.jgroups.*;
import org.jgroups.annotations.Experimental;
import org.jgroups.annotations.Property;
+import org.jgroups.annotations.Unsupported;
import org.jgroups.stack.Protocol;
import org.jgroups.util.Util;
@@ -18,7 +19,7 @@
* This protocol has not yet been completed and is experimental at best !
* @author Bela Ban
*/
-@Experimental
+@Experimental @Unsupported
public class HTOTAL extends Protocol {
Address coord=null;
Address neighbor=null; // to whom do we forward the message (member to the right, or null if we're at the tail)
@@ -1,94 +0,0 @@
-
-package org.jgroups.protocols;
-
-
-import java.net.InetAddress;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-
-import org.jgroups.Address;
-import org.jgroups.Event;
-import org.jgroups.Message;
-import org.jgroups.PhysicalAddress;
-import org.jgroups.stack.IpAddress;
-import org.jgroups.util.Util;
-
-
-/**
- Makes copies of outgoing messages, swaps sender and receiver and sends the message back up the stack.
- */
-public class LOOPBACK extends TP {
- private String group_addr=null;
- private final PhysicalAddress physical_addr=new IpAddress(12345);
-
- public LOOPBACK() {
- }
-
- public boolean supportsMulticasting() {
- return false;
- }
-
- public String toString() {
- return "LOOPBACK(local address: " + local_addr + ')';
- }
-
- public void sendMulticast(byte[] data, int offset, int length) throws Exception {
- }
-
- public void sendUnicast(PhysicalAddress dest, byte[] data, int offset, int length) throws Exception {
- }
-
- public String getInfo() {
- return null;
- }
-
- protected PhysicalAddress getPhysicalAddress() {
- return physical_addr;
- }
-
- /*------------------------------ Protocol interface ------------------------------ */
-
-
-
- /**
- * Caller by the layer above this layer. Usually we just put this Message
- * into the send queue and let one or more worker threads handle it. A worker thread
- * then removes the Message from the send queue, performs a conversion and adds the
- * modified Message to the send queue of the layer below it, by calling Down).
- */
- public Object down(Event evt) {
- if(log.isTraceEnabled())
- log.trace("event is " + evt + ", group_addr=" + group_addr +
- ", time is " + System.currentTimeMillis() + ", hdrs: " + Util.printEvent(evt));
-
- switch(evt.getType()) {
-
- case Event.MSG:
- Message msg=(Message)evt.getArg();
- Message rsp=msg.copy();
- if(rsp.getSrc() == null)
- rsp.setSrc(local_addr);
-
- //dest_addr=msg.getDest();
- //rsp.setDest(local_addr);
- //rsp.setSrc(dest_addr != null ? dest_addr : local_addr);
- up(new Event(Event.MSG, rsp));
- break;
-
- case Event.CONNECT:
- case Event.CONNECT_WITH_STATE_TRANSFER:
- case Event.CONNECT_USE_FLUSH:
- case Event.CONNECT_WITH_STATE_TRANSFER_USE_FLUSH:
- group_addr=(String)evt.getArg();
- break;
- }
- return null;
- }
-
-
-
- /*--------------------------- End of Protocol interface -------------------------- */
-
-
-}
@@ -2,6 +2,7 @@
import org.jgroups.Event;
import org.jgroups.Message;
+import org.jgroups.annotations.Experimental;
import org.jgroups.annotations.Property;
import org.jgroups.annotations.Unsupported;
import org.jgroups.stack.Protocol;
@@ -20,7 +21,7 @@
* @author Bela Ban
*
*/
-@Unsupported
+@Experimental
public class SHUFFLE extends Protocol {
protected TimeScheduler timer=null;
protected final List<Message> up_msgs=new LinkedList<Message>();
Oops, something went wrong.

0 comments on commit f8fe0f3

Please sign in to comment.