JGroups

User: belaban 
  Date: 06/07/11 05:37:52

  Modified:    src/org/jgroups/mux Multiplexer.java
  Log:
  first impl of service state (http://jira.jboss.com/jira/browse/JGRP-247)
  
  Revision  Changes    Path
  1.15      +244 -8    JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- Multiplexer.java	3 Jul 2006 12:58:07 -0000	1.14
  +++ Multiplexer.java	11 Jul 2006 12:37:52 -0000	1.15
  @@ -2,6 +2,7 @@
   
   import org.jgroups.*;
   import org.jgroups.util.Util;
  +import org.jgroups.util.Promise;
   import org.jgroups.stack.StateTransferInfo;
   import org.apache.commons.logging.LogFactory;
   import org.apache.commons.logging.Log;
  @@ -14,7 +15,7 @@
    * message is removed and the MuxChannel corresponding to the header's service ID is retrieved from the map,
    * and MuxChannel.up() is called with the message.
    * @author Bela Ban
  - * @version $Id: Multiplexer.java,v 1.14 2006/07/03 12:58:07 belaban Exp $
  + * @version $Id: Multiplexer.java,v 1.15 2006/07/11 12:37:52 belaban Exp $
    */
   public class Multiplexer implements UpHandler {
       /** Map<String,MuxChannel>. Maintains the mapping between service IDs and their associated MuxChannels */
  @@ -23,11 +24,22 @@
       static final Log log=LogFactory.getLog(Multiplexer.class);
       static final String SEPARATOR="::";
       static final short SEPARATOR_LEN=(short)SEPARATOR.length();
  -    static final String LIST_SEPARATOR=";";
  +    //static final String LIST_SEPARATOR=";";
  +    static final String NAME="MUX";
  +
  +    /** Cluster view */
  +    View view=null;
   
       /** Map<String,Boolean>. Map of service IDs and booleans that determine whether getState() has already been called */
       private final Map state_transfer_listeners=new HashMap();
   
  +    /** Map<String,List<Address>>. A map of services as keys and lists of hosts as values */
  +    private final Map service_state=new HashMap();
  +
  +    /** Used to wait on service state information */
  +    private final Promise service_state_promise=new Promise();
  +
  +
   
   
       public Multiplexer() {
  @@ -120,6 +132,64 @@
       }
   
   
  +    /**
  +     * Fetches the map of services and hosts from the coordinator (Multiplexer). No-op if we are the coordinator
  +     */
  +    public void fetchServiceInformation() throws Exception {
  +        while(true) {
  +            Address coord=getCoordinator(), local_addr=channel != null? channel.getLocalAddress() : null;
  +            boolean is_coord=coord != null && local_addr != null && local_addr.equals(coord);
  +            if(is_coord) {
  +                if(log.isTraceEnabled())
  +                    log.trace("I'm coordinator, will not fetch service state information");
  +                break;
  +            }
  +
  +            ServiceInfo si=new ServiceInfo(ServiceInfo.STATE_REQ, null, null, null);
  +            MuxHeader hdr=new MuxHeader(si);
  +            Message state_req=new Message(coord, null, null);
  +            state_req.putHeader(NAME, hdr);
  +            service_state_promise.reset();
  +            channel.send(state_req);
  +
  +            try {
  +                byte[] state=(byte[])service_state_promise.getResultWithTimeout(2000);
  +                if(state != null) {
  +                    Map new_state=(Map)Util.objectFromByteBuffer(state);
  +                    synchronized(service_state) {
  +                        service_state.clear();
  +                        service_state.putAll(new_state);
  +                    }
  +                    if(log.isTraceEnabled())
  +                        log.trace("service state was set successfully (" + service_state.size() + " entries");
  +                }
  +                else {
  +                    if(log.isWarnEnabled())
  +                        log.warn("received service state was null");
  +                }
  +                break;
  +            }
  +            catch(TimeoutException e) {
  +                if(log.isTraceEnabled())
  +                    log.trace("timed out waiting for service state from " + coord + ", retrying");
  +            }
  +        }
  +    }
  +
  +
  +
  +    public void sendServiceUpMessage(String service, Address host) throws Exception {
  +        sendServiceMessage(ServiceInfo.SERVICE_UP, service, host);
  +    }
  +
  +
  +    public void sendServiceDownMessage(String service, Address addr) throws Exception {
  +        sendServiceMessage(ServiceInfo.SERVICE_DOWN, service, addr);
  +    }
  +
  +
  +
  +
   
       public void up(Event evt) {
           // remove header and dispatch to correct MuxChannel
  @@ -128,14 +198,26 @@
           switch(evt.getType()) {
               case Event.MSG:
                   Message msg=(Message)evt.getArg();
  -                hdr=(MuxHeader)msg.getHeader("MUX");
  +                hdr=(MuxHeader)msg.getHeader(NAME);
                   if(hdr == null) {
                       log.error("MuxHeader not present - discarding message " + msg);
                       return;
                   }
  +
  +                if(hdr.info != null) { // it is a service state request - not a default multiplex request
  +                    try {
  +                        handleServiceStateRequest(hdr.info, msg.getSrc());
  +                    }
  +                    catch(Exception e) {
  +                        if(log.isErrorEnabled())
  +                            log.error("failure in handling service state request", e);
  +                    }
  +                    break;
  +                }
  +
                   MuxChannel mux_ch=(MuxChannel)services.get(hdr.id);
                   if(mux_ch == null) {
  -                    log.error("didn't find a service for id=" + hdr.id + " discarding messgage " + msg);
  +                    log.warn("service " + hdr.id + " not currently running, discarding messgage " + msg);
                       return;
                   }
                   if(log.isTraceEnabled())
  @@ -144,7 +226,13 @@
                   break;
   
               case Event.VIEW_CHANGE:
  -                passToAllMuxChannels(evt);
  +                view=(View)evt.getArg();
  +
  +                if(view instanceof MergeView) {
  +                    // handle merges here
  +                }
  +
  +                // passToAllMuxChannels(evt);
                   break;
   
               case Event.SUSPECT:
  @@ -169,16 +257,19 @@
   
   
       public Channel createMuxChannel(JChannelFactory f, String id, String stack_name) throws Exception {
  +        MuxChannel ch;
           synchronized(services) {
               if(services.containsKey(id))
                   throw new Exception("service ID \"" + id + "\" is already registered, cannot register duplicate ID");
  -            MuxChannel ch=new MuxChannel(f, channel, id, stack_name, this);
  +            ch=new MuxChannel(f, channel, id, stack_name, this);
               services.put(id, ch);
  -            return ch;
           }
  +        return ch;
       }
   
   
  +
  +
       private void passToAllMuxChannels(Event evt) {
           for(Iterator it=services.values().iterator(); it.hasNext();) {
               MuxChannel ch=(MuxChannel)it.next();
  @@ -194,7 +285,7 @@
   
   
   
  -    /** Closes the underlying JChannel is all MuxChannels have been disconnected */
  +    /** Closes the underlying JChannel if all MuxChannels have been disconnected */
       public void disconnect() {
           MuxChannel mux_ch;
           boolean all_disconnected=true;
  @@ -310,6 +401,43 @@
       }*/
   
   
  +    private Address getLocalAddress() {
  +        if(channel != null)
  +            return channel.getLocalAddress();
  +        return null;
  +    }
  +
  +    private Address getCoordinator() {
  +        if(channel != null) {
  +            View v=channel.getView();
  +            if(v != null) {
  +                Vector members=v.getMembers();
  +                if(members != null && members.size() > 0) {
  +                    return (Address)members.firstElement();
  +                }
  +            }
  +        }
  +        return null;
  +    }
  +
  +    private void sendServiceMessage(byte type, String service, Address host) throws Exception {
  +        if(host == null)
  +            host=getLocalAddress();
  +        if(host == null) {
  +            if(log.isWarnEnabled()) {
  +                log.warn("local_addr is null, cannot send ServiceInfo." + ServiceInfo.typeToString(type) + " message");
  +            }
  +            return;
  +        }
  +
  +        ServiceInfo si=new ServiceInfo(type, service, host, null);
  +        MuxHeader hdr=new MuxHeader(si);
  +        Message service_msg=new Message();
  +        service_msg.putHeader(NAME, hdr);
  +        channel.send(service_msg);
  +    }
  +
  +
       private void handleStateRequest(Event evt) {
           StateTransferInfo info=(StateTransferInfo)evt.getArg();
           String id=info.state_id;
  @@ -377,6 +505,113 @@
           }
       }
   
  +    private void handleServiceStateRequest(ServiceInfo info, Address sender) throws Exception {
  +        switch(info.type) {
  +            case ServiceInfo.STATE_REQ:
  +                byte[] state;
  +                synchronized(service_state) {
  +                    state=Util.objectToByteBuffer(service_state);
  +                }
  +                ServiceInfo si=new ServiceInfo(ServiceInfo.STATE_RSP, null, null, state);
  +                MuxHeader hdr=new MuxHeader(si);
  +                Message state_rsp=new Message(sender);
  +                state_rsp.putHeader(NAME, hdr);
  +                channel.send(state_rsp);
  +                break;
  +            case ServiceInfo.STATE_RSP:
  +                service_state_promise.setResult(info.state);
  +                break;
  +            case ServiceInfo.SERVICE_UP:
  +                handleServiceUp(info.service, info.host);
  +                break;
  +            case ServiceInfo.SERVICE_DOWN:
  +                handleServiceDown(info.service, info.host);
  +                break;
  +            default:
  +                if(log.isErrorEnabled())
  +                    log.error("service request type " + info.type + " not known");
  +                break;
  +        }
  +    }
  +
  +
  +    private void handleServiceDown(String service, Address host) {
  +        List    hosts, hosts_copy;
  +        boolean removed=false;
  +
  +        synchronized(service_state) {
  +            hosts=(List)service_state.get(service);
  +            if(hosts == null)
  +                return;
  +            removed=hosts.remove(host);
  +            hosts_copy=new ArrayList(hosts); // make a copy so we don't modify hosts in generateServiceView()
  +        }
  +
  +        if(removed) {
  +            View service_view=generateServiceView(hosts_copy);
  +            if(service_view != null) {
  +                MuxChannel ch=(MuxChannel)services.get(service);
  +                if(ch != null) {
  +                    Event view_evt=new Event(Event.VIEW_CHANGE, service_view);
  +                    ch.up(view_evt);
  +                }
  +                else {
  +                    if(log.isWarnEnabled())
  +                        log.warn("didn't find service " + service + ", cannot dispatch service view " + service_view);
  +                }
  +            }
  +        }
  +
  +        Address local_addr=getLocalAddress();
  +        if(local_addr != null && host != null && host.equals(local_addr))
  +            unregister(service);
  +    }
  +
  +    private void handleServiceUp(String service, Address host) {
  +        List    hosts, hosts_copy;
  +        boolean added=false;
  +
  +        synchronized(service_state) {
  +            hosts=(List)service_state.get(service);
  +            if(hosts == null) {
  +                hosts=new ArrayList();
  +                service_state.put(service,  hosts);
  +            }
  +            if(!hosts.contains(host)) {
  +                hosts.add(host);
  +                added=true;
  +            }
  +            hosts_copy=new ArrayList(hosts); // make a copy so we don't modify hosts in generateServiceView()
  +        }
  +
  +        if(added) {
  +            View service_view=generateServiceView(hosts_copy);
  +            if(service_view != null) {
  +                MuxChannel ch=(MuxChannel)services.get(service);
  +                if(ch != null) {
  +                    Event view_evt=new Event(Event.VIEW_CHANGE, service_view);
  +                    ch.up(view_evt);
  +                }
  +                else {
  +                    if(log.isWarnEnabled())
  +                        log.warn("didn't find service " + service + ", cannot dispatch service view " + service_view);
  +                }
  +            }
  +        }
  +    }
  +
  +    /**
  +     * Create a copy of view which contains only members which are present in hosts. Call viewAccepted() on the MuxChannel
  +     * which corresponds with service. If no members are removed or added from/to view, this is a no-op.
  +     * @param hosts List<Address>
  +     * @return the servicd view (a modified copy of the real view), or null if the view was not modified
  +     */
  +    private View generateServiceView(List hosts) {
  +        View copy=(View)view.clone();
  +        Vector members=copy.getMembers();
  +        members.retainAll(hosts);
  +        return copy;
  +    }
   
   
       /** Tell the underlying channel to start the flush protocol, this will be handled by FLUSH */
  @@ -390,4 +625,5 @@
       }
   
   
  +
   }

User: belaban 
  Date: 06/07/12 07:35:54

  Modified:    src/org/jgroups/mux Multiplexer.java
  Log:
  getting there
  
  Revision  Changes    Path
  1.16      +50 -13    JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- Multiplexer.java	11 Jul 2006 12:37:52 -0000	1.15
  +++ Multiplexer.java	12 Jul 2006 14:35:53 -0000	1.16
  @@ -15,7 +15,7 @@
    * message is removed and the MuxChannel corresponding to the header's service ID is retrieved from the map,
    * and MuxChannel.up() is called with the message.
    * @author Bela Ban
  - * @version $Id: Multiplexer.java,v 1.15 2006/07/11 12:37:52 belaban Exp $
  + * @version $Id: Multiplexer.java,v 1.16 2006/07/12 14:35:53 belaban Exp $
    */
   public class Multiplexer implements UpHandler {
       /** Map<String,MuxChannel>. Maintains the mapping between service IDs and their associated MuxChannels */
  @@ -30,6 +30,8 @@
       /** Cluster view */
       View view=null;
   
  +    Address local_addr=null;
  +
       /** Map<String,Boolean>. Map of service IDs and booleans that determine whether getState() has already been called */
       private final Map state_transfer_listeners=new HashMap();
   
  @@ -63,6 +65,17 @@
           return services != null? services.keySet() : null;
       }
   
  +    /** Returns a copy of the current view <em>minus</em> the nodes on which service service_id is <em>not</em> running
  +     *
  +     * @param service_id
  +     * @return The service view
  +     */
  +    public View getServiceView(String service_id) {
  +        List hosts=(List)service_state.get(service_id);
  +        if(hosts == null) return null;
  +        return generateServiceView(hosts);
  +    }
  +
       public boolean stateTransferListenersPresent() {
           return state_transfer_listeners != null && state_transfer_listeners.size() > 0;
       }
  @@ -137,8 +150,8 @@
        */
       public void fetchServiceInformation() throws Exception {
           while(true) {
  -            Address coord=getCoordinator(), local_addr=channel != null? channel.getLocalAddress() : null;
  -            boolean is_coord=coord != null && local_addr != null && local_addr.equals(coord);
  +            Address coord=getCoordinator(), local_address=channel != null? channel.getLocalAddress() : null;
  +            boolean is_coord=coord != null && local_address != null && local_address.equals(coord);
               if(is_coord) {
                   if(log.isTraceEnabled())
                       log.trace("I'm coordinator, will not fetch service state information");
  @@ -180,11 +193,15 @@
   
       public void sendServiceUpMessage(String service, Address host) throws Exception {
           sendServiceMessage(ServiceInfo.SERVICE_UP, service, host);
  +        if(local_addr != null && host != null && local_addr.equals(host))
  +            handleServiceUp(service, host, false);
       }
   
   
  -    public void sendServiceDownMessage(String service, Address addr) throws Exception {
  -        sendServiceMessage(ServiceInfo.SERVICE_DOWN, service, addr);
  +    public void sendServiceDownMessage(String service, Address host) throws Exception {
  +        sendServiceMessage(ServiceInfo.SERVICE_DOWN, service, host);
  +        if(local_addr != null && host != null && local_addr.equals(host))
  +            handleServiceDown(service, host, false);
       }
   
   
  @@ -247,6 +264,11 @@
                   handleStateResponse(evt);
                   break;
   
  +            case Event.SET_LOCAL_ADDRESS:
  +                local_addr=(Address)evt.getArg();
  +                passToAllMuxChannels(evt);
  +                break;
  +
               default:
                   passToAllMuxChannels(evt);
                   break;
  @@ -402,9 +424,11 @@
   
   
       private Address getLocalAddress() {
  +        if(local_addr != null)
  +            return local_addr;
           if(channel != null)
  -            return channel.getLocalAddress();
  -        return null;
  +            local_addr=channel.getLocalAddress();
  +        return local_addr;
       }
   
       private Address getCoordinator() {
  @@ -522,10 +546,10 @@
                   service_state_promise.setResult(info.state);
                   break;
               case ServiceInfo.SERVICE_UP:
  -                handleServiceUp(info.service, info.host);
  +                handleServiceUp(info.service, info.host, true);
                   break;
               case ServiceInfo.SERVICE_DOWN:
  -                handleServiceDown(info.service, info.host);
  +                handleServiceDown(info.service, info.host, true);
                   break;
               default:
                   if(log.isErrorEnabled())
  @@ -535,10 +559,16 @@
       }
   
   
  -    private void handleServiceDown(String service, Address host) {
  +    private void handleServiceDown(String service, Address host, boolean received) {
           List    hosts, hosts_copy;
           boolean removed=false;
   
  +        // discard if we sent this message
  +        if(received && host != null && local_addr != null && local_addr.equals(host)) {
  +            // System.out.println("received SERVICE_DOWN(" + host + ")");
  +            return;
  +        }
  +
           synchronized(service_state) {
               hosts=(List)service_state.get(service);
               if(hosts == null)
  @@ -562,15 +592,22 @@
               }
           }
   
  -        Address local_addr=getLocalAddress();
  -        if(local_addr != null && host != null && host.equals(local_addr))
  +        Address local_address=getLocalAddress();
  +        if(local_address != null && host != null && host.equals(local_address))
               unregister(service);
       }
   
  -    private void handleServiceUp(String service, Address host) {
  +
  +    private void handleServiceUp(String service, Address host, boolean received) {
           List    hosts, hosts_copy;
           boolean added=false;
   
  +        // discard if we sent this message
  +        if(received && host != null && local_addr != null && local_addr.equals(host)) {
  +            // System.out.println("received SERVICE_UP(" + host + ")");
  +            return;
  +        }
  +
           synchronized(service_state) {
               hosts=(List)service_state.get(service);
               if(hosts == null) {

User: belaban 
  Date: 06/07/28 01:26:06

  Modified:    src/org/jgroups/mux Multiplexer.java
  Log:
  Fixed http://jira.jboss.com/jira/browse/JGRP-264 (Multiplexer reconnect doesn't work)
  
  Revision  Changes    Path
  1.18      +10 -2     JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- Multiplexer.java	14 Jul 2006 13:09:25 -0000	1.17
  +++ Multiplexer.java	28 Jul 2006 08:26:06 -0000	1.18
  @@ -15,7 +15,7 @@
    * message is removed and the MuxChannel corresponding to the header's service ID is retrieved from the map,
    * and MuxChannel.up() is called with the message.
    * @author Bela Ban
  - * @version $Id: Multiplexer.java,v 1.17 2006/07/14 13:09:25 belaban Exp $
  + * @version $Id: Multiplexer.java,v 1.18 2006/07/28 08:26:06 belaban Exp $
    */
   public class Multiplexer implements UpHandler {
       /** Map<String,MuxChannel>. Maintains the mapping between service IDs and their associated MuxChannels */
  @@ -669,5 +669,13 @@
       }
   
   
  -
  +    public void addServiceIfNotPresent(String id, MuxChannel ch) {
  +        MuxChannel tmp;
  +        synchronized(services) {
  +            tmp=(MuxChannel)services.get(id);
  +            if(tmp == null) {
  +                services.put(id, ch);
  +            }
  +        }
  +    }
   }

User: belaban 
  Date: 06/08/25 05:57:00

  Modified:    src/org/jgroups/mux Multiplexer.java
  Log:
  changed warn to trace if service is not found
  
  Revision  Changes    Path
  1.19      +5 -5      JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- Multiplexer.java	28 Jul 2006 08:26:06 -0000	1.18
  +++ Multiplexer.java	25 Aug 2006 12:57:00 -0000	1.19
  @@ -15,7 +15,7 @@
    * message is removed and the MuxChannel corresponding to the header's service ID is retrieved from the map,
    * and MuxChannel.up() is called with the message.
    * @author Bela Ban
  - * @version $Id: Multiplexer.java,v 1.18 2006/07/28 08:26:06 belaban Exp $
  + * @version $Id: Multiplexer.java,v 1.19 2006/08/25 12:57:00 belaban Exp $
    */
   public class Multiplexer implements UpHandler {
       /** Map<String,MuxChannel>. Maintains the mapping between service IDs and their associated MuxChannels */
  @@ -593,8 +593,8 @@
                       ch.up(view_evt);
                   }
                   else {
  -                    if(log.isWarnEnabled())
  -                        log.warn("didn't find service " + service + ", cannot dispatch service view " + service_view);
  +                    if(log.isTraceEnabled())
  +                        log.trace("service " + service + " not found, cannot dispatch service view " + service_view);
                   }
               }
           }
  @@ -637,8 +637,8 @@
                       ch.up(view_evt);
                   }
                   else {
  -                    if(log.isWarnEnabled())
  -                        log.warn("didn't find service " + service + ", cannot dispatch service view " + service_view);
  +                    if(log.isTraceEnabled())
  +                        log.trace("service " + service + " not found, cannot dispatch service view " + service_view);
                   }
               }
           }

User: belaban 
  Date: 06/08/26 06:32:42

  Modified:    src/org/jgroups/mux Multiplexer.java
  Log:
  fixed NPE in handleStateRequest()
  
  Revision  Changes    Path
  1.20      +5 -4      JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- Multiplexer.java	25 Aug 2006 12:57:00 -0000	1.19
  +++ Multiplexer.java	26 Aug 2006 13:32:42 -0000	1.20
  @@ -15,7 +15,7 @@
    * message is removed and the MuxChannel corresponding to the header's service ID is retrieved from the map,
    * and MuxChannel.up() is called with the message.
    * @author Bela Ban
  - * @version $Id: Multiplexer.java,v 1.19 2006/08/25 12:57:00 belaban Exp $
  + * @version $Id: Multiplexer.java,v 1.20 2006/08/26 13:32:42 belaban Exp $
    */
   public class Multiplexer implements UpHandler {
       /** Map<String,MuxChannel>. Maintains the mapping between service IDs and their associated MuxChannels */
  @@ -472,10 +472,10 @@
       private void handleStateRequest(Event evt) {
           StateTransferInfo info=(StateTransferInfo)evt.getArg();
           String id=info.state_id;
  +        String original_id=id;
           MuxChannel mux_ch=null;
   
           try {
  -
               int index=id.indexOf(SEPARATOR);
               if(index > -1) {
                   info.state_id=id.substring(index + SEPARATOR_LEN);
  @@ -493,8 +493,9 @@
               mux_ch.up(evt); // state_id will be null, get regular state from the service named state_id
           }
           catch(Throwable ex) {
  -            ex.printStackTrace();
  -            mux_ch.returnState(null, id);
  +            if(log.isErrorEnabled())
  +                log.error("failed returning the application state, will return null", ex);
  +            channel.returnState(null, original_id); // we cannot use mux_ch because it might be null due to the lookup above
           }
       }

User: belaban 
  Date: 06/08/28 05:13:53

  Modified:    src/org/jgroups/mux Multiplexer.java
  Log:
  - fixed adjusting of service views when a member crashed (http://jira.jboss.com/jira/browse/JGRP-286)
  - set version to CR2
  
  Revision  Changes    Path
  1.21      +58 -2     JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- Multiplexer.java	26 Aug 2006 13:32:42 -0000	1.20
  +++ Multiplexer.java	28 Aug 2006 12:13:53 -0000	1.21
  @@ -15,7 +15,7 @@
    * message is removed and the MuxChannel corresponding to the header's service ID is retrieved from the map,
    * and MuxChannel.up() is called with the message.
    * @author Bela Ban
  - * @version $Id: Multiplexer.java,v 1.20 2006/08/26 13:32:42 belaban Exp $
  + * @version $Id: Multiplexer.java,v 1.21 2006/08/28 12:13:53 belaban Exp $
    */
   public class Multiplexer implements UpHandler {
       /** Map<String,MuxChannel>. Maintains the mapping between service IDs and their associated MuxChannels */
  @@ -243,12 +243,17 @@
                   break;
   
               case Event.VIEW_CHANGE:
  +                Vector old_members=view != null? view.getMembers() : null;
                   view=(View)evt.getArg();
  +                Vector new_members=view != null? view.getMembers() : null;
  +                Vector left_members=Util.determineLeftMembers(old_members, new_members);
   
                   if(view instanceof MergeView) {
                       // handle merges here
                   }
   
  +                if(left_members.size() > 0)
  +                    adjustServiceViews(left_members);
                   // passToAllMuxChannels(evt);
                   break;
   
  @@ -612,7 +617,6 @@
   
           // discard if we sent this message
           if(received && host != null && local_addr != null && local_addr.equals(host)) {
  -            // System.out.println("received SERVICE_UP(" + host + ")");
               return;
           }
   
  @@ -645,6 +649,58 @@
           }
       }
   
  +    private void adjustServiceViews(Vector left_members) {
  +        if(left_members != null)
  +            for(int i=0; i < left_members.size(); i++) {
  +                try {
  +                    adjustServiceView((Address)left_members.elementAt(i));
  +                }
  +                catch(Throwable t) {
  +                    if(log.isErrorEnabled())
  +                        log.error("failed adjusting service views", t);
  +                }
  +            }
  +    }
  +
  +    private void adjustServiceView(Address host) {
  +        Map.Entry entry;
  +        List hosts, hosts_copy;
  +        String service;
  +        boolean removed=false;
  +
  +        synchronized(service_state) {
  +            for(Iterator it=service_state.entrySet().iterator(); it.hasNext();) {
  +                entry=(Map.Entry)it.next();
  +                service=(String)entry.getKey();
  +                hosts=(List)entry.getValue();
  +                if(hosts == null)
  +                    continue;
  +
  +                removed=hosts.remove(host);
  +                hosts_copy=new ArrayList(hosts); // make a copy so we don't modify hosts in generateServiceView()
  +
  +                if(removed) {
  +                    View service_view=generateServiceView(hosts_copy);
  +                    if(service_view != null) {
  +                        MuxChannel ch=(MuxChannel)services.get(service);
  +                        if(ch != null) {
  +                            Event view_evt=new Event(Event.VIEW_CHANGE, service_view);
  +                            ch.up(view_evt);
  +                        }
  +                        else {
  +                            if(log.isTraceEnabled())
  +                                log.trace("service " + service + " not found, cannot dispatch service view " + service_view);
  +                        }
  +                    }
  +                }
  +                Address local_address=getLocalAddress();
  +                if(local_address != null && host != null && host.equals(local_address))
  +                    unregister(service);
  +            }
  +        }
  +    }
  +
  +
       /**
        * Create a copy of view which contains only members which are present in hosts. Call viewAccepted() on the MuxChannel
        * which corresponds with service. If no members are removed or added from/to view, this is a no-op.

User: vlada   
  Date: 06/08/28 19:43:32

  Modified:    src/org/jgroups/mux Multiplexer.java
  Log:
  streaming state transfer for mux (minimal change)
  
  Revision  Changes    Path
  1.22      +3 -1      JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- Multiplexer.java	28 Aug 2006 12:13:53 -0000	1.21
  +++ Multiplexer.java	29 Aug 2006 02:43:32 -0000	1.22
  @@ -15,7 +15,7 @@
    * message is removed and the MuxChannel corresponding to the header's service ID is retrieved from the map,
    * and MuxChannel.up() is called with the message.
    * @author Bela Ban
  - * @version $Id: Multiplexer.java,v 1.21 2006/08/28 12:13:53 belaban Exp $
  + * @version $Id: Multiplexer.java,v 1.22 2006/08/29 02:43:32 vlada Exp $
    */
   public class Multiplexer implements UpHandler {
       /** Map<String,MuxChannel>. Maintains the mapping between service IDs and their associated MuxChannels */
  @@ -262,10 +262,12 @@
                   break;
   
               case Event.GET_APPLSTATE:
  +            case Event.STATE_TRANSFER_OUTPUTSTREAM:
                   handleStateRequest(evt);
                   break;
   
               case Event.GET_STATE_OK:
  +            case Event.STATE_TRANSFER_INPUTSTREAM:
                   handleStateResponse(evt);
                   break;

User: belaban 
  Date: 06/08/31 03:56:29

  Modified:    src/org/jgroups/mux Multiplexer.java
  Log:
  added method for handling of merge views (not yet implemented)
  
  Revision  Changes    Path
  1.23      +19 -4     JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- Multiplexer.java	29 Aug 2006 02:43:32 -0000	1.22
  +++ Multiplexer.java	31 Aug 2006 10:56:28 -0000	1.23
  @@ -15,7 +15,7 @@
    * message is removed and the MuxChannel corresponding to the header's service ID is retrieved from the map,
    * and MuxChannel.up() is called with the message.
    * @author Bela Ban
  - * @version $Id: Multiplexer.java,v 1.22 2006/08/29 02:43:32 vlada Exp $
  + * @version $Id: Multiplexer.java,v 1.23 2006/08/31 10:56:28 belaban Exp $
    */
   public class Multiplexer implements UpHandler {
       /** Map<String,MuxChannel>. Maintains the mapping between service IDs and their associated MuxChannels */
  @@ -24,7 +24,6 @@
       static final Log log=LogFactory.getLog(Multiplexer.class);
       static final String SEPARATOR="::";
       static final short SEPARATOR_LEN=(short)SEPARATOR.length();
  -    //static final String LIST_SEPARATOR=";";
       static final String NAME="MUX";
   
       /** Cluster view */
  @@ -249,12 +248,18 @@
                   Vector left_members=Util.determineLeftMembers(old_members, new_members);
   
                   if(view instanceof MergeView) {
  -                    // handle merges here
  +                    Thread merge_view_handler=new Thread() {
  +                        public void run() {
  +                            handleMergeView((MergeView)view);
  +                        }
  +                    };
  +                    merge_view_handler.setName("Multiplexer MergeView handler");
  +                    merge_view_handler.start();
  +                    try {merge_view_handler.join(10000);} catch(InterruptedException e) {}
                   }
   
                   if(left_members.size() > 0)
                       adjustServiceViews(left_members);
  -                // passToAllMuxChannels(evt);
                   break;
   
               case Event.SUSPECT:
  @@ -651,6 +656,16 @@
           }
       }
   
  +
  +    /**
  +     * Fetches the service states from everyone else in the cluster. Once all states have been received and inserted into
  +     * service_state, compute a service view (a copy of MergeView) for each service and pass it up
  +     * @param view
  +     */
  +    private void handleMergeView(MergeView view) {
  +        
  +    }
  +
       private void adjustServiceViews(Vector left_members) {
           if(left_members != null)
               for(int i=0; i < left_members.size(); i++) {

User: belaban 
  Date: 06/09/28 08:13:31

  Modified:    src/org/jgroups/mux Multiplexer.java
  Log:
  handling of up(BLOCK)
  
  Revision  Changes    Path
  1.24      +47 -1     JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- Multiplexer.java	31 Aug 2006 10:56:28 -0000	1.23
  +++ Multiplexer.java	28 Sep 2006 15:13:31 -0000	1.24
  @@ -15,7 +15,7 @@
    * message is removed and the MuxChannel corresponding to the header's service ID is retrieved from the map,
    * and MuxChannel.up() is called with the message.
    * @author Bela Ban
  - * @version $Id: Multiplexer.java,v 1.23 2006/08/31 10:56:28 belaban Exp $
  + * @version $Id: Multiplexer.java,v 1.24 2006/09/28 15:13:31 belaban Exp $
    */
   public class Multiplexer implements UpHandler {
       /** Map<String,MuxChannel>. Maintains the mapping between service IDs and their associated MuxChannels */
  @@ -25,6 +25,9 @@
       static final String SEPARATOR="::";
       static final short SEPARATOR_LEN=(short)SEPARATOR.length();
       static final String NAME="MUX";
  +    private final BlockOkCollector block_ok_collector=new BlockOkCollector();
  +
  +
   
       /** Cluster view */
       View view=null;
  @@ -50,6 +53,7 @@
       public Multiplexer(JChannel channel) {
           this.channel=channel;
           this.channel.setUpHandler(this);
  +        this.channel.setOpt(Channel.BLOCK, Boolean.TRUE); // we want to handle BLOCK events ourselves
       }
   
       /**
  @@ -79,6 +83,13 @@
           return state_transfer_listeners != null && state_transfer_listeners.size() > 0;
       }
   
  +    /**
  +     * Called by a MuxChannel when BLOCK_OK is sent down
  +     */
  +    public void blockOk() {
  +        block_ok_collector.increment();
  +    }
  +
       public synchronized void registerForStateTransfer(String appl_id, String substate_id) {
           String key=appl_id;
           if(substate_id != null && substate_id.length() > 0)
  @@ -281,6 +292,14 @@
                   passToAllMuxChannels(evt);
                   break;
   
  +            case Event.BLOCK:
  +                block_ok_collector.reset();
  +                passToAllMuxChannels(evt);
  +                int num_services=services.size();
  +                block_ok_collector.waitUntil(num_services);
  +                channel.blockOk();
  +                return;
  +
               default:
                   passToAllMuxChannels(evt);
                   break;
  @@ -752,4 +771,31 @@
               }
           }
       }
  +
  +
  +    private static class BlockOkCollector {
  +        int num_block_oks=0;
  +
  +        synchronized void reset() {
  +            num_block_oks=0;
  +        }
  +
  +        synchronized void increment() {
  +            num_block_oks++;
  +        }
  +
  +        synchronized void waitUntil(int num) {
  +            while(num_block_oks < num) {
  +                try {
  +                    this.wait();
  +                }
  +                catch(InterruptedException e) {
  +                }
  +            }
  +        }
  +
  +        public String toString() {
  +            return String.valueOf(num_block_oks);
  +        }
  +    }
   }

User: belaban 
  Date: 06/10/02 02:27:59

  Modified:    src/org/jgroups/mux Multiplexer.java
  Log:
  added support for flushing if we transfer multiple states at the same time
  
  Revision  Changes    Path
  1.25      +5 -5      JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- Multiplexer.java	28 Sep 2006 15:13:31 -0000	1.24
  +++ Multiplexer.java	2 Oct 2006 09:27:58 -0000	1.25
  @@ -15,7 +15,7 @@
    * message is removed and the MuxChannel corresponding to the header's service ID is retrieved from the map,
    * and MuxChannel.up() is called with the message.
    * @author Bela Ban
  - * @version $Id: Multiplexer.java,v 1.24 2006/09/28 15:13:31 belaban Exp $
  + * @version $Id: Multiplexer.java,v 1.25 2006/10/02 09:27:58 belaban Exp $
    */
   public class Multiplexer implements UpHandler {
       /** Map<String,MuxChannel>. Maintains the mapping between service IDs and their associated MuxChannels */
  @@ -752,13 +752,13 @@
   
   
       /** Tell the underlying channel to start the flush protocol, this will be handled by FLUSH */
  -    void startFlush() {
  -
  +    private void startFlush() {
  +        channel.down(new Event(Event.SUSPEND));
       }
   
       /** Tell the underlying channel to stop the flush, and resume message sending. This will be handled by FLUSH */
  -    void stopFlush() {
  -
  +    private void stopFlush() {
  +        channel.down(new Event(Event.RESUME));
       }

User: belaban 
  Date: 06/10/02 05:20:12

  Modified:    src/org/jgroups/mux Multiplexer.java
  Log:
  ns
  
  Revision  Changes    Path
  1.26      +6 -2      JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- Multiplexer.java	2 Oct 2006 09:27:58 -0000	1.25
  +++ Multiplexer.java	2 Oct 2006 12:20:12 -0000	1.26
  @@ -15,7 +15,7 @@
    * message is removed and the MuxChannel corresponding to the header's service ID is retrieved from the map,
    * and MuxChannel.up() is called with the message.
    * @author Bela Ban
  - * @version $Id: Multiplexer.java,v 1.25 2006/10/02 09:27:58 belaban Exp $
  + * @version $Id: Multiplexer.java,v 1.26 2006/10/02 12:20:12 belaban Exp $
    */
   public class Multiplexer implements UpHandler {
       /** Map<String,MuxChannel>. Maintains the mapping between service IDs and their associated MuxChannels */
  @@ -293,9 +293,13 @@
                   break;
   
               case Event.BLOCK:
  +                int num_services=services.size();
  +                if(num_services == 0) {
  +                    channel.blockOk();
  +                    return;
  +                }
                   block_ok_collector.reset();
                   passToAllMuxChannels(evt);
  -                int num_services=services.size();
                   block_ok_collector.waitUntil(num_services);
                   channel.blockOk();
                   return;

User: belaban 
  Date: 06/10/03 08:32:49

  Modified:    src/org/jgroups/mux Multiplexer.java
  Log:
  first (incomplete) impl of handling merge views
  
  Revision  Changes    Path
  1.27      +71 -2     JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- Multiplexer.java	2 Oct 2006 12:20:12 -0000	1.26
  +++ Multiplexer.java	3 Oct 2006 15:32:49 -0000	1.27
  @@ -15,7 +15,7 @@
    * message is removed and the MuxChannel corresponding to the header's service ID is retrieved from the map,
    * and MuxChannel.up() is called with the message.
    * @author Bela Ban
  - * @version $Id: Multiplexer.java,v 1.26 2006/10/02 12:20:12 belaban Exp $
  + * @version $Id: Multiplexer.java,v 1.27 2006/10/03 15:32:49 belaban Exp $
    */
   public class Multiplexer implements UpHandler {
       /** Map<String,MuxChannel>. Maintains the mapping between service IDs and their associated MuxChannels */
  @@ -43,6 +43,12 @@
       /** Used to wait on service state information */
       private final Promise service_state_promise=new Promise();
   
  +    /** Map<Address, Set<String>>. Keys are senders, values are a set of services hosted by that sender.
  +     * Used to collect responses to LIST_SERVICES_REQ */
  +    private final Map service_responses=new HashMap();
  +
  +    private static long SERVICES_RSP_TIMEOUT=5000;
  +
   
   
   
  @@ -274,6 +280,11 @@
                   break;
   
               case Event.SUSPECT:
  +                Address suspected_mbr=(Address)evt.getArg();
  +                synchronized(service_responses) {
  +                    service_responses.put(suspected_mbr, new HashSet());
  +                    service_responses.notifyAll();
  +                }
                   passToAllMuxChannels(evt);
                   break;
   
  @@ -594,6 +605,22 @@
               case ServiceInfo.SERVICE_DOWN:
                   handleServiceDown(info.service, info.host, true);
                   break;
  +            case ServiceInfo.LIST_SERVICES_REQ:
  +                if(local_addr.equals(sender)) {
  +                    // we don't need to send back our own list; we already have it
  +                    break;
  +                }
  +                Set my_services=services.keySet();
  +                byte[] data=Util.objectToByteBuffer(my_services);
  +                ServiceInfo sinfo=new ServiceInfo(ServiceInfo.LIST_SERVICES_RSP, null, channel.getLocalAddress(), data);
  +                Message rsp=new Message(sender);
  +                hdr=new MuxHeader(sinfo);
  +                rsp.putHeader(NAME, hdr);
  +                channel.send(rsp);
  +                break;
  +            case ServiceInfo.LIST_SERVICES_RSP:
  +                handleServicesRsp(sender, info.state);
  +                break;
               default:
                   if(log.isErrorEnabled())
                       log.error("service request type " + info.type + " not known");
  @@ -601,6 +628,18 @@
           }
       }
   
  +    private void handleServicesRsp(Address sender, byte[] state) throws Exception {
  +        Set s=(Set)Util.objectFromByteBuffer(state);
  +        synchronized(service_responses) {
  +            Set tmp=(Set)service_responses.get(sender);
  +            if(tmp == null)
  +                tmp=new HashSet();
  +            tmp.addAll(s);
  +            service_responses.put(sender, tmp);
  +            service_responses.notifyAll();
  +        }
  +    }
  +
   
       private void handleServiceDown(String service, Address host, boolean received) {
           List    hosts, hosts_copy;
  @@ -686,7 +725,37 @@
        * @param view
        */
       private void handleMergeView(MergeView view) {
  -        
  +        long time_to_wait=SERVICES_RSP_TIMEOUT, start;
  +        ServiceInfo info=new ServiceInfo(ServiceInfo.LIST_SERVICES_REQ, null, channel.getLocalAddress(), null);
  +        MuxHeader hdr=new MuxHeader(info);
  +        Message req=new Message(); // send to all
  +        req.putHeader(NAME, hdr);
  +        int num_members=view.size() -1; // exclude myself
  +
  +        Map copy=null;
  +        synchronized(service_responses) {
  +            service_responses.clear();
  +            start=System.currentTimeMillis();
  +            try {
  +                channel.send(req);
  +                while(time_to_wait > 0 && service_responses.size() < num_members) {
  +                    service_responses.wait(time_to_wait);
  +                    time_to_wait-=System.currentTimeMillis() - start;
  +                }
  +                copy=new HashMap(service_responses);
  +            }
  +            catch(Exception ex) {
  +                if(log.isErrorEnabled())
  +                    log.error("failed fetching a list of services from other members in the cluster, cannot handle merge view " + view, ex);
  +            }
  +        }
  +
  +        // merges service_responses with service_state and emits MergeViews for the services affected (MuxChannel)
  +        mergeServiceState(view, copy);
  +    }
  +
  +    private void mergeServiceState(MergeView view, Map copy) {
  +        throw new UnsupportedOperationException("bla");
       }
   
       private void adjustServiceViews(Vector left_members) {

User: belaban 
  Date: 06/10/04 01:36:44

  Modified:    src/org/jgroups/mux Multiplexer.java
  Log:
  getting there...
  
  Revision  Changes    Path
  1.28      +6 -3      JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- Multiplexer.java	3 Oct 2006 15:32:49 -0000	1.27
  +++ Multiplexer.java	4 Oct 2006 08:36:44 -0000	1.28
  @@ -15,7 +15,7 @@
    * message is removed and the MuxChannel corresponding to the header's service ID is retrieved from the map,
    * and MuxChannel.up() is called with the message.
    * @author Bela Ban
  - * @version $Id: Multiplexer.java,v 1.27 2006/10/03 15:32:49 belaban Exp $
  + * @version $Id: Multiplexer.java,v 1.28 2006/10/04 08:36:44 belaban Exp $
    */
   public class Multiplexer implements UpHandler {
       /** Map<String,MuxChannel>. Maintains the mapping between service IDs and their associated MuxChannels */
  @@ -610,7 +610,7 @@
                       // we don't need to send back our own list; we already have it
                       break;
                   }
  -                Set my_services=services.keySet();
  +                Object[] my_services=services.keySet().toArray();
                   byte[] data=Util.objectToByteBuffer(my_services);
                   ServiceInfo sinfo=new ServiceInfo(ServiceInfo.LIST_SERVICES_RSP, null, channel.getLocalAddress(), data);
                   Message rsp=new Message(sender);
  @@ -629,7 +629,10 @@
       }
   
       private void handleServicesRsp(Address sender, byte[] state) throws Exception {
  -        Set s=(Set)Util.objectFromByteBuffer(state);
  +        Object[] keys=(Object[])Util.objectFromByteBuffer(state);
  +        Set s=new HashSet();
  +        for(int i=0; i < keys.length; i++)
  +            s.add(keys[i]);
           synchronized(service_responses) {
               Set tmp=(Set)service_responses.get(sender);
               if(tmp == null)

User: belaban 
  Date: 06/10/04 05:20:22

  Modified:    src/org/jgroups/mux Multiplexer.java
  Log:
  first full implementation - doesn't work 100% correctly yet
  
  Revision  Changes    Path
  1.29      +41 -2     JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- Multiplexer.java	4 Oct 2006 08:36:44 -0000	1.28
  +++ Multiplexer.java	4 Oct 2006 12:20:22 -0000	1.29
  @@ -15,7 +15,7 @@
    * message is removed and the MuxChannel corresponding to the header's service ID is retrieved from the map,
    * and MuxChannel.up() is called with the message.
    * @author Bela Ban
  - * @version $Id: Multiplexer.java,v 1.28 2006/10/04 08:36:44 belaban Exp $
  + * @version $Id: Multiplexer.java,v 1.29 2006/10/04 12:20:22 belaban Exp $
    */
   public class Multiplexer implements UpHandler {
       /** Map<String,MuxChannel>. Maintains the mapping between service IDs and their associated MuxChannels */
  @@ -757,8 +757,47 @@
           mergeServiceState(view, copy);
       }
   
  +
       private void mergeServiceState(MergeView view, Map copy) {
  -        throw new UnsupportedOperationException("bla");
  +        Set modified_services=new HashSet();
  +        Map.Entry entry;
  +        Address host;     // address of the sender
  +        Set service_list; // Set<String> of services
  +        List my_services;
  +        String service;
  +
  +        synchronized(service_state) {
  +            for(Iterator it=copy.entrySet().iterator(); it.hasNext();) {
  +                entry=(Map.Entry)it.next();
  +                host=(Address)entry.getKey();
  +                service_list=(Set)entry.getValue();
  +
  +                for(Iterator it2=service_list.iterator(); it2.hasNext();) {
  +                    service=(String)it2.next();
  +                    my_services=(List)service_state.get(service);
  +                    if(my_services == null) {
  +                        my_services=new ArrayList();
  +                        service_state.put(service, my_services);
  +                    }
  +
  +                    boolean was_modified=my_services.add(host);
  +                    if(was_modified) {
  +                        modified_services.add(service);
  +                    }
  +                }
  +            }
  +        }
  +
  +        // now emit MergeViews for all services which were modified
  +        for(Iterator it=modified_services.iterator(); it.hasNext();) {
  +            service=(String)it.next();
  +            MuxChannel ch=(MuxChannel)services.get(service);
  +            my_services=(List)service_state.get(service);
  +            MergeView v=(MergeView)view.clone();
  +            v.getMembers().retainAll(my_services);
  +            Event evt=new Event(Event.VIEW_CHANGE, v);
  +            ch.up(evt);
  +        }
       }
   
       private void adjustServiceViews(Vector left_members) {

User: belaban 
  Date: 06/10/04 06:34:51

  Modified:    src/org/jgroups/mux Multiplexer.java
  Log:
  ns
  
  Revision  Changes    Path
  1.30      +2 -3      JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- Multiplexer.java	4 Oct 2006 12:20:22 -0000	1.29
  +++ Multiplexer.java	4 Oct 2006 13:34:51 -0000	1.30
  @@ -15,7 +15,7 @@
    * message is removed and the MuxChannel corresponding to the header's service ID is retrieved from the map,
    * and MuxChannel.up() is called with the message.
    * @author Bela Ban
  - * @version $Id: Multiplexer.java,v 1.29 2006/10/04 12:20:22 belaban Exp $
  + * @version $Id: Multiplexer.java,v 1.30 2006/10/04 13:34:51 belaban Exp $
    */
   public class Multiplexer implements UpHandler {
       /** Map<String,MuxChannel>. Maintains the mapping between service IDs and their associated MuxChannels */
  @@ -650,7 +650,6 @@
   
           // discard if we sent this message
           if(received && host != null && local_addr != null && local_addr.equals(host)) {
  -            // System.out.println("received SERVICE_DOWN(" + host + ")");
               return;
           }
   
  @@ -859,7 +858,7 @@
        * @return the servicd view (a modified copy of the real view), or null if the view was not modified
        */
       private View generateServiceView(List hosts) {
  -        View copy=(View)view.clone();
  +        View copy=new View(view.getVid(), new Vector(view.getMembers()));
           Vector members=copy.getMembers();
           members.retainAll(hosts);
           return copy;

User: belaban 
  Date: 06/10/05 03:16:18

  Modified:    src/org/jgroups/mux Multiplexer.java
  Log:
  works, but needs more testing - problems with "udp" ("tunnel" works)
  
  Revision  Changes    Path
  1.31      +111 -65   JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- Multiplexer.java	4 Oct 2006 13:34:51 -0000	1.30
  +++ Multiplexer.java	5 Oct 2006 10:16:18 -0000	1.31
  @@ -1,11 +1,11 @@
   package org.jgroups.mux;
   
  +import org.apache.commons.logging.Log;
  +import org.apache.commons.logging.LogFactory;
   import org.jgroups.*;
  -import org.jgroups.util.Util;
  -import org.jgroups.util.Promise;
   import org.jgroups.stack.StateTransferInfo;
  -import org.apache.commons.logging.LogFactory;
  -import org.apache.commons.logging.Log;
  +import org.jgroups.util.Promise;
  +import org.jgroups.util.Util;
   
   import java.util.*;
   
  @@ -15,7 +15,7 @@
    * message is removed and the MuxChannel corresponding to the header's service ID is retrieved from the map,
    * and MuxChannel.up() is called with the message.
    * @author Bela Ban
  - * @version $Id: Multiplexer.java,v 1.30 2006/10/04 13:34:51 belaban Exp $
  + * @version $Id: Multiplexer.java,v 1.31 2006/10/05 10:16:18 belaban Exp $
    */
   public class Multiplexer implements UpHandler {
       /** Map<String,MuxChannel>. Maintains the mapping between service IDs and their associated MuxChannels */
  @@ -27,6 +27,11 @@
       static final String NAME="MUX";
       private final BlockOkCollector block_ok_collector=new BlockOkCollector();
   
  +    private MergeView temp_merge_view=null;
  +
  +    private boolean flush_present=true;
  +    private boolean blocked=false;
  +
   
   
       /** Cluster view */
  @@ -47,19 +52,21 @@
        * Used to collect responses to LIST_SERVICES_REQ */
       private final Map service_responses=new HashMap();
   
  -    private static long SERVICES_RSP_TIMEOUT=5000;
  +    private static long SERVICES_RSP_TIMEOUT=50000;
   
   
   
   
       public Multiplexer() {
           this.channel=null;
  +        flush_present=isFlushPresent();
       }
   
       public Multiplexer(JChannel channel) {
           this.channel=channel;
           this.channel.setUpHandler(this);
           this.channel.setOpt(Channel.BLOCK, Boolean.TRUE); // we want to handle BLOCK events ourselves
  +        flush_present=isFlushPresent();
       }
   
       /**
  @@ -253,8 +260,6 @@
                       log.warn("service " + hdr.id + " not currently running, discarding messgage " + msg);
                       return;
                   }
  -                if(log.isTraceEnabled())
  -                    log.trace("dispatching message to " + hdr.id);
                   mux_ch.up(evt);
                   break;
   
  @@ -265,22 +270,49 @@
                   Vector left_members=Util.determineLeftMembers(old_members, new_members);
   
                   if(view instanceof MergeView) {
  -                    Thread merge_view_handler=new Thread() {
  -                        public void run() {
  -                            handleMergeView((MergeView)view);
  +                    temp_merge_view=(MergeView)view.clone();
  +                    if(log.isTraceEnabled())
  +                        log.trace("received a MergeView: " + temp_merge_view + ", adjusting the service view");
  +                    if(!flush_present) {
  +                        try {
  +                            if(log.isTraceEnabled())
  +                                log.trace("calling handleMergeView() from VIEW_CHANGE (flush_present=" + flush_present + ")");
  +                            Thread merge_handler=new Thread() {
  +                                public void run() {
  +                                    try {
  +                                        handleMergeView(temp_merge_view);
  +                                    }
  +                                    catch(Exception e) {
  +                                        if(log.isErrorEnabled())
  +                                            log.error("problems handling merge view", e);
  +                                    }
  +                                }
  +                            };
  +                            merge_handler.setName("merge handler view_change");
  +                            merge_handler.setDaemon(false);
  +                            merge_handler.start();
  +                        }
  +                        catch(Exception e) {
  +                            if(log.isErrorEnabled())
  +                                log.error("failed handling merge view", e);
                           }
  -                    };
  -                    merge_view_handler.setName("Multiplexer MergeView handler");
  -                    merge_view_handler.start();
  -                    try {merge_view_handler.join(10000);} catch(InterruptedException e) {}
  +                    }
  +                    else {
  +                        ; // don't do anything because we are blocked sending messages anyway
  +                    }
  +                }
  +                else { // regular view
  +                    synchronized(service_responses) {
  +                        service_responses.clear();
  +                    }
                   }
  -
                   if(left_members.size() > 0)
                       adjustServiceViews(left_members);
                   break;
   
               case Event.SUSPECT:
                   Address suspected_mbr=(Address)evt.getArg();
  +
                   synchronized(service_responses) {
                       service_responses.put(suspected_mbr, new HashSet());
                       service_responses.notifyAll();
  @@ -304,6 +336,7 @@
                   break;
   
               case Event.BLOCK:
  +                blocked=true;
                   int num_services=services.size();
                   if(num_services == 0) {
                       channel.blockOk();
  @@ -315,6 +348,40 @@
                   channel.blockOk();
                   return;
   
  +            case Event.UNBLOCK: // process queued-up MergeViews
  +                if(!blocked) {
  +                    passToAllMuxChannels(evt);
  +                    return;
  +                }
  +                else
  +                    blocked=false;
  +                if(temp_merge_view != null) {
  +                    if(log.isTraceEnabled())
  +                        log.trace("calling handleMergeView() from UNBLOCK (flush_present=" + flush_present + ")");
  +                    try {
  +                        Thread merge_handler=new Thread() {
  +                            public void run() {
  +                                try {
  +                                    handleMergeView(temp_merge_view);
  +                                }
  +                                catch(Exception e) {
  +                                    if(log.isErrorEnabled())
  +                                        log.error("problems handling merge view", e);
  +                                }
  +                            }
  +                        };
  +                        merge_handler.setName("merge handler (unblock)");
  +                        merge_handler.setDaemon(false);
  +                        merge_handler.start();
  +                    }
  +                    catch(Exception e) {
  +                        if(log.isErrorEnabled())
  +                            log.error("failed handling merge view", e);
  +                    }
  +                }
  +                passToAllMuxChannels(evt);
  +                break;
  +
               default:
                   passToAllMuxChannels(evt);
                   break;
  @@ -438,35 +505,20 @@
       }
   
   
  +    private boolean isFlushPresent() {
  +        return channel.getProtocolStack().findProtocol("FLUSH") != null;
  +    }
   
  -/*    private void handleStateRequest(Event evt) {
  -        StateTransferInfo info=(StateTransferInfo)evt.getArg();
  -        String state_id=info.state_id;
  -        MuxChannel mux_ch;
  -
  -        // state_id might be "myID" or "myID::mySubID". if it is null, get all substates
  -        // could be a list, e.g. "myID::subID;mySecondID::subID-2;myThirdID::subID-3 etc
  -
  -        // current_state_id=state_id;
  -
  -        // List ids=parseStateIds(state_id);
  -        synchronized(state_transfer_rsps) {
  -            for(Iterator it=ids.iterator(); it.hasNext();) {
  -                String id=(String)it.next();
  -                String appl_id=id;  // e.g. "myID::myStateID"
  -                int index=id.indexOf(SEPARATOR);
  -                if(index > -1) {
  -                    appl_id=id.substring(0, index);  // similar reuse as above...
  -                }
  -                state_transfer_rsps.add(appl_id);
  -            }
  -        }
   
  -        for(Iterator it=ids.iterator(); it.hasNext();) {
  -            String id=(String)it.next();
  -            _handleStateRequest(id, evt, info);
  -        }
  -    }*/
  +    private void sendServiceState() throws Exception {
  +        Object[] my_services=services.keySet().toArray();
  +        byte[] data=Util.objectToByteBuffer(my_services);
  +        ServiceInfo sinfo=new ServiceInfo(ServiceInfo.LIST_SERVICES_RSP, null, channel.getLocalAddress(), data);
  +        Message rsp=new Message(); // send to everyone
  +        MuxHeader hdr=new MuxHeader(sinfo);
  +        rsp.putHeader(NAME, hdr);
  +        channel.send(rsp);
  +    }
   
   
       private Address getLocalAddress() {
  @@ -605,19 +657,6 @@
               case ServiceInfo.SERVICE_DOWN:
                   handleServiceDown(info.service, info.host, true);
                   break;
  -            case ServiceInfo.LIST_SERVICES_REQ:
  -                if(local_addr.equals(sender)) {
  -                    // we don't need to send back our own list; we already have it
  -                    break;
  -                }
  -                Object[] my_services=services.keySet().toArray();
  -                byte[] data=Util.objectToByteBuffer(my_services);
  -                ServiceInfo sinfo=new ServiceInfo(ServiceInfo.LIST_SERVICES_RSP, null, channel.getLocalAddress(), data);
  -                Message rsp=new Message(sender);
  -                hdr=new MuxHeader(sinfo);
  -                rsp.putHeader(NAME, hdr);
  -                channel.send(rsp);
  -                break;
               case ServiceInfo.LIST_SERVICES_RSP:
                   handleServicesRsp(sender, info.state);
                   break;
  @@ -633,12 +672,18 @@
           Set s=new HashSet();
           for(int i=0; i < keys.length; i++)
               s.add(keys[i]);
  +
  +
  +
           synchronized(service_responses) {
               Set tmp=(Set)service_responses.get(sender);
               if(tmp == null)
                   tmp=new HashSet();
               tmp.addAll(s);
  +
               service_responses.put(sender, tmp);
  +            if(log.isTraceEnabled())
  +                log.trace("received service response: " + sender + "(" + s.toString() + ")");
               service_responses.notifyAll();
           }
       }
  @@ -726,20 +771,16 @@
        * service_state, compute a service view (a copy of MergeView) for each service and pass it up
        * @param view
        */
  -    private void handleMergeView(MergeView view) {
  +    private void handleMergeView(MergeView view) throws Exception {
           long time_to_wait=SERVICES_RSP_TIMEOUT, start;
  -        ServiceInfo info=new ServiceInfo(ServiceInfo.LIST_SERVICES_REQ, null, channel.getLocalAddress(), null);
  -        MuxHeader hdr=new MuxHeader(info);
  -        Message req=new Message(); // send to all
  -        req.putHeader(NAME, hdr);
  -        int num_members=view.size() -1; // exclude myself
  -
  +        int num_members=view.size(); // include myself
           Map copy=null;
  +
  +        sendServiceState();
  +
           synchronized(service_responses) {
  -            service_responses.clear();
               start=System.currentTimeMillis();
               try {
  -                channel.send(req);
                   while(time_to_wait > 0 && service_responses.size() < num_members) {
                       service_responses.wait(time_to_wait);
                       time_to_wait-=System.currentTimeMillis() - start;
  @@ -752,8 +793,13 @@
               }
           }
   
  +        if(log.isTraceEnabled())
  +            log.trace("merging service state, my service_state: " + service_state + ", received responses: " + copy);
  +
           // merges service_responses with service_state and emits MergeViews for the services affected (MuxChannel)
           mergeServiceState(view, copy);
  +        service_responses.clear();
  +        temp_merge_view=null;
       }

User: belaban 
  Date: 06/10/05 07:50:19

  Modified:    src/org/jgroups/mux Multiplexer.java
  Log:
  works for "udp" now
  
  Revision  Changes    Path
  1.32      +36 -4     JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- Multiplexer.java	5 Oct 2006 10:16:18 -0000	1.31
  +++ Multiplexer.java	5 Oct 2006 14:50:18 -0000	1.32
  @@ -15,7 +15,7 @@
    * message is removed and the MuxChannel corresponding to the header's service ID is retrieved from the map,
    * and MuxChannel.up() is called with the message.
    * @author Bela Ban
  - * @version $Id: Multiplexer.java,v 1.31 2006/10/05 10:16:18 belaban Exp $
  + * @version $Id: Multiplexer.java,v 1.32 2006/10/05 14:50:18 belaban Exp $
    */
   public class Multiplexer implements UpHandler {
       /** Map<String,MuxChannel>. Maintains the mapping between service IDs and their associated MuxChannels */
  @@ -52,7 +52,7 @@
        * Used to collect responses to LIST_SERVICES_REQ */
       private final Map service_responses=new HashMap();
   
  -    private static long SERVICES_RSP_TIMEOUT=50000;
  +    private long SERVICES_RSP_TIMEOUT=10000;
   
   
   
  @@ -81,6 +81,15 @@
           return services != null? services.keySet() : null;
       }
   
  +
  +    public long getServicesResponseTimeout() {
  +        return SERVICES_RSP_TIMEOUT;
  +    }
  +
  +    public void setServicesResponseTimeout(long services_rsp_timeout) {
  +        this.SERVICES_RSP_TIMEOUT=services_rsp_timeout;
  +    }
  +
       /** Returns a copy of the current view <em>minus</em> the nodes on which service service_id is <em>not</em> running
        *
        * @param service_id
  @@ -269,6 +278,9 @@
                   Vector new_members=view != null? view.getMembers() : null;
                   Vector left_members=Util.determineLeftMembers(old_members, new_members);
   
  +
  +                System.out.println("===> " + view + " <===");
  +
                   if(view instanceof MergeView) {
                       temp_merge_view=(MergeView)view.clone();
                       if(log.isTraceEnabled())
  @@ -314,7 +326,7 @@
                   Address suspected_mbr=(Address)evt.getArg();
   
                   synchronized(service_responses) {
  -                    service_responses.put(suspected_mbr, new HashSet());
  +                    service_responses.put(suspected_mbr, null);
                       service_responses.notifyAll();
                   }
                   passToAllMuxChannels(evt);
  @@ -781,10 +793,17 @@
           synchronized(service_responses) {
               start=System.currentTimeMillis();
               try {
  -                while(time_to_wait > 0 && service_responses.size() < num_members) {
  +                while(time_to_wait > 0 && numResponses(service_responses) < num_members) {
  +                    System.out.println("time_to_wait=" + time_to_wait + ", numResponses(service_responses)=" + numResponses(service_responses) +
  +                            ", num_members=" + num_members + ", service_state=" + service_state);
                       service_responses.wait(time_to_wait);
                       time_to_wait-=System.currentTimeMillis() - start;
                   }
  +
  +
  +                System.out.println("wait terminated: time_to_wait=" + time_to_wait + ", numResponses(service_responses)=" + numResponses(service_responses) +
  +                        ", num_members=" + num_members + ", service_state=" + service_state);
  +
                   copy=new HashMap(service_responses);
               }
               catch(Exception ex) {
  @@ -802,6 +821,17 @@
           temp_merge_view=null;
       }
   
  +    private int numResponses(Map m) {
  +        int num=0;
  +        Collection values=m.values();
  +        for(Iterator it=values.iterator(); it.hasNext();) {
  +            if(it.next() != null)
  +                num++;
  +        }
  +
  +        return num;
  +    }
  +
   
       private void mergeServiceState(MergeView view, Map copy) {
           Set modified_services=new HashSet();
  @@ -816,6 +846,8 @@
                   entry=(Map.Entry)it.next();
                   host=(Address)entry.getKey();
                   service_list=(Set)entry.getValue();
  +                if(service_list == null)
  +                    continue;
   
                   for(Iterator it2=service_list.iterator(); it2.hasNext();) {
                       service=(String)it2.next();

User: belaban 
  Date: 06/10/05 08:02:11

  Modified:    src/org/jgroups/mux Multiplexer.java
  Log:
  "tunnel" works too
  
  Revision  Changes    Path
  1.33      +5 -10     JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- Multiplexer.java	5 Oct 2006 14:50:18 -0000	1.32
  +++ Multiplexer.java	5 Oct 2006 15:02:11 -0000	1.33
  @@ -15,7 +15,7 @@
    * message is removed and the MuxChannel corresponding to the header's service ID is retrieved from the map,
    * and MuxChannel.up() is called with the message.
    * @author Bela Ban
  - * @version $Id: Multiplexer.java,v 1.32 2006/10/05 14:50:18 belaban Exp $
  + * @version $Id: Multiplexer.java,v 1.33 2006/10/05 15:02:11 belaban Exp $
    */
   public class Multiplexer implements UpHandler {
       /** Map<String,MuxChannel>. Maintains the mapping between service IDs and their associated MuxChannels */
  @@ -278,9 +278,6 @@
                   Vector new_members=view != null? view.getMembers() : null;
                   Vector left_members=Util.determineLeftMembers(old_members, new_members);
   
  -
  -                System.out.println("===> " + view + " <===");
  -
                   if(view instanceof MergeView) {
                       temp_merge_view=(MergeView)view.clone();
                       if(log.isTraceEnabled())
  @@ -794,16 +791,14 @@
               start=System.currentTimeMillis();
               try {
                   while(time_to_wait > 0 && numResponses(service_responses) < num_members) {
  -                    System.out.println("time_to_wait=" + time_to_wait + ", numResponses(service_responses)=" + numResponses(service_responses) +
  -                            ", num_members=" + num_members + ", service_state=" + service_state);
  +                    // System.out.println("time_to_wait=" + time_to_wait + ", numResponses(service_responses)=" + numResponses(service_responses) +
  +                       //     ", num_members=" + num_members + ", service_state=" + service_state);
                       service_responses.wait(time_to_wait);
                       time_to_wait-=System.currentTimeMillis() - start;
                   }
   
  -
  -                System.out.println("wait terminated: time_to_wait=" + time_to_wait + ", numResponses(service_responses)=" + numResponses(service_responses) +
  -                        ", num_members=" + num_members + ", service_state=" + service_state);
  -
  +                // System.out.println("wait terminated: time_to_wait=" + time_to_wait + ", numResponses(service_responses)=" + numResponses(service_responses) +
  +                   //     ", num_members=" + num_members + ", service_state=" + service_state);
                   copy=new HashMap(service_responses);
               }
               catch(Exception ex) {

User: belaban 
  Date: 06/10/25 06:45:29

  Modified:    src/org/jgroups/mux Multiplexer.java
  Log:
  fixed typo
  
  Revision  Changes    Path
  1.34      +2 -2      JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- Multiplexer.java	5 Oct 2006 15:02:11 -0000	1.33
  +++ Multiplexer.java	25 Oct 2006 13:45:29 -0000	1.34
  @@ -15,7 +15,7 @@
    * message is removed and the MuxChannel corresponding to the header's service ID is retrieved from the map,
    * and MuxChannel.up() is called with the message.
    * @author Bela Ban
  - * @version $Id: Multiplexer.java,v 1.33 2006/10/05 15:02:11 belaban Exp $
  + * @version $Id: Multiplexer.java,v 1.34 2006/10/25 13:45:29 belaban Exp $
    */
   public class Multiplexer implements UpHandler {
       /** Map<String,MuxChannel>. Maintains the mapping between service IDs and their associated MuxChannels */
  @@ -206,7 +206,7 @@
                           service_state.putAll(new_state);
                       }
                       if(log.isTraceEnabled())
  -                        log.trace("service state was set successfully (" + service_state.size() + " entries");
  +                        log.trace("service state was set successfully (" + service_state.size() + " entries)");
                   }
                   else {
                       if(log.isWarnEnabled())

User: belaban 
  Date: 06/10/30 04:27:55

  Modified:    src/org/jgroups/mux Multiplexer.java
  Log:
  added check for null merge view
  
  Revision  Changes    Path
  1.35      +2 -2      JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- Multiplexer.java	25 Oct 2006 13:45:29 -0000	1.34
  +++ Multiplexer.java	30 Oct 2006 12:27:55 -0000	1.35
  @@ -15,7 +15,7 @@
    * message is removed and the MuxChannel corresponding to the header's service ID is retrieved from the map,
    * and MuxChannel.up() is called with the message.
    * @author Bela Ban
  - * @version $Id: Multiplexer.java,v 1.34 2006/10/25 13:45:29 belaban Exp $
  + * @version $Id: Multiplexer.java,v 1.35 2006/10/30 12:27:55 belaban Exp $
    */
   public class Multiplexer implements UpHandler {
       /** Map<String,MuxChannel>. Maintains the mapping between service IDs and their associated MuxChannels */
  @@ -282,7 +282,7 @@
                       temp_merge_view=(MergeView)view.clone();
                       if(log.isTraceEnabled())
                           log.trace("received a MergeView: " + temp_merge_view + ", adjusting the service view");
  -                    if(!flush_present) {
  +                    if(!flush_present && temp_merge_view != null) {
                           try {
                               if(log.isTraceEnabled())
                                   log.trace("calling handleMergeView() from VIEW_CHANGE (flush_present=" + flush_present + ")");

User: vlada   
  Date: 06/11/16 10:28:37

  Modified:    src/org/jgroups/mux Multiplexer.java
  Log:
  avoid double FLUSH
  
  Revision  Changes    Path
  1.36      +5 -11     JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- Multiplexer.java	30 Oct 2006 12:27:55 -0000	1.35
  +++ Multiplexer.java	16 Nov 2006 18:28:37 -0000	1.36
  @@ -15,7 +15,7 @@
    * message is removed and the MuxChannel corresponding to the header's service ID is retrieved from the map,
    * and MuxChannel.up() is called with the message.
    * @author Bela Ban
  - * @version $Id: Multiplexer.java,v 1.35 2006/10/30 12:27:55 belaban Exp $
  + * @version $Id: Multiplexer.java,v 1.36 2006/11/16 18:28:37 vlada Exp $
    */
   public class Multiplexer implements UpHandler {
       /** Map<String,MuxChannel>. Maintains the mapping between service IDs and their associated MuxChannels */
  @@ -147,16 +147,10 @@
           if(!all_true)
               return true; // pseudo
   
  -        boolean rc=false;
  -        try {
  -            startFlush();
  -            Set keys=new HashSet(state_transfer_listeners.keySet());
  -            rc=fetchServiceStates(target, keys, timeout);
  -            state_transfer_listeners.clear();
  -        }
  -        finally {
  -            stopFlush();
  -        }
  +        boolean rc=false;           
  +        Set keys=new HashSet(state_transfer_listeners.keySet());
  +        rc=fetchServiceStates(target, keys, timeout);
  +        state_transfer_listeners.clear();        
           return rc;
       }

User: vlada   
  Date: 06/12/04 11:22:48

  Modified:    src/org/jgroups/mux Multiplexer.java
  Log:
  [JGRP-370] temp solution for 2.4.1
  
  Revision  Changes    Path
  1.37      +10 -6     JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- Multiplexer.java	16 Nov 2006 18:28:37 -0000	1.36
  +++ Multiplexer.java	4 Dec 2006 19:22:48 -0000	1.37
  @@ -3,6 +3,7 @@
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
   import org.jgroups.*;
  +import org.jgroups.protocols.pbcast.FLUSH;
   import org.jgroups.stack.StateTransferInfo;
   import org.jgroups.util.Promise;
   import org.jgroups.util.Util;
  @@ -15,7 +16,7 @@
    * message is removed and the MuxChannel corresponding to the header's service ID is retrieved from the map,
    * and MuxChannel.up() is called with the message.
    * @author Bela Ban
  - * @version $Id: Multiplexer.java,v 1.36 2006/11/16 18:28:37 vlada Exp $
  + * @version $Id: Multiplexer.java,v 1.37 2006/12/04 19:22:48 vlada Exp $
    */
   public class Multiplexer implements UpHandler {
       /** Map<String,MuxChannel>. Maintains the mapping between service IDs and their associated MuxChannels */
  @@ -217,15 +218,15 @@
   
   
   
  -    public void sendServiceUpMessage(String service, Address host) throws Exception {
  -        sendServiceMessage(ServiceInfo.SERVICE_UP, service, host);
  +    public void sendServiceUpMessage(String service, Address host,boolean bypassFlush) throws Exception {
  +        sendServiceMessage(ServiceInfo.SERVICE_UP, service, host,bypassFlush);
           if(local_addr != null && host != null && local_addr.equals(host))
               handleServiceUp(service, host, false);
       }
   
   
  -    public void sendServiceDownMessage(String service, Address host) throws Exception {
  -        sendServiceMessage(ServiceInfo.SERVICE_DOWN, service, host);
  +    public void sendServiceDownMessage(String service, Address host,boolean bypassFlush) throws Exception {
  +        sendServiceMessage(ServiceInfo.SERVICE_DOWN, service, host,bypassFlush);
           if(local_addr != null && host != null && local_addr.equals(host))
               handleServiceDown(service, host, false);
       }
  @@ -552,7 +553,7 @@
           return (Address)hosts.get(0);
       }
   
  -    private void sendServiceMessage(byte type, String service, Address host) throws Exception {
  +    private void sendServiceMessage(byte type, String service, Address host,boolean bypassFlush) throws Exception {
           if(host == null)
               host=getLocalAddress();
           if(host == null) {
  @@ -566,6 +567,9 @@
           MuxHeader hdr=new MuxHeader(si);
           Message service_msg=new Message();
           service_msg.putHeader(NAME, hdr);
  +        if(bypassFlush)
  +           service_msg.putHeader(FLUSH.NAME, new FLUSH.FlushHeader(FLUSH.FlushHeader.FLUSH_BYPASS));
  +        
           channel.send(service_msg);
       }

User: vlada   
  Date: 06/12/04 14:50:40

  Modified:    src/org/jgroups/mux Tag: Branch_JGroups_2_4 Multiplexer.java
  Log:
  [JGRP-370] tmp solution
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.35.2.1  +14 -16    JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.35
  retrieving revision 1.35.2.1
  diff -u -r1.35 -r1.35.2.1
  --- Multiplexer.java	30 Oct 2006 12:27:55 -0000	1.35
  +++ Multiplexer.java	4 Dec 2006 22:50:40 -0000	1.35.2.1
  @@ -3,6 +3,7 @@
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
   import org.jgroups.*;
  +import org.jgroups.protocols.pbcast.FLUSH;
   import org.jgroups.stack.StateTransferInfo;
   import org.jgroups.util.Promise;
   import org.jgroups.util.Util;
  @@ -15,7 +16,7 @@
    * message is removed and the MuxChannel corresponding to the header's service ID is retrieved from the map,
    * and MuxChannel.up() is called with the message.
    * @author Bela Ban
  - * @version $Id: Multiplexer.java,v 1.35 2006/10/30 12:27:55 belaban Exp $
  + * @version $Id: Multiplexer.java,v 1.35.2.1 2006/12/04 22:50:40 vlada Exp $
    */
   public class Multiplexer implements UpHandler {
       /** Map<String,MuxChannel>. Maintains the mapping between service IDs and their associated MuxChannels */
  @@ -147,16 +148,10 @@
           if(!all_true)
               return true; // pseudo
   
  -        boolean rc=false;
  -        try {
  -            startFlush();
  -            Set keys=new HashSet(state_transfer_listeners.keySet());
  -            rc=fetchServiceStates(target, keys, timeout);
  -            state_transfer_listeners.clear();
  -        }
  -        finally {
  -            stopFlush();
  -        }
  +        boolean rc=false;           
  +        Set keys=new HashSet(state_transfer_listeners.keySet());
  +        rc=fetchServiceStates(target, keys, timeout);
  +        state_transfer_listeners.clear();        
           return rc;
       }
   
  @@ -223,15 +218,15 @@
   
   
   
  -    public void sendServiceUpMessage(String service, Address host) throws Exception {
  -        sendServiceMessage(ServiceInfo.SERVICE_UP, service, host);
  +    public void sendServiceUpMessage(String service, Address host,boolean bypassFlush) throws Exception {
  +        sendServiceMessage(ServiceInfo.SERVICE_UP, service, host,bypassFlush);
           if(local_addr != null && host != null && local_addr.equals(host))
               handleServiceUp(service, host, false);
       }
   
   
  -    public void sendServiceDownMessage(String service, Address host) throws Exception {
  -        sendServiceMessage(ServiceInfo.SERVICE_DOWN, service, host);
  +    public void sendServiceDownMessage(String service, Address host,boolean bypassFlush) throws Exception {
  +        sendServiceMessage(ServiceInfo.SERVICE_DOWN, service, host,bypassFlush);
           if(local_addr != null && host != null && local_addr.equals(host))
               handleServiceDown(service, host, false);
       }
  @@ -558,7 +553,7 @@
           return (Address)hosts.get(0);
       }
   
  -    private void sendServiceMessage(byte type, String service, Address host) throws Exception {
  +    private void sendServiceMessage(byte type, String service, Address host,boolean bypassFlush) throws Exception {
           if(host == null)
               host=getLocalAddress();
           if(host == null) {
  @@ -572,6 +567,9 @@
           MuxHeader hdr=new MuxHeader(si);
           Message service_msg=new Message();
           service_msg.putHeader(NAME, hdr);
  +        if(bypassFlush)
  +           service_msg.putHeader(FLUSH.NAME, new FLUSH.FlushHeader(FLUSH.FlushHeader.FLUSH_BYPASS));
  +        
           channel.send(service_msg);
       }

User: belaban 
  Date: 06/12/11 03:20:17

  Modified:    src/org/jgroups/mux Tag: Branch_JGroups_2_4 Multiplexer.java
  Log:
  fixed bug caused by modification of  UnmodifiableVector
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.35.2.2  +3 -4      JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.35.2.1
  retrieving revision 1.35.2.2
  diff -u -r1.35.2.1 -r1.35.2.2
  --- Multiplexer.java	4 Dec 2006 22:50:40 -0000	1.35.2.1
  +++ Multiplexer.java	11 Dec 2006 11:20:17 -0000	1.35.2.2
  @@ -16,7 +16,7 @@
    * message is removed and the MuxChannel corresponding to the header's service ID is retrieved from the map,
    * and MuxChannel.up() is called with the message.
    * @author Bela Ban
  - * @version $Id: Multiplexer.java,v 1.35.2.1 2006/12/04 22:50:40 vlada Exp $
  + * @version $Id: Multiplexer.java,v 1.35.2.2 2006/12/11 11:20:17 belaban Exp $
    */
   public class Multiplexer implements UpHandler {
       /** Map<String,MuxChannel>. Maintains the mapping between service IDs and their associated MuxChannels */
  @@ -929,10 +929,9 @@
        * @return the servicd view (a modified copy of the real view), or null if the view was not modified
        */
       private View generateServiceView(List hosts) {
  -        View copy=new View(view.getVid(), new Vector(view.getMembers()));
  -        Vector members=copy.getMembers();
  +        Vector members=new Vector(view.getMembers());
           members.retainAll(hosts);
  -        return copy;
  +        return new View(view.getVid(), members);
       }

User: belaban 
  Date: 06/12/11 03:20:43

  Modified:    src/org/jgroups/mux Multiplexer.java
  Log:
  fixed bug caused by modification of UnmodifiableVector
  
  Revision  Changes    Path
  1.38      +3 -4      JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- Multiplexer.java	4 Dec 2006 19:22:48 -0000	1.37
  +++ Multiplexer.java	11 Dec 2006 11:20:43 -0000	1.38
  @@ -16,7 +16,7 @@
    * message is removed and the MuxChannel corresponding to the header's service ID is retrieved from the map,
    * and MuxChannel.up() is called with the message.
    * @author Bela Ban
  - * @version $Id: Multiplexer.java,v 1.37 2006/12/04 19:22:48 vlada Exp $
  + * @version $Id: Multiplexer.java,v 1.38 2006/12/11 11:20:43 belaban Exp $
    */
   public class Multiplexer implements UpHandler {
       /** Map<String,MuxChannel>. Maintains the mapping between service IDs and their associated MuxChannels */
  @@ -929,10 +929,9 @@
        * @return the servicd view (a modified copy of the real view), or null if the view was not modified
        */
       private View generateServiceView(List hosts) {
  -        View copy=new View(view.getVid(), new Vector(view.getMembers()));
  -        Vector members=copy.getMembers();
  +        Vector members=new Vector(view.getMembers());
           members.retainAll(hosts);
  -        return copy;
  +        return new View(view.getVid(), members);
       }

User: belaban 
  Date: 06/12/22 05:02:04

  Modified:    src/org/jgroups/mux Multiplexer.java
  Log:
  replaced evt.setArg() with copy
  
  Revision  Changes    Path
  1.39      +4 -3      JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- Multiplexer.java	11 Dec 2006 11:20:43 -0000	1.38
  +++ Multiplexer.java	22 Dec 2006 13:02:04 -0000	1.39
  @@ -16,7 +16,7 @@
    * message is removed and the MuxChannel corresponding to the header's service ID is retrieved from the map,
    * and MuxChannel.up() is called with the message.
    * @author Bela Ban
  - * @version $Id: Multiplexer.java,v 1.38 2006/12/11 11:20:43 belaban Exp $
  + * @version $Id: Multiplexer.java,v 1.39 2006/12/22 13:02:04 belaban Exp $
    */
   public class Multiplexer implements UpHandler {
       /** Map<String,MuxChannel>. Maintains the mapping between service IDs and their associated MuxChannels */
  @@ -637,8 +637,9 @@
           else {
               StateTransferInfo tmp_info=info.copy();
               tmp_info.state_id=substate_id;
  -            evt.setArg(tmp_info);
  -            mux_ch.up(evt); // state_id will be null, get regular state from the service named state_id
  +            // evt.setArg(tmp_info);
  +            Event tmpEvt=new Event(evt.getType(), tmp_info);
  +            mux_ch.up(tmpEvt); // state_id will be null, get regular state from the service named state_id
           }
       }

User: belaban 
  Date: 07/01/16 08:41:04

  Modified:    src/org/jgroups/mux Multiplexer.java
  Log:
  setting interrupt flag again on thread, after interruption
  
  Revision  Changes    Path
  1.43      +2 -1      JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.42
  retrieving revision 1.43
  diff -u -r1.42 -r1.43
  --- Multiplexer.java	11 Jan 2007 12:57:34 -0000	1.42
  +++ Multiplexer.java	16 Jan 2007 16:41:03 -0000	1.43
  @@ -16,7 +16,7 @@
    * message is removed and the MuxChannel corresponding to the header's service ID is retrieved from the map,
    * and MuxChannel.up() is called with the message.
    * @author Bela Ban
  - * @version $Id: Multiplexer.java,v 1.42 2007/01/11 12:57:34 belaban Exp $
  + * @version $Id: Multiplexer.java,v 1.43 2007/01/16 16:41:03 belaban Exp $
    */
   public class Multiplexer implements UpHandler {
       /** Map<String,MuxChannel>. Maintains the mapping between service IDs and their associated MuxChannels */
  @@ -1023,6 +1023,7 @@
                       this.wait();
                   }
                   catch(InterruptedException e) {
  +                    Thread.currentThread().interrupt(); // set interrupt flag again
                   }
               }
           }

User: belaban 
  Date: 07/01/16 23:18:34

  Modified:    src/org/jgroups/mux Multiplexer.java
  Log:
  fixed typo
  
  Revision  Changes    Path
  1.44      +2 -2      JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.43
  retrieving revision 1.44
  diff -u -r1.43 -r1.44
  --- Multiplexer.java	16 Jan 2007 16:41:03 -0000	1.43
  +++ Multiplexer.java	17 Jan 2007 07:18:34 -0000	1.44
  @@ -16,7 +16,7 @@
    * message is removed and the MuxChannel corresponding to the header's service ID is retrieved from the map,
    * and MuxChannel.up() is called with the message.
    * @author Bela Ban
  - * @version $Id: Multiplexer.java,v 1.43 2007/01/16 16:41:03 belaban Exp $
  + * @version $Id: Multiplexer.java,v 1.44 2007/01/17 07:18:34 belaban Exp $
    */
   public class Multiplexer implements UpHandler {
       /** Map<String,MuxChannel>. Maintains the mapping between service IDs and their associated MuxChannels */
  @@ -261,7 +261,7 @@
   
                   MuxChannel mux_ch=(MuxChannel)services.get(hdr.id);
                   if(mux_ch == null) {
  -                    log.warn("service " + hdr.id + " not currently running, discarding messgage " + msg);
  +                    log.warn("service " + hdr.id + " not currently running, discarding message " + msg);
                       return null;
                   }
                   return mux_ch.up(evt);

User: vlada   
  Date: 07/01/22 13:04:23

  Modified:    src/org/jgroups/mux Multiplexer.java
  Log:
  remove BLOCK_OK
  
  Revision  Changes    Path
  1.46      +7 -49     JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.45
  retrieving revision 1.46
  diff -u -r1.45 -r1.46
  --- Multiplexer.java	22 Jan 2007 18:05:24 -0000	1.45
  +++ Multiplexer.java	22 Jan 2007 21:04:23 -0000	1.46
  @@ -16,7 +16,7 @@
    * message is removed and the MuxChannel corresponding to the header's service ID is retrieved from the map,
    * and MuxChannel.up() is called with the message.
    * @author Bela Ban
  - * @version $Id: Multiplexer.java,v 1.45 2007/01/22 18:05:24 vlada Exp $
  + * @version $Id: Multiplexer.java,v 1.46 2007/01/22 21:04:23 vlada Exp $
    */
   public class Multiplexer implements UpHandler {
       /** Map<String,MuxChannel>. Maintains the mapping between service IDs and their associated MuxChannels */
  @@ -25,8 +25,7 @@
       static final Log log=LogFactory.getLog(Multiplexer.class);
       static final String SEPARATOR="::";
       static final short SEPARATOR_LEN=(short)SEPARATOR.length();
  -    static final String NAME="MUX";
  -    private final BlockOkCollector block_ok_collector=new BlockOkCollector();
  +    static final String NAME="MUX";    
   
       private MergeView temp_merge_view=null;
   
  @@ -105,14 +104,7 @@
       public boolean stateTransferListenersPresent() {
           return state_transfer_listeners != null && !state_transfer_listeners.isEmpty();
       }
  -
  -    /**
  -     * Called by a MuxChannel
  -     */
  -    public void blockOk() {
  -        block_ok_collector.increment();
  -    }
  -
  +    
       public synchronized void registerForStateTransfer(String appl_id, String substate_id) {
           String key=appl_id;
           if(substate_id != null && substate_id.length() > 0)
  @@ -338,16 +330,10 @@
                   break;
   
               case Event.BLOCK:
  -                blocked=true;
  -                int num_services=services.size();
  -                if(num_services == 0) {
  -                    channel.blockOk();
  -                    return null;
  -                }
  -                block_ok_collector.reset();
  -                passToAllMuxChannels(evt);
  -                block_ok_collector.waitUntil(num_services);
  -                channel.blockOk();
  +                blocked=true;                
  +                if(!services.isEmpty()) {
  +                   passToAllMuxChannels(evt);                  
  +                }                                           
                   return null;
   
               case Event.UNBLOCK: // process queued-up MergeViews
  @@ -1004,32 +990,4 @@
               }
           }
       }
  -
  -
  -    private static class BlockOkCollector {
  -        int num_block_oks=0;
  -
  -        synchronized void reset() {
  -            num_block_oks=0;
  -        }
  -
  -        synchronized void increment() {
  -            num_block_oks++;
  -        }
  -
  -        synchronized void waitUntil(int num) {
  -            while(num_block_oks < num) {
  -                try {
  -                    this.wait();
  -                }
  -                catch(InterruptedException e) {
  -                    Thread.currentThread().interrupt(); // set interrupt flag again
  -                }
  -            }
  -        }
  -
  -        public String toString() {
  -            return String.valueOf(num_block_oks);
  -        }
  -    }
   }

User: vlada   
  Date: 07/02/12 10:42:34

  Modified:    src/org/jgroups/mux Tag: Branch_JGroups_2_4 Multiplexer.java
  Log:
  JGRP-416
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.35.2.4  +7 -6      JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.35.2.3
  retrieving revision 1.35.2.4
  diff -u -r1.35.2.3 -r1.35.2.4
  --- Multiplexer.java	8 Jan 2007 21:00:16 -0000	1.35.2.3
  +++ Multiplexer.java	12 Feb 2007 18:42:34 -0000	1.35.2.4
  @@ -16,7 +16,7 @@
    * message is removed and the MuxChannel corresponding to the header's service ID is retrieved from the map,
    * and MuxChannel.up() is called with the message.
    * @author Bela Ban
  - * @version $Id: Multiplexer.java,v 1.35.2.3 2007/01/08 21:00:16 vlada Exp $
  + * @version $Id: Multiplexer.java,v 1.35.2.4 2007/02/12 18:42:34 vlada Exp $
    */
   public class Multiplexer implements UpHandler {
       /** Map<String,MuxChannel>. Maintains the mapping between service IDs and their associated MuxChannels */
  @@ -340,6 +340,7 @@
                   break;
   
               case Event.BLOCK:
  +            	temp_merge_view=null;
                   blocked=true;
                   int num_services=services.size();
                   if(num_services == 0) {
  @@ -830,8 +831,7 @@
   
           // merges service_responses with service_state and emits MergeViews for the services affected (MuxChannel)
           mergeServiceState(view, copy);
  -        service_responses.clear();
  -        temp_merge_view=null;
  +        service_responses.clear();       
       }
   
       private int numResponses(Map m) {
  @@ -882,9 +882,10 @@
           for(Iterator it=modified_services.iterator(); it.hasNext();) {
               service=(String)it.next();
               MuxChannel ch=(MuxChannel)services.get(service);
  -            my_services=(List)service_state.get(service);
  -            MergeView v=(MergeView)view.clone();
  -            v.getMembers().retainAll(my_services);
  +            my_services=(List)service_state.get(service);            
  +            Vector membersCopy = new Vector(view.getMembers());
  +            membersCopy.retainAll(my_services);
  +            MergeView v=new MergeView(view.getVid(), membersCopy, view.getSubgroups());
               Event evt=new Event(Event.VIEW_CHANGE, v);
               ch.up(evt);
           }

User: belaban 
  Date: 07/03/02 00:45:32

  Modified:    src/org/jgroups/mux Multiplexer.java
  Log:
  changed to use typed collections
  
  Revision  Changes    Path
  1.47      +102 -87   JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.46
  retrieving revision 1.47
  diff -u -r1.46 -r1.47
  --- Multiplexer.java	22 Jan 2007 21:04:23 -0000	1.46
  +++ Multiplexer.java	2 Mar 2007 08:45:32 -0000	1.47
  @@ -3,12 +3,15 @@
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
   import org.jgroups.*;
  +import org.jgroups.TimeoutException;
   import org.jgroups.protocols.pbcast.FLUSH;
   import org.jgroups.stack.StateTransferInfo;
  +import org.jgroups.util.FIFOMessageQueue;
   import org.jgroups.util.Promise;
   import org.jgroups.util.Util;
   
   import java.util.*;
  +import java.util.concurrent.*;
   
   /**
    * Used for dispatching incoming messages. The Multiplexer implements UpHandler and registers with the associated
  @@ -16,11 +19,11 @@
    * message is removed and the MuxChannel corresponding to the header's service ID is retrieved from the map,
    * and MuxChannel.up() is called with the message.
    * @author Bela Ban
  - * @version $Id: Multiplexer.java,v 1.46 2007/01/22 21:04:23 vlada Exp $
  + * @version $Id: Multiplexer.java,v 1.47 2007/03/02 08:45:32 belaban Exp $
    */
   public class Multiplexer implements UpHandler {
       /** Map<String,MuxChannel>. Maintains the mapping between service IDs and their associated MuxChannels */
  -    private final Map services=new HashMap();
  +    private final Map<String,MuxChannel> services=new HashMap<String,MuxChannel>();
       private final JChannel channel;
       static final Log log=LogFactory.getLog(Multiplexer.class);
       static final String SEPARATOR="::";
  @@ -32,6 +35,12 @@
       private boolean flush_present=true;
       private boolean blocked=false;
   
  +    /** Thread pool to concurrently process messages sent to different services */
  +    private static Executor thread_pool=null;
  +
  +    /** To make sure messages sent to different services are processed concurrently (using the thread pool above), but
  +     * messages to the same service are processed FIFO */
  +    private FIFOMessageQueue fifo_queue=new FIFOMessageQueue();
   
   
       /** Cluster view */
  @@ -40,22 +49,73 @@
       Address local_addr=null;
   
       /** Map<String,Boolean>. Map of service IDs and booleans that determine whether getState() has already been called */
  -    private final Map state_transfer_listeners=new HashMap();
  +    private final Map<String,Boolean> state_transfer_listeners=new HashMap<String,Boolean>();
   
       /** Map<String,List<Address>>. A map of services as keys and lists of hosts as values */
  -    private final Map service_state=new HashMap();
  +    private final Map<String,List<Address>> service_state=new HashMap<String,List<Address>>();
   
       /** Used to wait on service state information */
       private final Promise service_state_promise=new Promise();
   
       /** Map<Address, Set<String>>. Keys are senders, values are a set of services hosted by that sender.
        * Used to collect responses to LIST_SERVICES_REQ */
  -    private final Map service_responses=new HashMap();
  +    private final Map<Address, Set<String>> service_responses=new HashMap<Address, Set<String>>();
   
       private long SERVICES_RSP_TIMEOUT=10000;
   
   
   
  +    static {
  +        int min_threads=1, max_threads=10;
  +        long keep_alive=30000;
  +        boolean mux_enabled=true; // default is to use the thread pool
  +        String tmp;
  +
  +        try {
  +            tmp=System.getProperty(Global.MUX_ENABLED);
  +            if(tmp != null)
  +                mux_enabled=Boolean.parseBoolean(tmp);
  +        }
  +        catch(Throwable t) {}
  +
  +        
  +        if(mux_enabled) {
  +
  +            ThreadFactory factory=new ThreadFactory() {
  +                int num=1;
  +                ThreadGroup mux_threads=new ThreadGroup(Util.getGlobalThreadGroup(), "MultiplexerThreads");
  +                public Thread newThread(Runnable command) {
  +                    return new Thread(mux_threads, command, "Multiplexer-" + num++);
  +                }
  +            };
  +
  +            try {
  +                tmp=System.getProperty(Global.MUX_MIN_THREADS);
  +                if(tmp != null)
  +                    min_threads=Integer.parseInt(tmp);
  +            }
  +            catch(Throwable t) {}
  +
  +            try {
  +                tmp=System.getProperty(Global.MUX_MAX_THREADS);
  +                if(tmp != null)
  +                    max_threads=Integer.parseInt(tmp);
  +            }
  +            catch(Throwable t) {}
  +
  +            try {
  +                tmp=System.getProperty(Global.MUX_KEEPALIVE);
  +                if(tmp != null)
  +                    keep_alive=Long.parseLong(tmp);
  +            }
  +            catch(Throwable t) {}
  +
  +            thread_pool=new ThreadPoolExecutor(min_threads, max_threads, keep_alive, TimeUnit.MILLISECONDS,
  +                                               new SynchronousQueue(), factory, new ThreadPoolExecutor.CallerRunsPolicy());
  +        }
  +    }
  +
  +
   
       public Multiplexer() {
           this.channel=null;
  @@ -77,7 +137,7 @@
           return services != null? services.keySet() : null;
       }
   
  -    public Set getServiceIds() {
  +    public Set<String> getServiceIds() {
           return services != null? services.keySet() : null;
       }
   
  @@ -96,7 +156,7 @@
        * @return The service view
        */
       public View getServiceView(String service_id) {
  -        List hosts=(List)service_state.get(service_id);
  +        List hosts=service_state.get(service_id);
           if(hosts == null) return null;
           return generateServiceView(hosts);
       }
  @@ -226,9 +286,12 @@
   
   
   
  -
  -   public Object up(Event evt) {
  -        // remove header and dispatch to correct MuxChannel
  +    /**
  +     * Remove mux header and dispatch to correct MuxChannel
  +     * @param evt
  +     * @return
  +     */
  +    public Object up(Event evt) {
           MuxHeader hdr;
   
           switch(evt.getType()) {
  @@ -251,7 +314,7 @@
                       break;
                   }
   
  -                MuxChannel mux_ch=(MuxChannel)services.get(hdr.id);
  +                MuxChannel mux_ch=services.get(hdr.id);
                   if(mux_ch == null) {
                       log.warn("service " + hdr.id + " not currently running, discarding message " + msg);
                       return null;
  @@ -317,7 +380,7 @@
   
               case Event.GET_APPLSTATE:
               case Event.STATE_TRANSFER_OUTPUTSTREAM:
  -                return returnStateRequest(evt);
  +                return handleStateRequest(evt);
   
               case Event.GET_STATE_OK:
               case Event.STATE_TRANSFER_INPUTSTREAM:
  @@ -330,10 +393,10 @@
                   break;
   
               case Event.BLOCK:
  -                blocked=true;                
  +                blocked=true;
                   if(!services.isEmpty()) {
  -                   passToAllMuxChannels(evt);                  
  -                }                                           
  +                    passToAllMuxChannels(evt);
  +                }
                   return null;
   
               case Event.UNBLOCK: // process queued-up MergeViews
  @@ -374,9 +437,9 @@
                   passToAllMuxChannels(evt);
                   break;
           }
  +        return null;
  +    }
   
  -       return null;
  -   }
   
       public Channel createMuxChannel(JChannelFactory f, String id, String stack_name) throws Exception {
           MuxChannel ch;
  @@ -393,15 +456,14 @@
   
   
       private void passToAllMuxChannels(Event evt) {
  -        for(Iterator it=services.values().iterator(); it.hasNext();) {
  -            MuxChannel ch=(MuxChannel)it.next();
  +        for(MuxChannel ch: services.values()) {
               ch.up(evt);
           }
       }
   
       public MuxChannel remove(String id) {
           synchronized(services) {
  -            return (MuxChannel)services.remove(id);
  +            return services.remove(id);
           }
       }
   
  @@ -409,11 +471,9 @@
   
       /** Closes the underlying JChannel if all MuxChannels have been disconnected */
       public void disconnect() {
  -        MuxChannel mux_ch;
           boolean all_disconnected=true;
           synchronized(services) {
  -            for(Iterator it=services.values().iterator(); it.hasNext();) {
  -                mux_ch=(MuxChannel)it.next();
  +            for(MuxChannel mux_ch: services.values()) {
                   if(mux_ch.isConnected()) {
                       all_disconnected=false;
                       break;
  @@ -436,11 +496,9 @@
       }
   
       public boolean close() {
  -        MuxChannel mux_ch;
           boolean all_closed=true;
           synchronized(services) {
  -            for(Iterator it=services.values().iterator(); it.hasNext();) {
  -                mux_ch=(MuxChannel)it.next();
  +            for(MuxChannel mux_ch: services.values()) {
                   if(mux_ch.isOpen()) {
                       all_closed=false;
                       break;
  @@ -459,9 +517,7 @@
   
       public void closeAll() {
           synchronized(services) {
  -            MuxChannel mux_ch;
  -            for(Iterator it=services.values().iterator(); it.hasNext();) {
  -                mux_ch=(MuxChannel)it.next();
  +            for(MuxChannel mux_ch: services.values()) {
                   mux_ch.setConnected(false);
                   mux_ch.setClosed(true);
                   mux_ch.closeMessageQueue(true);
  @@ -470,11 +526,9 @@
       }
   
       public boolean shutdown() {
  -        MuxChannel mux_ch;
           boolean all_closed=true;
           synchronized(services) {
  -            for(Iterator it=services.values().iterator(); it.hasNext();) {
  -                mux_ch=(MuxChannel)it.next();
  +            for(MuxChannel mux_ch: services.values()) {
                   if(mux_ch.isOpen()) {
                       all_closed=false;
                       break;
  @@ -530,9 +584,7 @@
       }
   
       /**
  -    *
       * Returns an Address of a state provider for a given service_id.
  -    *  
       * If preferredTarget is a member of a service view for a given service_id 
       * then preferredTarget is returned. Otherwise, service view coordinator is 
       * returned if such node exists. If service view is empty for a given service_id 
  @@ -544,7 +596,7 @@
       */
       public Address getStateProvider(Address preferredTarget, String service_id) {
           Address result = null;      
  -        List hosts = (List)service_state.get(service_id);       
  +        List hosts=service_state.get(service_id);
           if(hosts != null && !hosts.isEmpty()){
              if(hosts.contains(preferredTarget)){
                 result = preferredTarget;
  @@ -577,43 +629,12 @@
       }
   
   
  -    private void handleStateRequest(Event evt) {
  -        StateTransferInfo info=(StateTransferInfo)evt.getArg();
  -        String id=info.state_id;
  -        String original_id=id;
  -        MuxChannel mux_ch=null;
  -
  -        try {
  -            int index=id.indexOf(SEPARATOR);
  -            if(index > -1) {
  -                info.state_id=id.substring(index + SEPARATOR_LEN);
  -                id=id.substring(0, index);  // similar reuse as above...
  -            }
  -            else {
  -                info.state_id=null;
  -            }
  -
  -            mux_ch=(MuxChannel)services.get(id);
  -            if(mux_ch == null)
  -                throw new IllegalArgumentException("didn't find service with ID=" + id + " to fetch state from");
  -
  -            // evt.setArg(info);
  -            mux_ch.up(evt); // state_id will be null, get regular state from the service named state_id
  -        }
  -        catch(Throwable ex) {
  -            if(log.isErrorEnabled())
  -                log.error("failed returning the application state, will return null", ex);
  -            channel.returnState(null, original_id); // we cannot use mux_ch because it might be null due to the lookup above
  -        }
  -    }
  -
  -
   
  -    private Object returnStateRequest(Event evt) {
  +    private Object handleStateRequest(Event evt) {
           StateTransferInfo info=(StateTransferInfo)evt.getArg();
           String id=info.state_id;
           String original_id=id;
  -        MuxChannel mux_ch=null;
  +        Address requester=info.target; // the sender of the state request
   
           try {
               int index=id.indexOf(SEPARATOR);
  @@ -625,11 +646,9 @@
                   info.state_id=null;
               }
   
  -            mux_ch=(MuxChannel)services.get(id);
  +            MuxChannel mux_ch=services.get(id);
               if(mux_ch == null)
                   throw new IllegalArgumentException("didn't find service with ID=" + id + " to fetch state from");
  -
  -            // evt.setArg(info);
               return mux_ch.up(evt); // state_id will be null, get regular state from the service named state_id
           }
           catch(Throwable ex) {
  @@ -644,6 +663,7 @@
       private void handleStateResponse(Event evt) {
           StateTransferInfo info=(StateTransferInfo)evt.getArg();
           MuxChannel mux_ch;
  +        Address state_sender=info.target;
   
           String appl_id, substate_id, tmp;
           tmp=info.state_id;
  @@ -664,7 +684,7 @@
               substate_id=null;
           }
   
  -        mux_ch=(MuxChannel)services.get(appl_id);
  +        mux_ch=services.get(appl_id);
           if(mux_ch == null) {
               log.error("didn't find service with ID=" + appl_id + " to fetch state from");
           }
  @@ -718,7 +738,7 @@
   
   
           synchronized(service_responses) {
  -            Set tmp=(Set)service_responses.get(sender);
  +            Set tmp=service_responses.get(sender);
               if(tmp == null)
                   tmp=new HashSet();
               tmp.addAll(s);
  @@ -741,7 +761,7 @@
           }
   
           synchronized(service_state) {
  -            hosts=(List)service_state.get(service);
  +            hosts=service_state.get(service);
               if(hosts == null)
                   return;
               removed=hosts.remove(host);
  @@ -751,7 +771,7 @@
           if(removed) {
               View service_view=generateServiceView(hosts_copy);
               if(service_view != null) {
  -                MuxChannel ch=(MuxChannel)services.get(service);
  +                MuxChannel ch=services.get(service);
                   if(ch != null) {
                       Event view_evt=new Event(Event.VIEW_CHANGE, service_view);
                       ch.up(view_evt);
  @@ -779,7 +799,7 @@
           }
   
           synchronized(service_state) {
  -            hosts=(List)service_state.get(service);
  +            hosts=service_state.get(service);
               if(hosts == null) {
                   hosts=new ArrayList();
                   service_state.put(service,  hosts);
  @@ -794,7 +814,7 @@
           if(added) {
               View service_view=generateServiceView(hosts_copy);
               if(service_view != null) {
  -                MuxChannel ch=(MuxChannel)services.get(service);
  +                MuxChannel ch=services.get(service);
                   if(ch != null) {
                       Event view_evt=new Event(Event.VIEW_CHANGE, service_view);
                       ch.up(view_evt);
  @@ -824,14 +844,9 @@
               start=System.currentTimeMillis();
               try {
                   while(time_to_wait > 0 && numResponses(service_responses) < num_members) {
  -                    // System.out.println("time_to_wait=" + time_to_wait + ", numResponses(service_responses)=" + numResponses(service_responses) +
  -                       //     ", num_members=" + num_members + ", service_state=" + service_state);
                       service_responses.wait(time_to_wait);
                       time_to_wait-=System.currentTimeMillis() - start;
                   }
  -
  -                // System.out.println("wait terminated: time_to_wait=" + time_to_wait + ", numResponses(service_responses)=" + numResponses(service_responses) +
  -                   //     ", num_members=" + num_members + ", service_state=" + service_state);
                   copy=new HashMap(service_responses);
               }
               catch(Exception ex) {
  @@ -879,7 +894,7 @@
   
                   for(Iterator it2=service_list.iterator(); it2.hasNext();) {
                       service=(String)it2.next();
  -                    my_services=(List)service_state.get(service);
  +                    my_services=service_state.get(service);
                       if(my_services == null) {
                           my_services=new ArrayList();
                           service_state.put(service, my_services);
  @@ -896,8 +911,8 @@
           // now emit MergeViews for all services which were modified
           for(Iterator it=modified_services.iterator(); it.hasNext();) {
               service=(String)it.next();
  -            MuxChannel ch=(MuxChannel)services.get(service);
  -            my_services=(List)service_state.get(service);
  +            MuxChannel ch=services.get(service);
  +            my_services=service_state.get(service);
               MergeView v=(MergeView)view.clone();
               v.getMembers().retainAll(my_services);
               Event evt=new Event(Event.VIEW_CHANGE, v);
  @@ -938,7 +953,7 @@
                   if(removed) {
                       View service_view=generateServiceView(hosts_copy);
                       if(service_view != null) {
  -                        MuxChannel ch=(MuxChannel)services.get(service);
  +                        MuxChannel ch=services.get(service);
                           if(ch != null) {
                               Event view_evt=new Event(Event.VIEW_CHANGE, service_view);
                               ch.up(view_evt);
  @@ -984,7 +999,7 @@
       public void addServiceIfNotPresent(String id, MuxChannel ch) {
           MuxChannel tmp;
           synchronized(services) {
  -            tmp=(MuxChannel)services.get(id);
  +            tmp=services.get(id);
               if(tmp == null) {
                   services.put(id, ch);
               }

User: belaban 
  Date: 07/03/02 01:21:28

  Modified:    src/org/jgroups/mux Multiplexer.java
  Log:
  ns
  
  Revision  Changes    Path
  1.48      +4 -6      JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.47
  retrieving revision 1.48
  diff -u -r1.47 -r1.48
  --- Multiplexer.java	2 Mar 2007 08:45:32 -0000	1.47
  +++ Multiplexer.java	2 Mar 2007 09:21:28 -0000	1.48
  @@ -19,7 +19,7 @@
    * message is removed and the MuxChannel corresponding to the header's service ID is retrieved from the map,
    * and MuxChannel.up() is called with the message.
    * @author Bela Ban
  - * @version $Id: Multiplexer.java,v 1.47 2007/03/02 08:45:32 belaban Exp $
  + * @version $Id: Multiplexer.java,v 1.48 2007/03/02 09:21:28 belaban Exp $
    */
   public class Multiplexer implements UpHandler {
       /** Map<String,MuxChannel>. Maintains the mapping between service IDs and their associated MuxChannels */
  @@ -291,13 +291,11 @@
        * @param evt
        * @return
        */
  -    public Object up(Event evt) {
  -        MuxHeader hdr;
  -
  +    public Object up(final Event evt) {
           switch(evt.getType()) {
               case Event.MSG:
  -                Message msg=(Message)evt.getArg();
  -                hdr=(MuxHeader)msg.getHeader(NAME);
  +                final Message msg=(Message)evt.getArg();
  +                final MuxHeader hdr=(MuxHeader)msg.getHeader(NAME);
                   if(hdr == null) {
                       log.error("MuxHeader not present - discarding message " + msg);
                       return null;

User: belaban 
  Date: 07/03/02 07:06:23

  Modified:    src/org/jgroups/mux Multiplexer.java
  Log:
  fixed state transfer with incorrect id
  
  Revision  Changes    Path
  1.49      +69 -5     JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.48
  retrieving revision 1.49
  diff -u -r1.48 -r1.49
  --- Multiplexer.java	2 Mar 2007 09:21:28 -0000	1.48
  +++ Multiplexer.java	2 Mar 2007 15:06:23 -0000	1.49
  @@ -19,7 +19,7 @@
    * message is removed and the MuxChannel corresponding to the header's service ID is retrieved from the map,
    * and MuxChannel.up() is called with the message.
    * @author Bela Ban
  - * @version $Id: Multiplexer.java,v 1.48 2007/03/02 09:21:28 belaban Exp $
  + * @version $Id: Multiplexer.java,v 1.49 2007/03/02 15:06:23 belaban Exp $
    */
   public class Multiplexer implements UpHandler {
       /** Map<String,MuxChannel>. Maintains the mapping between service IDs and their associated MuxChannels */
  @@ -40,7 +40,7 @@
   
       /** To make sure messages sent to different services are processed concurrently (using the thread pool above), but
        * messages to the same service are processed FIFO */
  -    private FIFOMessageQueue fifo_queue=new FIFOMessageQueue();
  +    private FIFOMessageQueue<String,Runnable> fifo_queue=new FIFOMessageQueue<String,Runnable>();
   
   
       /** Cluster view */
  @@ -301,9 +301,10 @@
                       return null;
                   }
   
  +                Address sender=msg.getSrc();
                   if(hdr.info != null) { // it is a service state request - not a default multiplex request
                       try {
  -                        handleServiceStateRequest(hdr.info, msg.getSrc());
  +                        handleServiceStateRequest(hdr.info, sender);
                       }
                       catch(Exception e) {
                           if(log.isErrorEnabled())
  @@ -317,7 +318,8 @@
                       log.warn("service " + hdr.id + " not currently running, discarding message " + msg);
                       return null;
                   }
  -                return mux_ch.up(evt);
  +                // return mux_ch.up(evt);
  +                return passToMuxChannel(mux_ch, evt, fifo_queue, sender, hdr.id, false); // don't block !
   
               case Event.VIEW_CHANGE:
                   Vector old_members=view != null? view.getMembers() : null;
  @@ -647,7 +649,12 @@
               MuxChannel mux_ch=services.get(id);
               if(mux_ch == null)
                   throw new IllegalArgumentException("didn't find service with ID=" + id + " to fetch state from");
  -            return mux_ch.up(evt); // state_id will be null, get regular state from the service named state_id
  +            // return mux_ch.up(evt); // state_id will be null, get regular state from the service named state_id
  +
  +            // state_id will be null, get regular state from the service named state_id
  +            StateTransferInfo ret=(StateTransferInfo)passToMuxChannel(mux_ch, evt, fifo_queue, requester, id, true);
  +            ret.state_id=original_id;
  +            return ret;
           }
           catch(Throwable ex) {
               if(log.isErrorEnabled())
  @@ -994,6 +1001,31 @@
       }
   
   
  +    private Object passToMuxChannel(MuxChannel ch, Event evt, final FIFOMessageQueue<String,Runnable> queue,
  +                                         final Address sender, final String dest, boolean block) {
  +        if(thread_pool == null)
  +            return ch.up(evt);
  +
  +        Runnable finalizer=new Runnable() {
  +            public void run() {
  +                queue.done(sender, dest);
  +            }
  +        };
  +
  +        Task task=new Task(ch, evt, finalizer, block);
  +        thread_pool.execute(task);
  +        if(block) {
  +            try {
  +                return task.exchanger.exchange(null);
  +            }
  +            catch(InterruptedException e) {
  +                Thread.currentThread().interrupt();
  +            }
  +        }
  +        
  +        return null;
  +    }
  +
       public void addServiceIfNotPresent(String id, MuxChannel ch) {
           MuxChannel tmp;
           synchronized(services) {
  @@ -1003,4 +1035,36 @@
               }
           }
       }
  +
  +
  +    private static class Task implements Runnable {
  +        Exchanger<Object> exchanger;
  +        MuxChannel        channel;
  +        Event             evt;
  +        Runnable          finalizer;
  +
  +        Task(MuxChannel channel, Event evt, Runnable finalizer, boolean result_expected) {
  +            this.channel=channel;
  +            this.evt=evt;
  +            this.finalizer=finalizer;
  +            if(result_expected)
  +                exchanger=new Exchanger<Object>();
  +        }
  +
  +        public void run() {
  +            Object retval;
  +            try {
  +                retval=channel.up(evt);
  +                if(exchanger != null)
  +                    exchanger.exchange(retval);
  +            }
  +            catch(InterruptedException e) {
  +                Thread.currentThread().interrupt(); // let the thread pool handle the interrupt - we're done anyway
  +            }
  +            finally {
  +                if(finalizer != null)
  +                    finalizer.run();
  +            }
  +        }
  +    }
   }

User: belaban 
  Date: 07/03/05 01:34:46

  Modified:    src/org/jgroups/mux Multiplexer.java
  Log:
  done() now correctly resets Entry.ready to true
  
  Revision  Changes    Path
  1.50      +54 -24    JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.49
  retrieving revision 1.50
  diff -u -r1.49 -r1.50
  --- Multiplexer.java	2 Mar 2007 15:06:23 -0000	1.49
  +++ Multiplexer.java	5 Mar 2007 09:34:46 -0000	1.50
  @@ -19,7 +19,7 @@
    * message is removed and the MuxChannel corresponding to the header's service ID is retrieved from the map,
    * and MuxChannel.up() is called with the message.
    * @author Bela Ban
  - * @version $Id: Multiplexer.java,v 1.49 2007/03/02 15:06:23 belaban Exp $
  + * @version $Id: Multiplexer.java,v 1.50 2007/03/05 09:34:46 belaban Exp $
    */
   public class Multiplexer implements UpHandler {
       /** Map<String,MuxChannel>. Maintains the mapping between service IDs and their associated MuxChannels */
  @@ -66,7 +66,7 @@
   
   
       static {
  -        int min_threads=1, max_threads=10;
  +        int min_threads=1, max_threads=4;
           long keep_alive=30000;
           boolean mux_enabled=true; // default is to use the thread pool
           String tmp;
  @@ -318,7 +318,6 @@
                       log.warn("service " + hdr.id + " not currently running, discarding message " + msg);
                       return null;
                   }
  -                // return mux_ch.up(evt);
                   return passToMuxChannel(mux_ch, evt, fifo_queue, sender, hdr.id, false); // don't block !
   
               case Event.VIEW_CHANGE:
  @@ -456,8 +455,13 @@
   
   
       private void passToAllMuxChannels(Event evt) {
  -        for(MuxChannel ch: services.values()) {
  -            ch.up(evt);
  +        String service_name;
  +        MuxChannel ch;
  +        for(Map.Entry<String,MuxChannel> entry: services.entrySet()) {
  +            service_name=entry.getKey();
  +            ch=entry.getValue();
  +            // these events are directly delivered, don't get added to any queue
  +            passToMuxChannel(ch, evt, fifo_queue, null, service_name, false);
           }
       }
   
  @@ -1006,23 +1010,26 @@
           if(thread_pool == null)
               return ch.up(evt);
   
  -        Runnable finalizer=new Runnable() {
  -            public void run() {
  -                queue.done(sender, dest);
  -            }
  -        };
  +        Task task=new Task(ch, evt, queue, sender, dest, block);
  +        ExecuteTask execute_task=new ExecuteTask(fifo_queue);  // takes Task from queue and executes it
   
  -        Task task=new Task(ch, evt, finalizer, block);
  -        thread_pool.execute(task);
  -        if(block) {
  -            try {
  -                return task.exchanger.exchange(null);
  -            }
  -            catch(InterruptedException e) {
  -                Thread.currentThread().interrupt();
  +        try {
  +            fifo_queue.put(sender, dest, task);
  +            thread_pool.execute(execute_task);
  +            if(block) {
  +                try {
  +                    return task.exchanger.exchange(null);
  +                }
  +                catch(InterruptedException e) {
  +                    Thread.currentThread().interrupt();
  +                }
               }
  +
  +            // fifo_queue.done(sender, dest);
  +        }
  +        catch(InterruptedException e) {
  +            Thread.currentThread().interrupt();
           }
  -        
           return null;
       }
   
  @@ -1041,12 +1048,16 @@
           Exchanger<Object> exchanger;
           MuxChannel        channel;
           Event             evt;
  -        Runnable          finalizer;
  +        FIFOMessageQueue<String,Runnable> queue;
  +        Address           sender;
  +        String            dest;
   
  -        Task(MuxChannel channel, Event evt, Runnable finalizer, boolean result_expected) {
  +        Task(MuxChannel channel, Event evt, FIFOMessageQueue<String,Runnable> queue, Address sender, String dest, boolean result_expected) {
               this.channel=channel;
               this.evt=evt;
  -            this.finalizer=finalizer;
  +            this.queue=queue;
  +            this.sender=sender;
  +            this.dest=dest;
               if(result_expected)
                   exchanger=new Exchanger<Object>();
           }
  @@ -1062,9 +1073,28 @@
                   Thread.currentThread().interrupt(); // let the thread pool handle the interrupt - we're done anyway
               }
               finally {
  -                if(finalizer != null)
  -                    finalizer.run();
  +                queue.done(sender, dest);
               }
           }
       }
  +
  +
  +    private static class ExecuteTask implements Runnable {
  +        FIFOMessageQueue<String,Runnable> queue;
  +
  +        public ExecuteTask(FIFOMessageQueue<String,Runnable> queue) {
  +            this.queue=queue;
  +        }
  +
  +        public void run() {
  +            try {
  +                Runnable task=queue.take();
  +                task.run();
  +            }
  +            catch(InterruptedException e) {
  +            }
  +        }
  +    }
  +
  +
   }

User: belaban 
  Date: 07/03/05 05:33:42

  Modified:    src/org/jgroups/mux Multiplexer.java
  Log:
  all MuxChannel.up() calls are now handled by passToMuxChannel()
  
  Revision  Changes    Path
  1.51      +13 -11    JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.50
  retrieving revision 1.51
  diff -u -r1.50 -r1.51
  --- Multiplexer.java	5 Mar 2007 09:34:46 -0000	1.50
  +++ Multiplexer.java	5 Mar 2007 13:33:42 -0000	1.51
  @@ -19,7 +19,7 @@
    * message is removed and the MuxChannel corresponding to the header's service ID is retrieved from the map,
    * and MuxChannel.up() is called with the message.
    * @author Bela Ban
  - * @version $Id: Multiplexer.java,v 1.50 2007/03/05 09:34:46 belaban Exp $
  + * @version $Id: Multiplexer.java,v 1.51 2007/03/05 13:33:42 belaban Exp $
    */
   public class Multiplexer implements UpHandler {
       /** Map<String,MuxChannel>. Maintains the mapping between service IDs and their associated MuxChannels */
  @@ -85,7 +85,9 @@
                   int num=1;
                   ThreadGroup mux_threads=new ThreadGroup(Util.getGlobalThreadGroup(), "MultiplexerThreads");
                   public Thread newThread(Runnable command) {
  -                    return new Thread(mux_threads, command, "Multiplexer-" + num++);
  +                    Thread ret=new Thread(mux_threads, command, "Multiplexer-" + num++);
  +                    ret.setDaemon(true);
  +                    return ret;
                   }
               };
   
  @@ -653,7 +655,6 @@
               MuxChannel mux_ch=services.get(id);
               if(mux_ch == null)
                   throw new IllegalArgumentException("didn't find service with ID=" + id + " to fetch state from");
  -            // return mux_ch.up(evt); // state_id will be null, get regular state from the service named state_id
   
               // state_id will be null, get regular state from the service named state_id
               StateTransferInfo ret=(StateTransferInfo)passToMuxChannel(mux_ch, evt, fifo_queue, requester, id, true);
  @@ -700,9 +701,8 @@
           else {
               StateTransferInfo tmp_info=info.copy();
               tmp_info.state_id=substate_id;
  -            // evt.setArg(tmp_info);
               Event tmpEvt=new Event(evt.getType(), tmp_info);
  -            mux_ch.up(tmpEvt); // state_id will be null, get regular state from the service named state_id
  +            passToMuxChannel(mux_ch, tmpEvt, fifo_queue, state_sender, appl_id, false);
           }
       }
   
  @@ -783,7 +783,8 @@
                   MuxChannel ch=services.get(service);
                   if(ch != null) {
                       Event view_evt=new Event(Event.VIEW_CHANGE, service_view);
  -                    ch.up(view_evt);
  +                    // ch.up(view_evt);
  +                    passToMuxChannel(ch, view_evt, fifo_queue, null, service, false);
                   }
                   else {
                       if(log.isTraceEnabled())
  @@ -826,7 +827,8 @@
                   MuxChannel ch=services.get(service);
                   if(ch != null) {
                       Event view_evt=new Event(Event.VIEW_CHANGE, service_view);
  -                    ch.up(view_evt);
  +                    // ch.up(view_evt);
  +                    passToMuxChannel(ch, view_evt, fifo_queue, null, service, false);
                   }
                   else {
                       if(log.isTraceEnabled())
  @@ -925,7 +927,8 @@
               MergeView v=(MergeView)view.clone();
               v.getMembers().retainAll(my_services);
               Event evt=new Event(Event.VIEW_CHANGE, v);
  -            ch.up(evt);
  +            // ch.up(evt);
  +            passToMuxChannel(ch, evt, fifo_queue, null, service, false);
           }
       }
   
  @@ -965,7 +968,8 @@
                           MuxChannel ch=services.get(service);
                           if(ch != null) {
                               Event view_evt=new Event(Event.VIEW_CHANGE, service_view);
  -                            ch.up(view_evt);
  +                            // ch.up(view_evt);
  +                            passToMuxChannel(ch, view_evt, fifo_queue, null, service, false);
                           }
                           else {
                               if(log.isTraceEnabled())
  @@ -1024,8 +1028,6 @@
                       Thread.currentThread().interrupt();
                   }
               }
  -
  -            // fifo_queue.done(sender, dest);
           }
           catch(InterruptedException e) {
               Thread.currentThread().interrupt();

User: vlada   
  Date: 07/03/12 06:44:25

  Modified:    src/org/jgroups/mux Multiplexer.java
  Log:
  JGRP-416
  
  Revision  Changes    Path
  1.52      +5 -4      JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.51
  retrieving revision 1.52
  diff -u -r1.51 -r1.52
  --- Multiplexer.java	5 Mar 2007 13:33:42 -0000	1.51
  +++ Multiplexer.java	12 Mar 2007 13:44:25 -0000	1.52
  @@ -19,7 +19,7 @@
    * message is removed and the MuxChannel corresponding to the header's service ID is retrieved from the map,
    * and MuxChannel.up() is called with the message.
    * @author Bela Ban
  - * @version $Id: Multiplexer.java,v 1.51 2007/03/05 13:33:42 belaban Exp $
  + * @version $Id: Multiplexer.java,v 1.52 2007/03/12 13:44:25 vlada Exp $
    */
   public class Multiplexer implements UpHandler {
       /** Map<String,MuxChannel>. Maintains the mapping between service IDs and their associated MuxChannels */
  @@ -923,9 +923,10 @@
           for(Iterator it=modified_services.iterator(); it.hasNext();) {
               service=(String)it.next();
               MuxChannel ch=services.get(service);
  -            my_services=service_state.get(service);
  -            MergeView v=(MergeView)view.clone();
  -            v.getMembers().retainAll(my_services);
  +            my_services=service_state.get(service);           
  +            Vector membersCopy = new Vector(view.getMembers());
  +            membersCopy.retainAll(my_services);
  +            MergeView v=new MergeView(view.getVid(), membersCopy, view.getSubgroups());
               Event evt=new Event(Event.VIEW_CHANGE, v);
               // ch.up(evt);
               passToMuxChannel(ch, evt, fifo_queue, null, service, false);

User: vlada   
  Date: 07/04/16 07:22:58

  Modified:    src/org/jgroups/mux Multiplexer.java
  Log:
  (JGRP-456) Make thread pool in Multiplexer non-static, implement shutdown
  
  Revision  Changes    Path
  1.53      +54 -60    JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.52
  retrieving revision 1.53
  diff -u -r1.52 -r1.53
  --- Multiplexer.java	12 Mar 2007 13:44:25 -0000	1.52
  +++ Multiplexer.java	16 Apr 2007 14:22:58 -0000	1.53
  @@ -19,7 +19,7 @@
    * message is removed and the MuxChannel corresponding to the header's service ID is retrieved from the map,
    * and MuxChannel.up() is called with the message.
    * @author Bela Ban
  - * @version $Id: Multiplexer.java,v 1.52 2007/03/12 13:44:25 vlada Exp $
  + * @version $Id: Multiplexer.java,v 1.53 2007/04/16 14:22:58 vlada Exp $
    */
   public class Multiplexer implements UpHandler {
       /** Map<String,MuxChannel>. Maintains the mapping between service IDs and their associated MuxChannels */
  @@ -36,7 +36,7 @@
       private boolean blocked=false;
   
       /** Thread pool to concurrently process messages sent to different services */
  -    private static Executor thread_pool=null;
  +    private ExecutorService thread_pool;
   
       /** To make sure messages sent to different services are processed concurrently (using the thread pool above), but
        * messages to the same service are processed FIFO */
  @@ -63,72 +63,26 @@
   
       private long SERVICES_RSP_TIMEOUT=10000;
   
  -
  -
  -    static {
  -        int min_threads=1, max_threads=4;
  -        long keep_alive=30000;
  -        boolean mux_enabled=true; // default is to use the thread pool
  -        String tmp;
  -
  -        try {
  -            tmp=System.getProperty(Global.MUX_ENABLED);
  -            if(tmp != null)
  -                mux_enabled=Boolean.parseBoolean(tmp);
  -        }
  -        catch(Throwable t) {}
  -
  -        
  -        if(mux_enabled) {
  -
  -            ThreadFactory factory=new ThreadFactory() {
  -                int num=1;
  -                ThreadGroup mux_threads=new ThreadGroup(Util.getGlobalThreadGroup(), "MultiplexerThreads");
  -                public Thread newThread(Runnable command) {
  -                    Thread ret=new Thread(mux_threads, command, "Multiplexer-" + num++);
  -                    ret.setDaemon(true);
  -                    return ret;
  -                }
  -            };
  -
  -            try {
  -                tmp=System.getProperty(Global.MUX_MIN_THREADS);
  -                if(tmp != null)
  -                    min_threads=Integer.parseInt(tmp);
  -            }
  -            catch(Throwable t) {}
  -
  -            try {
  -                tmp=System.getProperty(Global.MUX_MAX_THREADS);
  -                if(tmp != null)
  -                    max_threads=Integer.parseInt(tmp);
  -            }
  -            catch(Throwable t) {}
  -
  -            try {
  -                tmp=System.getProperty(Global.MUX_KEEPALIVE);
  -                if(tmp != null)
  -                    keep_alive=Long.parseLong(tmp);
  -            }
  -            catch(Throwable t) {}
  -
  -            thread_pool=new ThreadPoolExecutor(min_threads, max_threads, keep_alive, TimeUnit.MILLISECONDS,
  -                                               new SynchronousQueue(), factory, new ThreadPoolExecutor.CallerRunsPolicy());
  -        }
  -    }
  -
  -
  -
       public Multiplexer() {
           this.channel=null;
  -        flush_present=isFlushPresent();
  +        flush_present=isFlushPresent(); 
  +        
  +        // threadpool is enabled by default
  +	if(Global.getPropertyAsBoolean(Global.MUX_ENABLED, true)){
  +	    thread_pool = createThreadPool();
  +	}
       }
   
       public Multiplexer(JChannel channel) {
           this.channel=channel;
           this.channel.setUpHandler(this);
           this.channel.setOpt(Channel.BLOCK, Boolean.TRUE); // we want to handle BLOCK events ourselves
  -        flush_present=isFlushPresent();
  +        flush_present=isFlushPresent(); 
  +        
  +        //threadpool is enabled by default
  +        if(Global.getPropertyAsBoolean(Global.MUX_ENABLED, true)){
  +	    thread_pool = createThreadPool();
  +	}
       }
   
       /**
  @@ -208,6 +162,43 @@
           state_transfer_listeners.clear();        
           return rc;
       }
  +    
  +    protected ExecutorService createThreadPool() {
  +	int min_threads = 1, max_threads = 4;
  +	long keep_alive = 30000;
  +
  +	ThreadFactory factory = new ThreadFactory() {
  +	    int num = 1;
  +
  +	    ThreadGroup mux_threads = new ThreadGroup(Util.getGlobalThreadGroup(),
  +						      "MultiplexerThreads");
  +
  +	    public Thread newThread(Runnable command) {
  +		Thread ret = new Thread(mux_threads, command, "Multiplexer-" + num++);
  +		ret.setDaemon(true);
  +		return ret;
  +	    }
  +	};
  +
  +	min_threads = Global.getPropertyAsInteger(Global.MUX_MIN_THREADS, min_threads);
  +	max_threads = Global.getPropertyAsInteger(Global.MUX_MAX_THREADS, max_threads);
  +	keep_alive = Global.getPropertyAsLong(Global.MUX_KEEPALIVE, keep_alive);
  +
  +	return new ThreadPoolExecutor(min_threads, max_threads, keep_alive, TimeUnit.MILLISECONDS,
  +				      new SynchronousQueue(), factory,
  +				      new ThreadPoolExecutor.CallerRunsPolicy());
  +    }
  +    
  +    protected void shutdownThreadPool() {
  +	if(thread_pool != null && !thread_pool.isShutdown()){
  +	    thread_pool.shutdownNow();
  +	    try{
  +		thread_pool.awaitTermination(Global.THREADPOOL_SHUTDOWN_WAIT_TIME,
  +					     TimeUnit.MILLISECONDS);
  +	    }catch(InterruptedException e){
  +	    }
  +	}
  +    }
   
       /** Fetches the app states for all service IDs in keys.
        * The keys are a duplicate list, so it cannot be modified by the caller of this method
  @@ -516,6 +507,7 @@
                   }
                   channel.close();
                   services.clear();
  +                shutdownThreadPool();
               }
               return all_closed;
           }
  @@ -529,6 +521,7 @@
                   mux_ch.closeMessageQueue(true);
               }
           }
  +        shutdownThreadPool();
       }
   
       public boolean shutdown() {
  @@ -546,6 +539,7 @@
                   }
                   channel.shutdown();
                   services.clear();
  +                shutdownThreadPool();
               }
               return all_closed;
           }

User: vlada   
  Date: 07/04/19 11:47:20

  Modified:    src/org/jgroups/mux Multiplexer.java
  Log:
  prevent NPE for returned StateTransferInfo
  StateTransferInfo might be null for certain channel state transfer misconfigurations
  
  Revision  Changes    Path
  1.54      +3 -2      JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.53
  retrieving revision 1.54
  diff -u -r1.53 -r1.54
  --- Multiplexer.java	16 Apr 2007 14:22:58 -0000	1.53
  +++ Multiplexer.java	19 Apr 2007 18:47:19 -0000	1.54
  @@ -19,7 +19,7 @@
    * message is removed and the MuxChannel corresponding to the header's service ID is retrieved from the map,
    * and MuxChannel.up() is called with the message.
    * @author Bela Ban
  - * @version $Id: Multiplexer.java,v 1.53 2007/04/16 14:22:58 vlada Exp $
  + * @version $Id: Multiplexer.java,v 1.54 2007/04/19 18:47:19 vlada Exp $
    */
   public class Multiplexer implements UpHandler {
       /** Map<String,MuxChannel>. Maintains the mapping between service IDs and their associated MuxChannels */
  @@ -652,7 +652,8 @@
   
               // state_id will be null, get regular state from the service named state_id
               StateTransferInfo ret=(StateTransferInfo)passToMuxChannel(mux_ch, evt, fifo_queue, requester, id, true);
  -            ret.state_id=original_id;
  +            if(ret != null)
  +        	ret.state_id=original_id;
               return ret;
           }
           catch(Throwable ex) {

User: vlada   
  Date: 07/05/07 20:33:26

  Modified:    src/org/jgroups/mux Multiplexer.java
  Log:
  simplify MergeView handling
  
  Revision  Changes    Path
  1.55      +29 -66    JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.54
  retrieving revision 1.55
  diff -u -r1.54 -r1.55
  --- Multiplexer.java	19 Apr 2007 18:47:19 -0000	1.54
  +++ Multiplexer.java	8 May 2007 03:33:26 -0000	1.55
  @@ -19,7 +19,7 @@
    * message is removed and the MuxChannel corresponding to the header's service ID is retrieved from the map,
    * and MuxChannel.up() is called with the message.
    * @author Bela Ban
  - * @version $Id: Multiplexer.java,v 1.54 2007/04/19 18:47:19 vlada Exp $
  + * @version $Id: Multiplexer.java,v 1.55 2007/05/08 03:33:26 vlada Exp $
    */
   public class Multiplexer implements UpHandler {
       /** Map<String,MuxChannel>. Maintains the mapping between service IDs and their associated MuxChannels */
  @@ -30,8 +30,6 @@
       static final short SEPARATOR_LEN=(short)SEPARATOR.length();
       static final String NAME="MUX";    
   
  -    private MergeView temp_merge_view=null;
  -
       private boolean flush_present=true;
       private boolean blocked=false;
   
  @@ -264,14 +262,14 @@
   
   
       public void sendServiceUpMessage(String service, Address host,boolean bypassFlush) throws Exception {
  -        sendServiceMessage(ServiceInfo.SERVICE_UP, service, host,bypassFlush);
  +        sendServiceMessage(ServiceInfo.SERVICE_UP, service, host,bypassFlush, null);
           if(local_addr != null && host != null && local_addr.equals(host))
               handleServiceUp(service, host, false);
       }
   
   
       public void sendServiceDownMessage(String service, Address host,boolean bypassFlush) throws Exception {
  -        sendServiceMessage(ServiceInfo.SERVICE_DOWN, service, host,bypassFlush);
  +        sendServiceMessage(ServiceInfo.SERVICE_DOWN, service, host,bypassFlush, null);
           if(local_addr != null && host != null && local_addr.equals(host))
               handleServiceDown(service, host, false);
       }
  @@ -320,36 +318,29 @@
                   Vector left_members=Util.determineLeftMembers(old_members, new_members);
   
                   if(view instanceof MergeView) {
  -                    temp_merge_view=(MergeView)view.clone();
  +                    final MergeView temp_merge_view=(MergeView)view.clone();
                       if(log.isTraceEnabled())
  -                        log.trace("received a MergeView: " + temp_merge_view + ", adjusting the service view");
  -                    if(!flush_present && temp_merge_view != null) {
  -                        try {
  -                            if(log.isTraceEnabled())
  -                                log.trace("calling handleMergeView() from VIEW_CHANGE (flush_present=" + flush_present + ")");
  -                            Thread merge_handler=new Thread() {
  -                                public void run() {
  -                                    try {
  -                                        handleMergeView(temp_merge_view);
  -                                    }
  -                                    catch(Exception e) {
  -                                        if(log.isErrorEnabled())
  -                                            log.error("problems handling merge view", e);
  -                                    }
  +                        log.trace("received a MergeView: " + temp_merge_view + ", adjusting the service view");                    
  +                    try {                        
  +                        Thread merge_handler=new Thread() {
  +                            public void run() {
  +                                try {
  +                                    handleMergeView(temp_merge_view);
                                   }
  -                            };
  -                            merge_handler.setName("merge handler view_change");
  -                            merge_handler.setDaemon(false);
  -                            merge_handler.start();
  -                        }
  -                        catch(Exception e) {
  -                            if(log.isErrorEnabled())
  -                                log.error("failed handling merge view", e);
  -                        }
  -                    }
  -                    else {
  -                        ; // don't do anything because we are blocked sending messages anyway
  +                                catch(Exception e) {
  +                                    if(log.isErrorEnabled())
  +                                        log.error("problems handling merge view", e);
  +                                }
  +                            }
  +                        };
  +                        merge_handler.setName("merge handler view_change");
  +                        merge_handler.setDaemon(false);
  +                        merge_handler.start();
                       }
  +                    catch(Exception e) {
  +                        if(log.isErrorEnabled())
  +                            log.error("failed handling merge view", e);
  +                    }                                       
                   }
                   else { // regular view
                       synchronized(service_responses) {
  @@ -398,30 +389,7 @@
                   }
                   else
                       blocked=false;
  -                if(temp_merge_view != null) {
  -                    if(log.isTraceEnabled())
  -                        log.trace("calling handleMergeView() from UNBLOCK (flush_present=" + flush_present + ")");
  -                    try {
  -                        Thread merge_handler=new Thread() {
  -                            public void run() {
  -                                try {
  -                                    handleMergeView(temp_merge_view);
  -                                }
  -                                catch(Exception e) {
  -                                    if(log.isErrorEnabled())
  -                                        log.error("problems handling merge view", e);
  -                                }
  -                            }
  -                        };
  -                        merge_handler.setName("merge handler (unblock)");
  -                        merge_handler.setDaemon(false);
  -                        merge_handler.start();
  -                    }
  -                    catch(Exception e) {
  -                        if(log.isErrorEnabled())
  -                            log.error("failed handling merge view", e);
  -                    }
  -                }
  +                
                   passToAllMuxChannels(evt);
                   break;
   
  @@ -554,11 +522,7 @@
       private void sendServiceState() throws Exception {
           Object[] my_services=services.keySet().toArray();
           byte[] data=Util.objectToByteBuffer(my_services);
  -        ServiceInfo sinfo=new ServiceInfo(ServiceInfo.LIST_SERVICES_RSP, null, channel.getLocalAddress(), data);
  -        Message rsp=new Message(); // send to everyone
  -        MuxHeader hdr=new MuxHeader(sinfo);
  -        rsp.putHeader(NAME, hdr);
  -        channel.send(rsp);
  +        sendServiceMessage(ServiceInfo.LIST_SERVICES_RSP, null, channel.getLocalAddress(), true, data);
       }
   
   
  @@ -608,7 +572,7 @@
           return result;       
       }
   
  -    private void sendServiceMessage(byte type, String service, Address host,boolean bypassFlush) throws Exception {
  +    private void sendServiceMessage(byte type, String service, Address host,boolean bypassFlush, byte[] payload) throws Exception {
           if(host == null)
               host=getLocalAddress();
           if(host == null) {
  @@ -618,11 +582,11 @@
               return;
           }
   
  -        ServiceInfo si=new ServiceInfo(type, service, host, null);
  +        ServiceInfo si=new ServiceInfo(type, service, host, payload);
           MuxHeader hdr=new MuxHeader(si);
           Message service_msg=new Message();
           service_msg.putHeader(NAME, hdr);
  -        if(bypassFlush)
  +        if(bypassFlush && flush_present)
              service_msg.putHeader(FLUSH.NAME, new FLUSH.FlushHeader(FLUSH.FlushHeader.FLUSH_BYPASS));
           
           channel.send(service_msg);
  @@ -866,8 +830,7 @@
   
           // merges service_responses with service_state and emits MergeViews for the services affected (MuxChannel)
           mergeServiceState(view, copy);
  -        service_responses.clear();
  -        temp_merge_view=null;
  +        service_responses.clear();       
       }
   
       private int numResponses(Map m) {

User: vlada   
  Date: 07/05/08 11:47:04

  Modified:    src/org/jgroups/mux Multiplexer.java
  Log:
  http://jira.jboss.com/jira/browse/JGRP-499 (startFlush does not pass down timeout)
  
  Revision  Changes    Path
  1.56      +5 -3      JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.55
  retrieving revision 1.56
  diff -u -r1.55 -r1.56
  --- Multiplexer.java	8 May 2007 03:33:26 -0000	1.55
  +++ Multiplexer.java	8 May 2007 18:47:04 -0000	1.56
  @@ -19,7 +19,7 @@
    * message is removed and the MuxChannel corresponding to the header's service ID is retrieved from the map,
    * and MuxChannel.up() is called with the message.
    * @author Bela Ban
  - * @version $Id: Multiplexer.java,v 1.55 2007/05/08 03:33:26 vlada Exp $
  + * @version $Id: Multiplexer.java,v 1.56 2007/05/08 18:47:04 vlada Exp $
    */
   public class Multiplexer implements UpHandler {
       /** Map<String,MuxChannel>. Maintains the mapping between service IDs and their associated MuxChannels */
  @@ -958,8 +958,10 @@
   
   
       /** Tell the underlying channel to start the flush protocol, this will be handled by FLUSH */
  -    private void startFlush() {
  -        channel.down(new Event(Event.SUSPEND));
  +    private void startFlush(long timeout) {
  +    	Map atts = new HashMap();	           	
  +     	atts.put("timeout",new Long(timeout));
  +        channel.down(new Event(Event.SUSPEND,atts));
       }
   
       /** Tell the underlying channel to stop the flush, and resume message sending. This will be handled by FLUSH */

User: belaban 
  Date: 07/06/22 07:54:41

  Modified:    src/org/jgroups/mux Multiplexer.java
  Log:
  - changed services to ConcurrentHashMap
  - made invocation of block() blocking (waiting for results)
  
  Revision  Changes    Path
  1.57      +92 -104   JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.56
  retrieving revision 1.57
  diff -u -r1.56 -r1.57
  --- Multiplexer.java	8 May 2007 18:47:04 -0000	1.56
  +++ Multiplexer.java	22 Jun 2007 14:54:40 -0000	1.57
  @@ -19,11 +19,11 @@
    * message is removed and the MuxChannel corresponding to the header's service ID is retrieved from the map,
    * and MuxChannel.up() is called with the message.
    * @author Bela Ban
  - * @version $Id: Multiplexer.java,v 1.56 2007/05/08 18:47:04 vlada Exp $
  + * @version $Id: Multiplexer.java,v 1.57 2007/06/22 14:54:40 belaban Exp $
    */
   public class Multiplexer implements UpHandler {
       /** Map<String,MuxChannel>. Maintains the mapping between service IDs and their associated MuxChannels */
  -    private final Map<String,MuxChannel> services=new HashMap<String,MuxChannel>();
  +    private final ConcurrentMap<String,MuxChannel> services=new ConcurrentHashMap<String,MuxChannel>();
       private final JChannel channel;
       static final Log log=LogFactory.getLog(Multiplexer.class);
       static final String SEPARATOR="::";
  @@ -88,11 +88,11 @@
        * @return The set of service IDs
        */
       public Set getApplicationIds() {
  -        return services != null? services.keySet() : null;
  +        return services != null? Collections.unmodifiableSet(services.keySet()) : null;
       }
   
       public Set<String> getServiceIds() {
  -        return services != null? services.keySet() : null;
  +        return services != null? Collections.unmodifiableSet(services.keySet()) : null;
       }
   
   
  @@ -161,41 +161,41 @@
           return rc;
       }
       
  -    protected ExecutorService createThreadPool() {
  -	int min_threads = 1, max_threads = 4;
  -	long keep_alive = 30000;
  -
  -	ThreadFactory factory = new ThreadFactory() {
  -	    int num = 1;
  -
  -	    ThreadGroup mux_threads = new ThreadGroup(Util.getGlobalThreadGroup(),
  -						      "MultiplexerThreads");
  -
  -	    public Thread newThread(Runnable command) {
  -		Thread ret = new Thread(mux_threads, command, "Multiplexer-" + num++);
  -		ret.setDaemon(true);
  -		return ret;
  -	    }
  -	};
  -
  -	min_threads = Global.getPropertyAsInteger(Global.MUX_MIN_THREADS, min_threads);
  -	max_threads = Global.getPropertyAsInteger(Global.MUX_MAX_THREADS, max_threads);
  -	keep_alive = Global.getPropertyAsLong(Global.MUX_KEEPALIVE, keep_alive);
  -
  -	return new ThreadPoolExecutor(min_threads, max_threads, keep_alive, TimeUnit.MILLISECONDS,
  -				      new SynchronousQueue(), factory,
  -				      new ThreadPoolExecutor.CallerRunsPolicy());
  +    protected static ExecutorService createThreadPool() {
  +        int min_threads = 1, max_threads = 4;
  +        long keep_alive = 30000;
  +
  +        ThreadFactory factory = new ThreadFactory() {
  +            int num = 1;
  +
  +            ThreadGroup mux_threads = new ThreadGroup(Util.getGlobalThreadGroup(),
  +                                                      "MultiplexerThreads");
  +
  +            public Thread newThread(Runnable command) {
  +                Thread ret = new Thread(mux_threads, command, "Multiplexer-" + num++);
  +                ret.setDaemon(true);
  +                return ret;
  +            }
  +        };
  +
  +        min_threads = Global.getPropertyAsInteger(Global.MUX_MIN_THREADS, min_threads);
  +        max_threads = Global.getPropertyAsInteger(Global.MUX_MAX_THREADS, max_threads);
  +        keep_alive = Global.getPropertyAsLong(Global.MUX_KEEPALIVE, keep_alive);
  +
  +        return new ThreadPoolExecutor(min_threads, max_threads, keep_alive, TimeUnit.MILLISECONDS,
  +                                      new SynchronousQueue(), factory,
  +                                      new ThreadPoolExecutor.CallerRunsPolicy());
       }
       
       protected void shutdownThreadPool() {
  -	if(thread_pool != null && !thread_pool.isShutdown()){
  -	    thread_pool.shutdownNow();
  -	    try{
  -		thread_pool.awaitTermination(Global.THREADPOOL_SHUTDOWN_WAIT_TIME,
  -					     TimeUnit.MILLISECONDS);
  -	    }catch(InterruptedException e){
  -	    }
  -	}
  +        if(thread_pool != null && !thread_pool.isShutdown()){
  +            thread_pool.shutdownNow();
  +            try{
  +                thread_pool.awaitTermination(Global.THREADPOOL_SHUTDOWN_WAIT_TIME,
  +                                             TimeUnit.MILLISECONDS);
  +            }catch(InterruptedException e){
  +            }
  +        }
       }
   
       /** Fetches the app states for all service IDs in keys.
  @@ -378,7 +378,7 @@
               case Event.BLOCK:
                   blocked=true;
                   if(!services.isEmpty()) {
  -                    passToAllMuxChannels(evt);
  +                    passToAllMuxChannels(evt, true); // do block
                   }
                   return null;
   
  @@ -403,12 +403,10 @@
   
       public Channel createMuxChannel(JChannelFactory f, String id, String stack_name) throws Exception {
           MuxChannel ch;
  -        synchronized(services) {
  -            if(services.containsKey(id))
  -                throw new Exception("service ID \"" + id + "\" is already registered, cannot register duplicate ID");
  -            ch=new MuxChannel(f, channel, id, stack_name, this);
  -            services.put(id, ch);
  -        }
  +        if(services.containsKey(id))
  +            throw new Exception("service ID \"" + id + "\" is already registered, cannot register duplicate ID");
  +        ch=new MuxChannel(f, channel, id, stack_name, this);
  +        services.put(id, ch);
           return ch;
       }
   
  @@ -416,20 +414,23 @@
   
   
       private void passToAllMuxChannels(Event evt) {
  +        passToAllMuxChannels(evt, false);
  +    }
  +
  +
  +    private void passToAllMuxChannels(Event evt, boolean block) {
           String service_name;
           MuxChannel ch;
           for(Map.Entry<String,MuxChannel> entry: services.entrySet()) {
               service_name=entry.getKey();
               ch=entry.getValue();
               // these events are directly delivered, don't get added to any queue
  -            passToMuxChannel(ch, evt, fifo_queue, null, service_name, false);
  +            passToMuxChannel(ch, evt, fifo_queue, null, service_name, block);
           }
       }
   
       public MuxChannel remove(String id) {
  -        synchronized(services) {
  -            return services.remove(id);
  -        }
  +        return services.remove(id);
       }
   
   
  @@ -437,80 +438,70 @@
       /** Closes the underlying JChannel if all MuxChannels have been disconnected */
       public void disconnect() {
           boolean all_disconnected=true;
  -        synchronized(services) {
  -            for(MuxChannel mux_ch: services.values()) {
  -                if(mux_ch.isConnected()) {
  -                    all_disconnected=false;
  -                    break;
  -                }
  +        for(MuxChannel mux_ch: services.values()) {
  +            if(mux_ch.isConnected()) {
  +                all_disconnected=false;
  +                break;
               }
  -            if(all_disconnected) {
  -                if(log.isTraceEnabled()) {
  -                    log.trace("disconnecting underlying JChannel as all MuxChannels are disconnected");
  -                }
  -                channel.disconnect();
  +        }
  +        if(all_disconnected) {
  +            if(log.isTraceEnabled()) {
  +                log.trace("disconnecting underlying JChannel as all MuxChannels are disconnected");
               }
  +            channel.disconnect();
           }
       }
   
   
       public void unregister(String appl_id) {
  -        synchronized(services) {
  -            services.remove(appl_id);
  -        }
  +        services.remove(appl_id);
       }
   
       public boolean close() {
           boolean all_closed=true;
  -        synchronized(services) {
  -            for(MuxChannel mux_ch: services.values()) {
  -                if(mux_ch.isOpen()) {
  -                    all_closed=false;
  -                    break;
  -                }
  -            }
  -            if(all_closed) {
  -                if(log.isTraceEnabled()) {
  -                    log.trace("closing underlying JChannel as all MuxChannels are closed");
  -                }
  -                channel.close();
  -                services.clear();
  -                shutdownThreadPool();
  +        for(MuxChannel mux_ch: services.values()) {
  +            if(mux_ch.isOpen()) {
  +                all_closed=false;
  +                break;
               }
  -            return all_closed;
           }
  +        if(all_closed) {
  +            if(log.isTraceEnabled()) {
  +                log.trace("closing underlying JChannel as all MuxChannels are closed");
  +            }
  +            channel.close();
  +            services.clear();
  +            shutdownThreadPool();
  +        }
  +        return all_closed;
       }
   
       public void closeAll() {
  -        synchronized(services) {
  -            for(MuxChannel mux_ch: services.values()) {
  -                mux_ch.setConnected(false);
  -                mux_ch.setClosed(true);
  -                mux_ch.closeMessageQueue(true);
  -            }
  +        for(MuxChannel mux_ch: services.values()) {
  +            mux_ch.setConnected(false);
  +            mux_ch.setClosed(true);
  +            mux_ch.closeMessageQueue(true);
           }
           shutdownThreadPool();
       }
   
       public boolean shutdown() {
           boolean all_closed=true;
  -        synchronized(services) {
  -            for(MuxChannel mux_ch: services.values()) {
  -                if(mux_ch.isOpen()) {
  -                    all_closed=false;
  -                    break;
  -                }
  -            }
  -            if(all_closed) {
  -                if(log.isTraceEnabled()) {
  -                    log.trace("shutting down underlying JChannel as all MuxChannels are closed");
  -                }
  -                channel.shutdown();
  -                services.clear();
  -                shutdownThreadPool();
  +        for(MuxChannel mux_ch: services.values()) {
  +            if(mux_ch.isOpen()) {
  +                all_closed=false;
  +                break;
               }
  -            return all_closed;
           }
  +        if(all_closed) {
  +            if(log.isTraceEnabled()) {
  +                log.trace("shutting down underlying JChannel as all MuxChannels are closed");
  +            }
  +            channel.shutdown();
  +            services.clear();
  +            shutdownThreadPool();
  +        }
  +        return all_closed;
       }
   
   
  @@ -762,6 +753,9 @@
           List    hosts, hosts_copy;
           boolean added=false;
   
  +
  +
  +
           // discard if we sent this message
           if(received && host != null && local_addr != null && local_addr.equals(host)) {
               return;
  @@ -997,13 +991,7 @@
       }
   
       public void addServiceIfNotPresent(String id, MuxChannel ch) {
  -        MuxChannel tmp;
  -        synchronized(services) {
  -            tmp=services.get(id);
  -            if(tmp == null) {
  -                services.put(id, ch);
  -            }
  -        }
  +        services.putIfAbsent(id, ch);
       }

User: belaban 
  Date: 07/06/25 00:36:13

  Modified:    src/org/jgroups/mux Multiplexer.java
  Log:
  made BLOCK handling bypass the thread pool (fixed http://jira.jboss.com/jira/browse/JGRP-539)
  
  Revision  Changes    Path
  1.58      +14 -12    JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.57
  retrieving revision 1.58
  diff -u -r1.57 -r1.58
  --- Multiplexer.java	22 Jun 2007 14:54:40 -0000	1.57
  +++ Multiplexer.java	25 Jun 2007 07:36:13 -0000	1.58
  @@ -19,7 +19,7 @@
    * message is removed and the MuxChannel corresponding to the header's service ID is retrieved from the map,
    * and MuxChannel.up() is called with the message.
    * @author Bela Ban
  - * @version $Id: Multiplexer.java,v 1.57 2007/06/22 14:54:40 belaban Exp $
  + * @version $Id: Multiplexer.java,v 1.58 2007/06/25 07:36:13 belaban Exp $
    */
   public class Multiplexer implements UpHandler {
       /** Map<String,MuxChannel>. Maintains the mapping between service IDs and their associated MuxChannels */
  @@ -378,18 +378,13 @@
               case Event.BLOCK:
                   blocked=true;
                   if(!services.isEmpty()) {
  -                    passToAllMuxChannels(evt, true); // do block
  +                    passToAllMuxChannels(evt, true, true); // do block and bypass the thread pool
                   }
                   return null;
   
               case Event.UNBLOCK: // process queued-up MergeViews
  -                if(!blocked) {
  -                    passToAllMuxChannels(evt);
  -                    return null;
  -                }
  -                else
  +                if(blocked)
                       blocked=false;
  -                
                   passToAllMuxChannels(evt);
                   break;
   
  @@ -414,18 +409,18 @@
   
   
       private void passToAllMuxChannels(Event evt) {
  -        passToAllMuxChannels(evt, false);
  +        passToAllMuxChannels(evt, false, true);
       }
   
   
  -    private void passToAllMuxChannels(Event evt, boolean block) {
  +    private void passToAllMuxChannels(Event evt, boolean block, boolean bypass_thread_pool) {
           String service_name;
           MuxChannel ch;
           for(Map.Entry<String,MuxChannel> entry: services.entrySet()) {
               service_name=entry.getKey();
               ch=entry.getValue();
               // these events are directly delivered, don't get added to any queue
  -            passToMuxChannel(ch, evt, fifo_queue, null, service_name, block);
  +            passToMuxChannel(ch, evt, fifo_queue, null, service_name, block, bypass_thread_pool);
           }
       }
   
  @@ -966,7 +961,14 @@
   
       private Object passToMuxChannel(MuxChannel ch, Event evt, final FIFOMessageQueue<String,Runnable> queue,
                                            final Address sender, final String dest, boolean block) {
  -        if(thread_pool == null)
  +        return passToMuxChannel(ch, evt, queue, sender, dest, block, false);
  +    }
  +
  +
  +
  +    private Object passToMuxChannel(MuxChannel ch, Event evt, final FIFOMessageQueue<String,Runnable> queue,
  +                                    final Address sender, final String dest, boolean block, boolean bypass_thread_pool) {
  +        if(thread_pool == null || bypass_thread_pool)
               return ch.up(evt);
   
           Task task=new Task(ch, evt, queue, sender, dest, block);

User: belaban 
  Date: 07/06/25 04:29:08

  Modified:    src/org/jgroups/mux Multiplexer.java
  Log:
  ns
  
  Revision  Changes    Path
  1.59      +35 -25    JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.58
  retrieving revision 1.59
  diff -u -r1.58 -r1.59
  --- Multiplexer.java	25 Jun 2007 07:36:13 -0000	1.58
  +++ Multiplexer.java	25 Jun 2007 11:29:07 -0000	1.59
  @@ -19,7 +19,7 @@
    * message is removed and the MuxChannel corresponding to the header's service ID is retrieved from the map,
    * and MuxChannel.up() is called with the message.
    * @author Bela Ban
  - * @version $Id: Multiplexer.java,v 1.58 2007/06/25 07:36:13 belaban Exp $
  + * @version $Id: Multiplexer.java,v 1.59 2007/06/25 11:29:07 belaban Exp $
    */
   public class Multiplexer implements UpHandler {
       /** Map<String,MuxChannel>. Maintains the mapping between service IDs and their associated MuxChannels */
  @@ -66,9 +66,9 @@
           flush_present=isFlushPresent(); 
           
           // threadpool is enabled by default
  -	if(Global.getPropertyAsBoolean(Global.MUX_ENABLED, true)){
  -	    thread_pool = createThreadPool();
  -	}
  +        if(Global.getPropertyAsBoolean(Global.MUX_ENABLED, true)){
  +            thread_pool=createThreadPool();
  +        }
       }
   
       public Multiplexer(JChannel channel) {
  @@ -79,8 +79,8 @@
           
           //threadpool is enabled by default
           if(Global.getPropertyAsBoolean(Global.MUX_ENABLED, true)){
  -	    thread_pool = createThreadPool();
  -	}
  +            thread_pool=createThreadPool();
  +        }
       }
   
       /**
  @@ -160,40 +160,39 @@
           state_transfer_listeners.clear();        
           return rc;
       }
  -    
  -    protected static ExecutorService createThreadPool() {
  -        int min_threads = 1, max_threads = 4;
  -        long keep_alive = 30000;
   
  -        ThreadFactory factory = new ThreadFactory() {
  -            int num = 1;
  +    protected static ThreadPoolExecutor createThreadPool() {
  +        int min_threads=1, max_threads=4;
  +        long keep_alive=30000;
   
  -            ThreadGroup mux_threads = new ThreadGroup(Util.getGlobalThreadGroup(),
  -                                                      "MultiplexerThreads");
  +        ThreadFactory factory=new ThreadFactory() {
  +            int num=1;
  +
  +            ThreadGroup mux_threads=new ThreadGroup(Util.getGlobalThreadGroup(), "MultiplexerThreads");
   
               public Thread newThread(Runnable command) {
  -                Thread ret = new Thread(mux_threads, command, "Multiplexer-" + num++);
  +                Thread ret=new Thread(mux_threads, command, "Multiplexer-" + num++);
                   ret.setDaemon(true);
                   return ret;
               }
           };
   
  -        min_threads = Global.getPropertyAsInteger(Global.MUX_MIN_THREADS, min_threads);
  -        max_threads = Global.getPropertyAsInteger(Global.MUX_MAX_THREADS, max_threads);
  -        keep_alive = Global.getPropertyAsLong(Global.MUX_KEEPALIVE, keep_alive);
  +        min_threads=Global.getPropertyAsInteger(Global.MUX_MIN_THREADS, min_threads);
  +        max_threads=Global.getPropertyAsInteger(Global.MUX_MAX_THREADS, max_threads);
  +        keep_alive=Global.getPropertyAsLong(Global.MUX_KEEPALIVE, keep_alive);
   
           return new ThreadPoolExecutor(min_threads, max_threads, keep_alive, TimeUnit.MILLISECONDS,
                                         new SynchronousQueue(), factory,
                                         new ThreadPoolExecutor.CallerRunsPolicy());
       }
  -    
  +
       protected void shutdownThreadPool() {
  -        if(thread_pool != null && !thread_pool.isShutdown()){
  +        if(thread_pool != null && !thread_pool.isShutdown()) {
               thread_pool.shutdownNow();
  -            try{
  -                thread_pool.awaitTermination(Global.THREADPOOL_SHUTDOWN_WAIT_TIME,
  -                                             TimeUnit.MILLISECONDS);
  -            }catch(InterruptedException e){
  +            try {
  +                thread_pool.awaitTermination(Global.THREADPOOL_SHUTDOWN_WAIT_TIME, TimeUnit.MILLISECONDS);
  +            }
  +            catch(InterruptedException e) {
               }
           }
       }
  @@ -380,6 +379,7 @@
                   if(!services.isEmpty()) {
                       passToAllMuxChannels(evt, true, true); // do block and bypass the thread pool
                   }
  +                waitUntilThreadPoolHasNoRunningTasks(1000);
                   return null;
   
               case Event.UNBLOCK: // process queued-up MergeViews
  @@ -395,6 +395,16 @@
           return null;
       }
   
  +    private int waitUntilThreadPoolHasNoRunningTasks(long timeout) {
  +        int num_threads=0;
  +        long end_time=System.currentTimeMillis() + timeout;
  +
  +        while(fifo_queue != null && (num_threads=fifo_queue.size()) > 0 && System.currentTimeMillis() < end_time) {
  +            Util.sleep(100);
  +        }
  +        return num_threads;
  +    }
  +
   
       public Channel createMuxChannel(JChannelFactory f, String id, String stack_name) throws Exception {
           MuxChannel ch;
  @@ -822,7 +832,7 @@
           service_responses.clear();       
       }
   
  -    private int numResponses(Map m) {
  +    private static int numResponses(Map m) {
           int num=0;
           Collection values=m.values();
           for(Iterator it=values.iterator(); it.hasNext();) {

User: vlada   
  Date: 07/06/25 14:00:38

  Modified:    src/org/jgroups/mux Multiplexer.java
  Log:
  more use of JDK 5 features
  
  Revision  Changes    Path
  1.60      +58 -95    JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.59
  retrieving revision 1.60
  diff -u -r1.59 -r1.60
  --- Multiplexer.java	25 Jun 2007 11:29:07 -0000	1.59
  +++ Multiplexer.java	25 Jun 2007 21:00:38 -0000	1.60
  @@ -9,9 +9,11 @@
   import org.jgroups.util.FIFOMessageQueue;
   import org.jgroups.util.Promise;
   import org.jgroups.util.Util;
  +import org.jgroups.util.Digest.Entry;
   
   import java.util.*;
   import java.util.concurrent.*;
  +import java.util.concurrent.atomic.AtomicInteger;
   
   /**
    * Used for dispatching incoming messages. The Multiplexer implements UpHandler and registers with the associated
  @@ -19,7 +21,7 @@
    * message is removed and the MuxChannel corresponding to the header's service ID is retrieved from the map,
    * and MuxChannel.up() is called with the message.
    * @author Bela Ban
  - * @version $Id: Multiplexer.java,v 1.59 2007/06/25 11:29:07 belaban Exp $
  + * @version $Id: Multiplexer.java,v 1.60 2007/06/25 21:00:38 vlada Exp $
    */
   public class Multiplexer implements UpHandler {
       /** Map<String,MuxChannel>. Maintains the mapping between service IDs and their associated MuxChannels */
  @@ -127,13 +129,12 @@
       }
   
       public synchronized boolean getState(Address target, String id, long timeout) throws ChannelNotConnectedException, ChannelClosedException {
  -        if(state_transfer_listeners == null)
  -            return false;
  -        Map.Entry entry;
  -        String key;
  -        for(Iterator it=state_transfer_listeners.entrySet().iterator(); it.hasNext();) {
  -            entry=(Map.Entry)it.next();
  -            key=(String)entry.getKey();
  +        if(state_transfer_listeners.isEmpty())
  +            return false;            
  +        
  +        for(Iterator<Map.Entry<String,Boolean>> it=state_transfer_listeners.entrySet().iterator(); it.hasNext();) {
  +            Map.Entry<String, Boolean> entry = it.next();
  +            String key=entry.getKey();
               int index=key.indexOf(SEPARATOR);
               boolean match;
               if(index > -1) {
  @@ -155,7 +156,7 @@
               return true; // pseudo
   
           boolean rc=false;           
  -        Set keys=new HashSet(state_transfer_listeners.keySet());
  +        Set<String> keys=new HashSet<String>(state_transfer_listeners.keySet());
           rc=fetchServiceStates(target, keys, timeout);
           state_transfer_listeners.clear();        
           return rc;
  @@ -166,12 +167,12 @@
           long keep_alive=30000;
   
           ThreadFactory factory=new ThreadFactory() {
  -            int num=1;
  +            AtomicInteger num = new AtomicInteger(1);
   
               ThreadGroup mux_threads=new ThreadGroup(Util.getGlobalThreadGroup(), "MultiplexerThreads");
   
               public Thread newThread(Runnable command) {
  -                Thread ret=new Thread(mux_threads, command, "Multiplexer-" + num++);
  +                Thread ret=new Thread(mux_threads, command, "Multiplexer-" + num.incrementAndGet());
                   ret.setDaemon(true);
                   return ret;
               }
  @@ -182,7 +183,7 @@
           keep_alive=Global.getPropertyAsLong(Global.MUX_KEEPALIVE, keep_alive);
   
           return new ThreadPoolExecutor(min_threads, max_threads, keep_alive, TimeUnit.MILLISECONDS,
  -                                      new SynchronousQueue(), factory,
  +                                      new SynchronousQueue<Runnable>(), factory,
                                         new ThreadPoolExecutor.CallerRunsPolicy());
       }
   
  @@ -201,13 +202,11 @@
        * The keys are a duplicate list, so it cannot be modified by the caller of this method
        * @param keys
        */
  -    private boolean fetchServiceStates(Address target, Set keys, long timeout) throws ChannelClosedException, ChannelNotConnectedException {
  -        boolean rc, all_rcs=true;
  -        String appl_id;
  -        for(Iterator it=keys.iterator(); it.hasNext();) {
  -            appl_id=(String)it.next();
  -            rc=channel.getState(target, appl_id, timeout);
  -            if(rc == false)
  +    private boolean fetchServiceStates(Address target, Set<String> keys, long timeout) throws ChannelClosedException, ChannelNotConnectedException {
  +        boolean rc, all_rcs=true;       
  +        for(String stateId: keys) {          
  +            rc=channel.getState(target, stateId, timeout);
  +            if(!rc)
                   all_rcs=false;
           }
           return all_rcs;
  @@ -237,7 +236,7 @@
               try {
                   byte[] state=(byte[])service_state_promise.getResultWithTimeout(2000);
                   if(state != null) {
  -                    Map new_state=(Map)Util.objectFromByteBuffer(state);
  +                	Map<String,List<Address>> new_state=(Map<String,List<Address>>)Util.objectFromByteBuffer(state);
                       synchronized(service_state) {
                           service_state.clear();
                           service_state.putAll(new_state);
  @@ -515,9 +514,8 @@
       }
   
   
  -    private void sendServiceState() throws Exception {
  -        Object[] my_services=services.keySet().toArray();
  -        byte[] data=Util.objectToByteBuffer(my_services);
  +    private void sendServiceState() throws Exception {       
  +        byte[] data=Util.objectToByteBuffer(new HashSet<String>(services.keySet()));
           sendServiceMessage(ServiceInfo.LIST_SERVICES_RSP, null, channel.getLocalAddress(), true, data);
       }
   
  @@ -693,18 +691,13 @@
           }
       }
   
  -    private void handleServicesRsp(Address sender, byte[] state) throws Exception {
  -        Object[] keys=(Object[])Util.objectFromByteBuffer(state);
  -        Set s=new HashSet();
  -        for(int i=0; i < keys.length; i++)
  -            s.add(keys[i]);
  -
  -
  +    private void handleServicesRsp(Address sender, byte[] state) throws Exception {       
  +        Set<String> s=(Set<String>) Util.objectFromByteBuffer(state);
   
           synchronized(service_responses) {
  -            Set tmp=service_responses.get(sender);
  +            Set<String> tmp=service_responses.get(sender);
               if(tmp == null)
  -                tmp=new HashSet();
  +                tmp=new HashSet<String>();
               tmp.addAll(s);
   
               service_responses.put(sender, tmp);
  @@ -716,7 +709,7 @@
   
   
       private void handleServiceDown(String service, Address host, boolean received) {
  -        List    hosts, hosts_copy;
  +        List<Address>    hosts, hosts_copy;
           boolean removed=false;
   
           // discard if we sent this message
  @@ -729,7 +722,7 @@
               if(hosts == null)
                   return;
               removed=hosts.remove(host);
  -            hosts_copy=new ArrayList(hosts); // make a copy so we don't modify hosts in generateServiceView()
  +            hosts_copy=new ArrayList<Address>(hosts); // make a copy so we don't modify hosts in generateServiceView()
           }
   
           if(removed) {
  @@ -755,7 +748,7 @@
   
   
       private void handleServiceUp(String service, Address host, boolean received) {
  -        List    hosts, hosts_copy;
  +        List<Address>    hosts, hosts_copy;
           boolean added=false;
   
   
  @@ -769,14 +762,14 @@
           synchronized(service_state) {
               hosts=service_state.get(service);
               if(hosts == null) {
  -                hosts=new ArrayList();
  +                hosts=new ArrayList<Address>();
                   service_state.put(service,  hosts);
               }
               if(!hosts.contains(host)) {
                   hosts.add(host);
                   added=true;
               }
  -            hosts_copy=new ArrayList(hosts); // make a copy so we don't modify hosts in generateServiceView()
  +            hosts_copy=new ArrayList<Address>(hosts); // make a copy so we don't modify hosts in generateServiceView()
           }
   
           if(added) {
  @@ -790,8 +783,7 @@
                   }
                   else {
                       if(log.isTraceEnabled())
  -                        log.trace("service " + service + " not found, cannot dispatch service view " + service_view);
  -                }
  +                        log.trace("service " + service + " not found, cannot dispatch service view " + service_view);                }
               }
           }
       }
  @@ -805,7 +797,7 @@
       private void handleMergeView(MergeView view) throws Exception {
           long time_to_wait=SERVICES_RSP_TIMEOUT, start;
           int num_members=view.size(); // include myself
  -        Map copy=null;
  +        Map<Address, Set<String>> copy=null;
   
           sendServiceState();
   
  @@ -816,7 +808,7 @@
                       service_responses.wait(time_to_wait);
                       time_to_wait-=System.currentTimeMillis() - start;
                   }
  -                copy=new HashMap(service_responses);
  +                copy=new HashMap<Address, Set<String>>(service_responses);
               }
               catch(Exception ex) {
                   if(log.isErrorEnabled())
  @@ -844,27 +836,20 @@
       }
   
   
  -    private void mergeServiceState(MergeView view, Map copy) {
  -        Set modified_services=new HashSet();
  -        Map.Entry entry;
  -        Address host;     // address of the sender
  -        Set service_list; // Set<String> of services
  -        List my_services;
  -        String service;
  -
  +    private void mergeServiceState(MergeView view, Map<Address, Set<String>> copy) {
  +        Set<String> modified_services=new HashSet<String>();                             
           synchronized(service_state) {
  -            for(Iterator it=copy.entrySet().iterator(); it.hasNext();) {
  -                entry=(Map.Entry)it.next();
  -                host=(Address)entry.getKey();
  -                service_list=(Set)entry.getValue();
  +            for(Iterator <Map.Entry<Address, Set<String>>> it=copy.entrySet().iterator(); it.hasNext();) {
  +                Map.Entry<Address, Set<String>> entry = it.next();
  +                Address host=entry.getKey();
  +                Set<String> service_list=entry.getValue();
                   if(service_list == null)
                       continue;
   
  -                for(Iterator it2=service_list.iterator(); it2.hasNext();) {
  -                    service=(String)it2.next();
  -                    my_services=service_state.get(service);
  +                for(String service:service_list) {                    
  +                    List<Address> my_services=service_state.get(service);
                       if(my_services == null) {
  -                        my_services=new ArrayList();
  +                        my_services=new ArrayList<Address>();
                           service_state.put(service, my_services);
                       }
   
  @@ -877,16 +862,14 @@
           }
   
           // now emit MergeViews for all services which were modified
  -        for(Iterator it=modified_services.iterator(); it.hasNext();) {
  -            service=(String)it.next();
  +        for(String service:modified_services) {           
               MuxChannel ch=services.get(service);
  -            my_services=service_state.get(service);           
  -            Vector membersCopy = new Vector(view.getMembers());
  -            membersCopy.retainAll(my_services);
  -            MergeView v=new MergeView(view.getVid(), membersCopy, view.getSubgroups());
  -            Event evt=new Event(Event.VIEW_CHANGE, v);
  +            List<Address> hosts=service_state.get(service);           
  +            Vector<Address> membersCopy = new Vector<Address>(view.getMembers());
  +            membersCopy.retainAll(hosts);
  +            MergeView v=new MergeView(view.getVid(), membersCopy, view.getSubgroups());            
               // ch.up(evt);
  -            passToMuxChannel(ch, evt, fifo_queue, null, service, false);
  +            passToMuxChannel(ch, new Event(Event.VIEW_CHANGE, v), fifo_queue, null, service, false);
           }
       }
   
  @@ -903,25 +886,19 @@
               }
       }
   
  -    private void adjustServiceView(Address host) {
  -        Map.Entry entry;
  -        List hosts, hosts_copy;
  -        String service;
  -        boolean removed=false;
  +    private void adjustServiceView(Address host) {                               
   
           synchronized(service_state) {
  -            for(Iterator it=service_state.entrySet().iterator(); it.hasNext();) {
  -                entry=(Map.Entry)it.next();
  -                service=(String)entry.getKey();
  -                hosts=(List)entry.getValue();
  +            for(Iterator<Map.Entry<String,List<Address>>> it=service_state.entrySet().iterator(); it.hasNext();) {
  +                Map.Entry<String, List<Address>> entry = it.next();
  +                String service=entry.getKey();
  +                List<Address> hosts = entry.getValue();
                   if(hosts == null)
  -                    continue;
  +                    continue;                     
   
  -                removed=hosts.remove(host);
  -                hosts_copy=new ArrayList(hosts); // make a copy so we don't modify hosts in generateServiceView()
  -
  -                if(removed) {
  -                    View service_view=generateServiceView(hosts_copy);
  +                if(hosts.remove(host)) {
  +                	// make a copy so we don't modify hosts in generateServiceView()
  +                    View service_view=generateServiceView(new ArrayList<Address>(hosts));
                       if(service_view != null) {
                           MuxChannel ch=services.get(service);
                           if(ch != null) {
  @@ -950,25 +927,11 @@
        * @return the servicd view (a modified copy of the real view), or null if the view was not modified
        */
       private View generateServiceView(List hosts) {
  -        Vector members=new Vector(view.getMembers());
  +        Vector<Address> members=new Vector<Address>(view.getMembers());
           members.retainAll(hosts);
           return new View(view.getVid(), members);
       }
   
  -
  -    /** Tell the underlying channel to start the flush protocol, this will be handled by FLUSH */
  -    private void startFlush(long timeout) {
  -    	Map atts = new HashMap();	           	
  -     	atts.put("timeout",new Long(timeout));
  -        channel.down(new Event(Event.SUSPEND,atts));
  -    }
  -
  -    /** Tell the underlying channel to stop the flush, and resume message sending. This will be handled by FLUSH */
  -    private void stopFlush() {
  -        channel.down(new Event(Event.RESUME));
  -    }
  -
  -
       private Object passToMuxChannel(MuxChannel ch, Event evt, final FIFOMessageQueue<String,Runnable> queue,
                                            final Address sender, final String dest, boolean block) {
           return passToMuxChannel(ch, evt, queue, sender, dest, block, false);

User: belaban 
  Date: 07/06/29 03:53:06

  Modified:    src/org/jgroups/mux Multiplexer.java
  Log:
  ns
  
  Revision  Changes    Path
  1.61      +3 -3      JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.60
  retrieving revision 1.61
  diff -u -r1.60 -r1.61
  --- Multiplexer.java	25 Jun 2007 21:00:38 -0000	1.60
  +++ Multiplexer.java	29 Jun 2007 10:53:06 -0000	1.61
  @@ -9,7 +9,6 @@
   import org.jgroups.util.FIFOMessageQueue;
   import org.jgroups.util.Promise;
   import org.jgroups.util.Util;
  -import org.jgroups.util.Digest.Entry;
   
   import java.util.*;
   import java.util.concurrent.*;
  @@ -21,7 +20,7 @@
    * message is removed and the MuxChannel corresponding to the header's service ID is retrieved from the map,
    * and MuxChannel.up() is called with the message.
    * @author Bela Ban
  - * @version $Id: Multiplexer.java,v 1.60 2007/06/25 21:00:38 vlada Exp $
  + * @version $Id: Multiplexer.java,v 1.61 2007/06/29 10:53:06 belaban Exp $
    */
   public class Multiplexer implements UpHandler {
       /** Map<String,MuxChannel>. Maintains the mapping between service IDs and their associated MuxChannels */
  @@ -941,8 +940,9 @@
   
       private Object passToMuxChannel(MuxChannel ch, Event evt, final FIFOMessageQueue<String,Runnable> queue,
                                       final Address sender, final String dest, boolean block, boolean bypass_thread_pool) {
  -        if(thread_pool == null || bypass_thread_pool)
  +        if(thread_pool == null || bypass_thread_pool) {
               return ch.up(evt);
  +        }
   
           Task task=new Task(ch, evt, queue, sender, dest, block);
           ExecuteTask execute_task=new ExecuteTask(fifo_queue);  // takes Task from queue and executes it

User: vlada   
  Date: 07/07/12 11:45:09

  Modified:    src/org/jgroups/mux Multiplexer.java
  Log:
  [JGRP-557] - MuxChannel should not receive views after it disconnects
  added unit test - ChannelTest#testNoViewReceivedAfterDisconnect
  
  Revision  Changes    Path
  1.62      +5 -3      JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.61
  retrieving revision 1.62
  diff -u -r1.61 -r1.62
  --- Multiplexer.java	29 Jun 2007 10:53:06 -0000	1.61
  +++ Multiplexer.java	12 Jul 2007 18:45:09 -0000	1.62
  @@ -20,7 +20,7 @@
    * message is removed and the MuxChannel corresponding to the header's service ID is retrieved from the map,
    * and MuxChannel.up() is called with the message.
    * @author Bela Ban
  - * @version $Id: Multiplexer.java,v 1.61 2007/06/29 10:53:06 belaban Exp $
  + * @version $Id: Multiplexer.java,v 1.62 2007/07/12 18:45:09 vlada Exp $
    */
   public class Multiplexer implements UpHandler {
       /** Map<String,MuxChannel>. Maintains the mapping between service IDs and their associated MuxChannels */
  @@ -731,7 +731,8 @@
                   if(ch != null) {
                       Event view_evt=new Event(Event.VIEW_CHANGE, service_view);
                       // ch.up(view_evt);
  -                    passToMuxChannel(ch, view_evt, fifo_queue, null, service, false);
  +                    if(ch.isConnected())
  +                    	passToMuxChannel(ch, view_evt, fifo_queue, null, service, false);
                   }
                   else {
                       if(log.isTraceEnabled())
  @@ -903,7 +904,8 @@
                           if(ch != null) {
                               Event view_evt=new Event(Event.VIEW_CHANGE, service_view);
                               // ch.up(view_evt);
  -                            passToMuxChannel(ch, view_evt, fifo_queue, null, service, false);
  +                            if(ch.isConnected())
  +                            	passToMuxChannel(ch, view_evt, fifo_queue, null, service, false);
                           }
                           else {
                               if(log.isTraceEnabled())

User: belaban 
  Date: 07/07/12 23:31:59

  Modified:    src/org/jgroups/mux Multiplexer.java
  Log:
  typed collection
  
  Revision  Changes    Path
  1.63      +3 -3      JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.62
  retrieving revision 1.63
  diff -u -r1.62 -r1.63
  --- Multiplexer.java	12 Jul 2007 18:45:09 -0000	1.62
  +++ Multiplexer.java	13 Jul 2007 06:31:59 -0000	1.63
  @@ -20,7 +20,7 @@
    * message is removed and the MuxChannel corresponding to the header's service ID is retrieved from the map,
    * and MuxChannel.up() is called with the message.
    * @author Bela Ban
  - * @version $Id: Multiplexer.java,v 1.62 2007/07/12 18:45:09 vlada Exp $
  + * @version $Id: Multiplexer.java,v 1.63 2007/07/13 06:31:59 belaban Exp $
    */
   public class Multiplexer implements UpHandler {
       /** Map<String,MuxChannel>. Maintains the mapping between service IDs and their associated MuxChannels */
  @@ -311,8 +311,8 @@
               case Event.VIEW_CHANGE:
                   Vector old_members=view != null? view.getMembers() : null;
                   view=(View)evt.getArg();
  -                Vector new_members=view != null? view.getMembers() : null;
  -                Vector left_members=Util.determineLeftMembers(old_members, new_members);
  +                Vector<Address> new_members=view != null? view.getMembers() : null;
  +                Vector<Address> left_members=Util.determineLeftMembers(old_members, new_members);
   
                   if(view instanceof MergeView) {
                       final MergeView temp_merge_view=(MergeView)view.clone();

User: vlada   
  Date: 07/08/16 12:14:28

  Modified:    src/org/jgroups/mux Multiplexer.java
  Log:
  [JGRP-491] Multiplexer should execute getState for all registered MuxChannel under one FLUSH phase
  simplify FLUSH invocation for getState
  
  Revision  Changes    Path
  1.64      +5 -3      JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.63
  retrieving revision 1.64
  diff -u -r1.63 -r1.64
  --- Multiplexer.java	13 Jul 2007 06:31:59 -0000	1.63
  +++ Multiplexer.java	16 Aug 2007 19:14:28 -0000	1.64
  @@ -20,7 +20,7 @@
    * message is removed and the MuxChannel corresponding to the header's service ID is retrieved from the map,
    * and MuxChannel.up() is called with the message.
    * @author Bela Ban
  - * @version $Id: Multiplexer.java,v 1.63 2007/07/13 06:31:59 belaban Exp $
  + * @version $Id: Multiplexer.java,v 1.64 2007/08/16 19:14:28 vlada Exp $
    */
   public class Multiplexer implements UpHandler {
       /** Map<String,MuxChannel>. Maintains the mapping between service IDs and their associated MuxChannels */
  @@ -202,12 +202,14 @@
        * @param keys
        */
       private boolean fetchServiceStates(Address target, Set<String> keys, long timeout) throws ChannelClosedException, ChannelNotConnectedException {
  -        boolean rc, all_rcs=true;       
  +        boolean rc, all_rcs=true;
  +        channel.startFlush(4000, false);
           for(String stateId: keys) {          
  -            rc=channel.getState(target, stateId, timeout);
  +            rc=channel.getState(target, stateId, timeout,false);
               if(!rc)
                   all_rcs=false;
           }
  +        channel.stopFlush();
           return all_rcs;
       }

User: vlada   
  Date: 07/08/20 12:49:33

  Modified:    src/org/jgroups/mux Multiplexer.java
  Log:
  [JGRP-236] and [JGRP-491] improvements
  
  Revision  Changes    Path
  1.65      +25 -12    JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.64
  retrieving revision 1.65
  diff -u -r1.64 -r1.65
  --- Multiplexer.java	16 Aug 2007 19:14:28 -0000	1.64
  +++ Multiplexer.java	20 Aug 2007 19:49:33 -0000	1.65
  @@ -20,7 +20,7 @@
    * message is removed and the MuxChannel corresponding to the header's service ID is retrieved from the map,
    * and MuxChannel.up() is called with the message.
    * @author Bela Ban
  - * @version $Id: Multiplexer.java,v 1.64 2007/08/16 19:14:28 vlada Exp $
  + * @version $Id: Multiplexer.java,v 1.65 2007/08/20 19:49:33 vlada Exp $
    */
   public class Multiplexer implements UpHandler {
       /** Map<String,MuxChannel>. Maintains the mapping between service IDs and their associated MuxChannels */
  @@ -197,20 +197,33 @@
           }
       }
   
  -    /** Fetches the app states for all service IDs in keys.
  -     * The keys are a duplicate list, so it cannot be modified by the caller of this method
  +    /**
  +     * Fetches the app states for all service IDs in keys. The keys are a
  +     * duplicate list, so it cannot be modified by the caller of this method
  +     * 
        * @param keys
        */
  -    private boolean fetchServiceStates(Address target, Set<String> keys, long timeout) throws ChannelClosedException, ChannelNotConnectedException {
  -        boolean rc, all_rcs=true;
  -        channel.startFlush(4000, false);
  -        for(String stateId: keys) {          
  -            rc=channel.getState(target, stateId, timeout,false);
  -            if(!rc)
  -                all_rcs=false;
  +    private boolean fetchServiceStates(Address target, Set<String> keys, long timeout) throws ChannelClosedException,
  +                                                                                      ChannelNotConnectedException {
  +        boolean rc, all_tranfers_ok = false;
  +        boolean flushStarted = channel.startFlush(4000, false);
  +        if(flushStarted){
  +            try{
  +                for(String stateId:keys){
  +                    rc = channel.getState(target, stateId, timeout, false);
  +                    if(!rc)
  +                        throw new Exception("Failed transfer for state id " + stateId
  +                                            + ", state provider was "
  +                                            + target);
  +                }
  +                all_tranfers_ok = true;
  +            }catch(Exception e){
  +                log.warn("Failed multiple state transfer under one flush phase ", e);
  +            }finally{
  +                channel.stopFlush();
  +            }
           }
  -        channel.stopFlush();
  -        return all_rcs;
  +        return flushStarted && all_tranfers_ok;
       }

User: belaban 
  Date: 07/08/30 03:17:49

  Modified:    src/org/jgroups/mux Multiplexer.java
  Log:
  Promise uses a type parameter now
  
  Revision  Changes    Path
  1.66      +3 -3      JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.65
  retrieving revision 1.66
  diff -u -r1.65 -r1.66
  --- Multiplexer.java	20 Aug 2007 19:49:33 -0000	1.65
  +++ Multiplexer.java	30 Aug 2007 10:17:49 -0000	1.66
  @@ -20,7 +20,7 @@
    * message is removed and the MuxChannel corresponding to the header's service ID is retrieved from the map,
    * and MuxChannel.up() is called with the message.
    * @author Bela Ban
  - * @version $Id: Multiplexer.java,v 1.65 2007/08/20 19:49:33 vlada Exp $
  + * @version $Id: Multiplexer.java,v 1.66 2007/08/30 10:17:49 belaban Exp $
    */
   public class Multiplexer implements UpHandler {
       /** Map<String,MuxChannel>. Maintains the mapping between service IDs and their associated MuxChannels */
  @@ -54,7 +54,7 @@
       private final Map<String,List<Address>> service_state=new HashMap<String,List<Address>>();
   
       /** Used to wait on service state information */
  -    private final Promise service_state_promise=new Promise();
  +    private final Promise<byte[]> service_state_promise=new Promise<byte[]>();
   
       /** Map<Address, Set<String>>. Keys are senders, values are a set of services hosted by that sender.
        * Used to collect responses to LIST_SERVICES_REQ */
  @@ -248,7 +248,7 @@
               channel.send(state_req);
   
               try {
  -                byte[] state=(byte[])service_state_promise.getResultWithTimeout(2000);
  +                byte[] state=service_state_promise.getResultWithTimeout(2000);
                   if(state != null) {
                   	Map<String,List<Address>> new_state=(Map<String,List<Address>>)Util.objectFromByteBuffer(state);
                       synchronized(service_state) {

User: belaban 
  Date: 07/09/17 00:47:02

  Modified:    src/org/jgroups/mux Multiplexer.java
  Log:
  removed warning "service not found" (http://jira.jboss.com/jira/browse/JGRP-595)
  
  Revision  Changes    Path
  1.67      +1 -2      JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.66
  retrieving revision 1.67
  diff -u -r1.66 -r1.67
  --- Multiplexer.java	30 Aug 2007 10:17:49 -0000	1.66
  +++ Multiplexer.java	17 Sep 2007 07:47:02 -0000	1.67
  @@ -20,7 +20,7 @@
    * message is removed and the MuxChannel corresponding to the header's service ID is retrieved from the map,
    * and MuxChannel.up() is called with the message.
    * @author Bela Ban
  - * @version $Id: Multiplexer.java,v 1.66 2007/08/30 10:17:49 belaban Exp $
  + * @version $Id: Multiplexer.java,v 1.67 2007/09/17 07:47:02 belaban Exp $
    */
   public class Multiplexer implements UpHandler {
       /** Map<String,MuxChannel>. Maintains the mapping between service IDs and their associated MuxChannels */
  @@ -318,7 +318,6 @@
   
                   MuxChannel mux_ch=services.get(hdr.id);
                   if(mux_ch == null) {
  -                    log.warn("service " + hdr.id + " not currently running, discarding message " + msg);
                       return null;
                   }
                   return passToMuxChannel(mux_ch, evt, fifo_queue, sender, hdr.id, false); // don't block !

User: vlada   
  Date: 07/09/18 07:56:49

  Modified:    src/org/jgroups/mux Multiplexer.java
  Log:
  [JGRP-339] Remove thread for handling of merge views in Multiplexer once we have out-of-band messages
  use OOB for service control messages
  
  Revision  Changes    Path
  1.68      +5 -16     JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.67
  retrieving revision 1.68
  diff -u -r1.67 -r1.68
  --- Multiplexer.java	17 Sep 2007 07:47:02 -0000	1.67
  +++ Multiplexer.java	18 Sep 2007 14:56:49 -0000	1.68
  @@ -20,7 +20,7 @@
    * message is removed and the MuxChannel corresponding to the header's service ID is retrieved from the map,
    * and MuxChannel.up() is called with the message.
    * @author Bela Ban
  - * @version $Id: Multiplexer.java,v 1.67 2007/09/17 07:47:02 belaban Exp $
  + * @version $Id: Multiplexer.java,v 1.68 2007/09/18 14:56:49 vlada Exp $
    */
   public class Multiplexer implements UpHandler {
       /** Map<String,MuxChannel>. Maintains the mapping between service IDs and their associated MuxChannels */
  @@ -333,20 +333,7 @@
                       if(log.isTraceEnabled())
                           log.trace("received a MergeView: " + temp_merge_view + ", adjusting the service view");                    
                       try {                        
  -                        Thread merge_handler=new Thread() {
  -                            public void run() {
  -                                try {
  -                                    handleMergeView(temp_merge_view);
  -                                }
  -                                catch(Exception e) {
  -                                    if(log.isErrorEnabled())
  -                                        log.error("problems handling merge view", e);
  -                                }
  -                            }
  -                        };
  -                        merge_handler.setName("merge handler view_change");
  -                        merge_handler.setDaemon(false);
  -                        merge_handler.start();
  +                        handleMergeView(temp_merge_view);                        
                       }
                       catch(Exception e) {
                           if(log.isErrorEnabled())
  @@ -592,6 +579,7 @@
           ServiceInfo si=new ServiceInfo(type, service, host, payload);
           MuxHeader hdr=new MuxHeader(si);
           Message service_msg=new Message();
  +        service_msg.setFlag(Message.OOB);
           service_msg.putHeader(NAME, hdr);
           if(bypassFlush && flush_present)
              service_msg.putHeader(FLUSH.NAME, new FLUSH.FlushHeader(FLUSH.FlushHeader.FLUSH_BYPASS));
  @@ -813,7 +801,8 @@
           int num_members=view.size(); // include myself
           Map<Address, Set<String>> copy=null;
   
  -        sendServiceState();
  +        byte[] data=Util.objectToByteBuffer(new HashSet<String>(services.keySet()));
  +        sendServiceMessage(ServiceInfo.LIST_SERVICES_RSP, null, channel.getLocalAddress(), true, data);
   
           synchronized(service_responses) {
               start=System.currentTimeMillis();

User: belaban 
  Date: 07/09/24 03:42:05

  Modified:    src/org/jgroups/mux Multiplexer.java
  Log:
  fixed NPE by creating a (dummy) view is it is null
  
  Revision  Changes    Path
  1.69      +6 -1      JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.68
  retrieving revision 1.69
  diff -u -r1.68 -r1.69
  --- Multiplexer.java	18 Sep 2007 14:56:49 -0000	1.68
  +++ Multiplexer.java	24 Sep 2007 10:42:05 -0000	1.69
  @@ -20,7 +20,7 @@
    * message is removed and the MuxChannel corresponding to the header's service ID is retrieved from the map,
    * and MuxChannel.up() is called with the message.
    * @author Bela Ban
  - * @version $Id: Multiplexer.java,v 1.68 2007/09/18 14:56:49 vlada Exp $
  + * @version $Id: Multiplexer.java,v 1.69 2007/09/24 10:42:05 belaban Exp $
    */
   public class Multiplexer implements UpHandler {
       /** Map<String,MuxChannel>. Maintains the mapping between service IDs and their associated MuxChannels */
  @@ -931,6 +931,11 @@
        * @return the servicd view (a modified copy of the real view), or null if the view was not modified
        */
       private View generateServiceView(List hosts) {
  +        if(view == null) {
  +            Vector<Address> tmp=new Vector<Address>();
  +            tmp.add(local_addr);
  +            view= new View(new ViewId(local_addr), tmp);
  +        }
           Vector<Address> members=new Vector<Address>(view.getMembers());
           members.retainAll(hosts);
           return new View(view.getVid(), members);

User: vlada   
  Date: 07/09/28 03:40:24

  Modified:    src/org/jgroups/mux Multiplexer.java
  Log:
  Parametrized types
  
  Revision  Changes    Path
  1.71      +38 -44    JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.70
  retrieving revision 1.71
  diff -u -r1.70 -r1.71
  --- Multiplexer.java	27 Sep 2007 16:19:50 -0000	1.70
  +++ Multiplexer.java	28 Sep 2007 10:40:23 -0000	1.71
  @@ -3,11 +3,9 @@
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
   import org.jgroups.*;
  -import org.jgroups.TimeoutException;
   import org.jgroups.protocols.pbcast.FLUSH;
   import org.jgroups.stack.StateTransferInfo;
   import org.jgroups.util.FIFOMessageQueue;
  -import org.jgroups.util.Promise;
   import org.jgroups.util.Util;
   
   import java.util.*;
  @@ -20,7 +18,7 @@
    * message is removed and the MuxChannel corresponding to the header's service ID is retrieved from the map,
    * and MuxChannel.up() is called with the message.
    * @author Bela Ban
  - * @version $Id: Multiplexer.java,v 1.70 2007/09/27 16:19:50 vlada Exp $
  + * @version $Id: Multiplexer.java,v 1.71 2007/09/28 10:40:23 vlada Exp $
    */
   public class Multiplexer implements UpHandler {
       /** Map<String,MuxChannel>. Maintains the mapping between service IDs and their associated MuxChannels */
  @@ -43,9 +41,9 @@
   
   
       /** Cluster view */
  -    View view=null;
  +    private volatile View view=null;
   
  -    Address local_addr=null;
  +    private volatile Address local_addr=null;
   
       /** Map<String,Boolean>. Map of service IDs and booleans that determine whether getState() has already been called */
       private final Map<String,Boolean> state_transfer_listeners=new HashMap<String,Boolean>();
  @@ -108,7 +106,7 @@
        * @return The service view
        */
       public View getServiceView(String service_id) {
  -        List hosts=service_state.get(service_id);
  +        List<Address> hosts=service_state.get(service_id);
           if(hosts == null) return null;
           return generateServiceView(hosts);
       }
  @@ -146,7 +144,7 @@
               }
           }
   
  -        Collection values=state_transfer_listeners.values();
  +        Collection<Boolean> values=state_transfer_listeners.values();
           boolean all_true=Util.all(values, Boolean.TRUE);
           if(!all_true)
               return true; // pseudo
  @@ -273,7 +271,7 @@
                   return passToMuxChannel(mux_ch, evt, fifo_queue, sender, hdr.id, false); // don't block !
   
               case Event.VIEW_CHANGE:
  -                Vector old_members=view != null? view.getMembers() : null;
  +                Vector<Address> old_members=view != null? view.getMembers() : null;
                   view=(View)evt.getArg();
                   Vector<Address> new_members=view != null? view.getMembers() : null;
                   Vector<Address> left_members=Util.determineLeftMembers(old_members, new_members);
  @@ -664,20 +662,18 @@
               hosts_copy=new ArrayList<Address>(hosts); // make a copy so we don't modify hosts in generateServiceView()
           }
   
  -        if(removed) {
  -            View service_view=generateServiceView(hosts_copy);
  -            if(service_view != null) {
  -                MuxChannel ch=services.get(service);
  -                if(ch != null) {
  -                    Event view_evt=new Event(Event.VIEW_CHANGE, service_view);
  -                    // ch.up(view_evt);
  -                    if(ch.isConnected())
  -                    	passToMuxChannel(ch, view_evt, fifo_queue, null, service, false);
  -                }
  -                else {
  -                    if(log.isTraceEnabled())
  -                        log.trace("service " + service + " not found, cannot dispatch service view " + service_view);
  -                }
  +        if(removed){
  +            View service_view = generateServiceView(hosts_copy);
  +            MuxChannel ch = services.get(service);
  +            if(ch != null){
  +                Event view_evt = new Event(Event.VIEW_CHANGE, service_view);               
  +                if(ch.isConnected())
  +                    passToMuxChannel(ch, view_evt, fifo_queue, null, service, false);
  +            }else{
  +                if(log.isTraceEnabled())
  +                    log.trace("service " + service
  +                              + " not found, cannot dispatch service view "
  +                              + service_view);
               }
           }
   
  @@ -691,9 +687,6 @@
           List<Address>    hosts, hosts_copy;
           boolean added=false;
   
  -
  -
  -
           // discard if we sent this message
           if(received && host != null && local_addr != null && local_addr.equals(host)) {
               return;
  @@ -712,26 +705,27 @@
               hosts_copy=new ArrayList<Address>(hosts); // make a copy so we don't modify hosts in generateServiceView()
           }
   
  -        if(added) {           
  -            View service_view=generateServiceView(hosts_copy);
  -            if(service_view != null) {
  -                MuxChannel ch=services.get(service);
  -                if(ch != null) {
  -                    Event view_evt=new Event(Event.VIEW_CHANGE, service_view);
  -                    // ch.up(view_evt);
  -                    passToMuxChannel(ch, view_evt, fifo_queue, null, service, false);
  -                }
  -                else {
  -                    if(log.isTraceEnabled())
  -                        log.trace("service " + service + " not found, cannot dispatch service view " + service_view);                }
  +        if(added){
  +            View service_view = generateServiceView(hosts_copy);
  +            MuxChannel ch = services.get(service);
  +            if(ch != null){
  +                Event view_evt = new Event(Event.VIEW_CHANGE, service_view);
  +                passToMuxChannel(ch, view_evt, fifo_queue, null, service, false);
  +            }else{
  +                if(log.isTraceEnabled())
  +                    log.trace("service " + service
  +                              + " not found, cannot dispatch service view "
  +                              + service_view);
               }
  -        }
  +        }        
       }
   
   
       /**
  -     * Fetches the service states from everyone else in the cluster. Once all states have been received and inserted into
  -     * service_state, compute a service view (a copy of MergeView) for each service and pass it up
  +     * Fetches the service states from everyone else in the cluster. Once all
  +     * states have been received and inserted into service_state, compute a
  +     * service view (a copy of MergeView) for each service and pass it up
  +     * 
        * @param view
        */
       private void handleMergeView(MergeView view) throws Exception {
  @@ -765,10 +759,10 @@
           service_responses.clear();       
       }
   
  -    private static int numResponses(Map m) {
  +    private static int numResponses(Map<Address, Set<String>> m) {
           int num=0;
  -        Collection values=m.values();
  -        for(Iterator it=values.iterator(); it.hasNext();) {
  +        Collection<Set<String>> values=m.values();
  +        for(Iterator<Set<String>> it=values.iterator(); it.hasNext();) {
               if(it.next() != null)
                   num++;
           }
  @@ -870,7 +864,7 @@
        * @return the servicd view (a modified copy of the real view), or null if
        *         the view was not modified
        */
  -    private View generateServiceView(List hosts) {
  +    private View generateServiceView(List<Address> hosts) {
           if(view == null) {
               Vector<Address> tmp=new Vector<Address>();
               tmp.add(local_addr);

User: vlada   
  Date: 07/10/01 04:49:09

  Modified:    src/org/jgroups/mux Multiplexer.java
  Log:
  added Channel#getInfo()
  
  Revision  Changes    Path
  1.72      +10 -7     JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.71
  retrieving revision 1.72
  diff -u -r1.71 -r1.72
  --- Multiplexer.java	28 Sep 2007 10:40:23 -0000	1.71
  +++ Multiplexer.java	1 Oct 2007 11:49:07 -0000	1.72
  @@ -6,6 +6,7 @@
   import org.jgroups.protocols.pbcast.FLUSH;
   import org.jgroups.stack.StateTransferInfo;
   import org.jgroups.util.FIFOMessageQueue;
  +import org.jgroups.util.ThreadNamingPattern;
   import org.jgroups.util.Util;
   
   import java.util.*;
  @@ -18,7 +19,7 @@
    * message is removed and the MuxChannel corresponding to the header's service ID is retrieved from the map,
    * and MuxChannel.up() is called with the message.
    * @author Bela Ban
  - * @version $Id: Multiplexer.java,v 1.71 2007/09/28 10:40:23 vlada Exp $
  + * @version $Id: Multiplexer.java,v 1.72 2007/10/01 11:49:07 vlada Exp $
    */
   public class Multiplexer implements UpHandler {
       /** Map<String,MuxChannel>. Maintains the mapping between service IDs and their associated MuxChannels */
  @@ -156,18 +157,20 @@
           return rc;
       }
   
  -    protected static ThreadPoolExecutor createThreadPool() {
  +    protected ThreadPoolExecutor createThreadPool() {
           int min_threads=1, max_threads=4;
           long keep_alive=30000;
   
  -        ThreadFactory factory=new ThreadFactory() {
  -            AtomicInteger num = new AtomicInteger(1);
  -
  +        ThreadFactory factory=new ThreadFactory() {           
               ThreadGroup mux_threads=new ThreadGroup(Util.getGlobalThreadGroup(), "MultiplexerThreads");
   
  +            Map<String,Object> m = channel.getInfo(); 
  +            ThreadNamingPattern pattern = (ThreadNamingPattern) m.get("thread_naming_pattern");
               public Thread newThread(Runnable command) {
  -                Thread ret=new Thread(mux_threads, command, "Multiplexer-" + num.incrementAndGet());
  -                ret.setDaemon(true);
  +                Thread ret=new Thread(mux_threads, command, "Multiplexer");
  +                if(pattern != null){
  +                   pattern.renameThread(ret);
  +                }                
                   return ret;
               }
           };

User: vlada   
  Date: 07/10/02 06:20:23

  Modified:    src/org/jgroups/mux Multiplexer.java
  Log:
  [JGRP-598] - Simplify FLUSH
  [JGRP-600] - Investigate Multiplexer locking scopes
  
  Revision  Changes    Path
  1.73      +63 -83    JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.72
  retrieving revision 1.73
  diff -u -r1.72 -r1.73
  --- Multiplexer.java	1 Oct 2007 11:49:07 -0000	1.72
  +++ Multiplexer.java	2 Oct 2007 13:20:22 -0000	1.73
  @@ -11,7 +11,6 @@
   
   import java.util.*;
   import java.util.concurrent.*;
  -import java.util.concurrent.atomic.AtomicInteger;
   
   /**
    * Used for dispatching incoming messages. The Multiplexer implements UpHandler and registers with the associated
  @@ -19,7 +18,7 @@
    * message is removed and the MuxChannel corresponding to the header's service ID is retrieved from the map,
    * and MuxChannel.up() is called with the message.
    * @author Bela Ban
  - * @version $Id: Multiplexer.java,v 1.72 2007/10/01 11:49:07 vlada Exp $
  + * @version $Id: Multiplexer.java,v 1.73 2007/10/02 13:20:22 vlada Exp $
    */
   public class Multiplexer implements UpHandler {
       /** Map<String,MuxChannel>. Maintains the mapping between service IDs and their associated MuxChannels */
  @@ -29,23 +28,20 @@
       static final String SEPARATOR="::";
       static final short SEPARATOR_LEN=(short)SEPARATOR.length();
       static final String NAME="MUX";    
  -
  -    private boolean flush_present=true;
  +    
       private boolean blocked=false;
   
       /** Thread pool to concurrently process messages sent to different services */
  -    private ExecutorService thread_pool;
  +    private final ExecutorService thread_pool;
   
       /** To make sure messages sent to different services are processed concurrently (using the thread pool above), but
        * messages to the same service are processed FIFO */
  -    private FIFOMessageQueue<String,Runnable> fifo_queue=new FIFOMessageQueue<String,Runnable>();
  +    private final FIFOMessageQueue<String,Runnable> fifo_queue=new FIFOMessageQueue<String,Runnable>();
   
   
       /** Cluster view */
       private volatile View view=null;
   
  -    private volatile Address local_addr=null;
  -
       /** Map<String,Boolean>. Map of service IDs and booleans that determine whether getState() has already been called */
       private final Map<String,Boolean> state_transfer_listeners=new HashMap<String,Boolean>();
   
  @@ -56,28 +52,21 @@
        * Used to collect responses to LIST_SERVICES_REQ */
       private final Map<Address, Set<String>> service_responses=new HashMap<Address, Set<String>>();
   
  -    private long SERVICES_RSP_TIMEOUT=10000;
  -
  -    public Multiplexer() {
  -        this.channel=null;
  -        flush_present=isFlushPresent(); 
  -        
  -        // threadpool is enabled by default
  -        if(Global.getPropertyAsBoolean(Global.MUX_ENABLED, true)){
  -            thread_pool=createThreadPool();
  -        }
  -    }
  +    private long SERVICES_RSP_TIMEOUT=10000;  
   
       public Multiplexer(JChannel channel) {
           this.channel=channel;
           this.channel.setUpHandler(this);
  -        this.channel.setOpt(Channel.BLOCK, Boolean.TRUE); // we want to handle BLOCK events ourselves
  -        flush_present=isFlushPresent(); 
  +        this.channel.setOpt(Channel.BLOCK, Boolean.TRUE); // we want to handle BLOCK events ourselves                
           
  -        //threadpool is enabled by default
  -        if(Global.getPropertyAsBoolean(Global.MUX_ENABLED, true)){
  +        //thread pool is enabled by default
  +        boolean use_thread_pool = Global.getPropertyAsBoolean(Global.MUX_ENABLED, true);
  +        if(use_thread_pool){
               thread_pool=createThreadPool();
           }
  +        else{
  +            thread_pool=null;
  +        }
       }
   
       /**
  @@ -225,16 +214,16 @@
       }
       
       public void sendServiceUpMessage(String service, Address host,boolean bypassFlush) throws Exception {
  -        sendServiceMessage(ServiceInfo.SERVICE_UP, service, host,bypassFlush, null);
  -        if(local_addr != null && host != null && local_addr.equals(host))
  -            handleServiceUp(service, host, false);
  +        //we have to make this service message non OOB since we have
  +        //to FIFO order service messages and BLOCK/UNBLOCK messages        
  +        sendServiceMessage(ServiceInfo.SERVICE_UP, service, host,bypassFlush, null,false);        
       }
   
   
       public void sendServiceDownMessage(String service, Address host,boolean bypassFlush) throws Exception {
  -        sendServiceMessage(ServiceInfo.SERVICE_DOWN, service, host,bypassFlush, null);
  -        if(local_addr != null && host != null && local_addr.equals(host))
  -            handleServiceDown(service, host, false);
  +       //we have to make this service message non OOB since we have
  +       //to FIFO order service messages and BLOCK/UNBLOCK messages        
  +       sendServiceMessage(ServiceInfo.SERVICE_DOWN, service, host,bypassFlush, null,false);       
       }
   
   
  @@ -303,8 +292,14 @@
                       }
                       
                   }
  -                if(!left_members.isEmpty())
  -                    adjustServiceViews(left_members);
  +                for(Address member:left_members){
  +                   try{
  +                       adjustServiceView(member);
  +                   }catch(Throwable t){
  +                       if(log.isErrorEnabled())
  +                           log.error("failed adjusting service views", t);
  +                   }
  +                }                
                   break;
                   
               case Event.PREPARE_VIEW:
  @@ -341,8 +336,7 @@
                   handleStateResponse(evt);
                   break;
   
  -            case Event.SET_LOCAL_ADDRESS:
  -                local_addr=(Address)evt.getArg();
  +            case Event.SET_LOCAL_ADDRESS:                
                   passToAllMuxChannels(evt);
                   break;
   
  @@ -481,17 +475,11 @@
           return all_closed;
       }
   
  -
  -    private boolean isFlushPresent() {
  -        return channel.getProtocolStack().findProtocol("FLUSH") != null;
  -    }   
  -
  -    private Address getLocalAddress() {
  -        if(local_addr != null)
  -            return local_addr;
  +    private Address getLocalAddress() {       
           if(channel != null)
  -            local_addr=channel.getLocalAddress();
  -        return local_addr;
  +            return channel.getLocalAddress();
  +        
  +        return null;
       } 
   
       /**
  @@ -519,7 +507,7 @@
           return result;       
       }
   
  -    private void sendServiceMessage(byte type, String service, Address host,boolean bypassFlush, byte[] payload) throws Exception {
  +    private void sendServiceMessage(byte type, String service, Address host,boolean bypassFlush, byte[] payload, boolean oob) throws Exception {
           if(host == null)
               host=getLocalAddress();
           if(host == null) {
  @@ -531,10 +519,12 @@
   
           ServiceInfo si=new ServiceInfo(type, service, host, payload);
           MuxHeader hdr=new MuxHeader(si);
  -        Message service_msg=new Message();
  -        service_msg.setFlag(Message.OOB);
  +        Message service_msg=new Message();           
  +        
  +        if(oob)
  +           service_msg.setFlag(Message.OOB);
           service_msg.putHeader(NAME, hdr);
  -        if(bypassFlush && flush_present)
  +        if(bypassFlush && channel.flushSupported())
              service_msg.putHeader(FLUSH.NAME, new FLUSH.FlushHeader(FLUSH.FlushHeader.FLUSH_BYPASS));
           
           channel.send(service_msg);
  @@ -560,7 +550,9 @@
   
               MuxChannel mux_ch=services.get(id);
               if(mux_ch == null)
  -                throw new IllegalArgumentException("didn't find service with ID=" + id + " to fetch state from");
  +                throw new IllegalArgumentException("State provider "
  +                  + channel.getLocalAddress()
  +                  + " does not have service with id " + id);
   
               // state_id will be null, get regular state from the service named state_id
               StateTransferInfo ret=(StateTransferInfo)passToMuxChannel(mux_ch, evt, fifo_queue, requester, id, true);
  @@ -602,8 +594,9 @@
           }
   
           mux_ch=services.get(appl_id);
  -        if(mux_ch == null) {
  -            log.error("didn't find service with ID=" + appl_id + " to fetch state from");
  +        if (mux_ch == null){
  +           log.error("State receiver " + channel.getLocalAddress()
  +                 + " does not have service with id " + appl_id);
           }
           else {
               StateTransferInfo tmp_info=info.copy();
  @@ -652,11 +645,6 @@
           List<Address>    hosts, hosts_copy;
           boolean removed=false;
   
  -        // discard if we sent this message
  -        if(received && host != null && local_addr != null && local_addr.equals(host)) {
  -            return;
  -        }
  -
           synchronized(service_state) {
               hosts=service_state.get(service);
               if(hosts == null)
  @@ -668,10 +656,13 @@
           if(removed){
               View service_view = generateServiceView(hosts_copy);
               MuxChannel ch = services.get(service);
  -            if(ch != null){
  -                Event view_evt = new Event(Event.VIEW_CHANGE, service_view);               
  -                if(ch.isConnected())
  -                    passToMuxChannel(ch, view_evt, fifo_queue, null, service, false);
  +            if(ch != null && ch.isConnected()){
  +                Event view_evt = new Event(Event.VIEW_CHANGE, service_view);  
  +                //we cannot pass service message to thread pool since we have
  +                //to FIFO order service messages with BLOCK/UNBLOCK messages
  +                //therefore all of them have to bypass thread pool
  +                
  +                passToMuxChannel(ch, view_evt, fifo_queue, null, service, false,true);
               }else{
                   if(log.isTraceEnabled())
                       log.trace("service " + service
  @@ -690,11 +681,6 @@
           List<Address>    hosts, hosts_copy;
           boolean added=false;
   
  -        // discard if we sent this message
  -        if(received && host != null && local_addr != null && local_addr.equals(host)) {
  -            return;
  -        }
  -
           synchronized(service_state) {
               hosts=service_state.get(service);
               if(hosts == null) {
  @@ -712,8 +698,11 @@
               View service_view = generateServiceView(hosts_copy);
               MuxChannel ch = services.get(service);
               if(ch != null){
  -                Event view_evt = new Event(Event.VIEW_CHANGE, service_view);
  -                passToMuxChannel(ch, view_evt, fifo_queue, null, service, false);
  +                Event view_evt = new Event(Event.VIEW_CHANGE, service_view);     
  +                //we cannot pass service message to thread pool since we have
  +                //to FIFO order service messages with BLOCK/UNBLOCK messages
  +                //therefore all of them have to bypass thread pool
  +                passToMuxChannel(ch, view_evt, fifo_queue, null, service, false,true);
               }else{
                   if(log.isTraceEnabled())
                       log.trace("service " + service
  @@ -737,7 +726,10 @@
           Map<Address, Set<String>> copy=null;
   
           byte[] data=Util.objectToByteBuffer(new HashSet<String>(services.keySet()));
  -        sendServiceMessage(ServiceInfo.LIST_SERVICES_RSP, null, channel.getLocalAddress(), true, data);
  +        
  +        //we have to make this message OOB since we are running on a thread 
  +        //propelling a regular synchronous message call to install a new view 
  +        sendServiceMessage(ServiceInfo.LIST_SERVICES_RSP, null, channel.getLocalAddress(), true, data,true);
   
           synchronized(service_responses) {
               start=System.currentTimeMillis();
  @@ -811,17 +803,6 @@
           }
       }
   
  -    private void adjustServiceViews(Vector<Address> left_members) {
  -        for(Address member:left_members){
  -            try{
  -                adjustServiceView(member);
  -            }catch(Throwable t){
  -                if(log.isErrorEnabled())
  -                    log.error("failed adjusting service views", t);
  -            }
  -        }
  -    }
  -
       private void adjustServiceView(Address host) {
   
           synchronized(service_state){
  @@ -837,10 +818,9 @@
                       // generateServiceView()
                       View service_view = generateServiceView(new ArrayList<Address>(hosts));
                       MuxChannel ch = services.get(service);
  -                    if(ch != null){
  +                    if(ch != null && ch.isConnected()){
                           Event view_evt = new Event(Event.VIEW_CHANGE, service_view);    
  -                        if(ch.isConnected())
  -                            passToMuxChannel(ch, view_evt, fifo_queue, null, service, false);
  +                        passToMuxChannel(ch, view_evt, fifo_queue, null, service, false, true);
                       }else{
                           if(log.isTraceEnabled())
                               log.trace("service " + service
  @@ -870,8 +850,8 @@
       private View generateServiceView(List<Address> hosts) {
           if(view == null) {
               Vector<Address> tmp=new Vector<Address>();
  -            tmp.add(local_addr);
  -            view= new View(new ViewId(local_addr), tmp);
  +            tmp.add(getLocalAddress());
  +            view= new View(new ViewId(getLocalAddress()), tmp);
           }
           Vector<Address> members=new Vector<Address>(view.getMembers());
           members.retainAll(hosts);

User: vlada   
  Date: 07/10/03 03:31:57

  Modified:    src/org/jgroups/mux Multiplexer.java
  Log:
  further simplifications
  
  Revision  Changes    Path
  1.74      +18 -20    JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.73
  retrieving revision 1.74
  diff -u -r1.73 -r1.74
  --- Multiplexer.java	2 Oct 2007 13:20:22 -0000	1.73
  +++ Multiplexer.java	3 Oct 2007 10:31:57 -0000	1.74
  @@ -18,18 +18,18 @@
    * message is removed and the MuxChannel corresponding to the header's service ID is retrieved from the map,
    * and MuxChannel.up() is called with the message.
    * @author Bela Ban
  - * @version $Id: Multiplexer.java,v 1.73 2007/10/02 13:20:22 vlada Exp $
  + * @version $Id: Multiplexer.java,v 1.74 2007/10/03 10:31:57 vlada Exp $
    */
   public class Multiplexer implements UpHandler {
  +	
  +    private static final Log log=LogFactory.getLog(Multiplexer.class);
  +    private static final String SEPARATOR="::";
  +    private static final short SEPARATOR_LEN=(short)SEPARATOR.length();
  +    private static final String NAME="MUX";    
  +    
       /** Map<String,MuxChannel>. Maintains the mapping between service IDs and their associated MuxChannels */
       private final ConcurrentMap<String,MuxChannel> services=new ConcurrentHashMap<String,MuxChannel>();
       private final JChannel channel;
  -    static final Log log=LogFactory.getLog(Multiplexer.class);
  -    static final String SEPARATOR="::";
  -    static final short SEPARATOR_LEN=(short)SEPARATOR.length();
  -    static final String NAME="MUX";    
  -    
  -    private boolean blocked=false;
   
       /** Thread pool to concurrently process messages sent to different services */
       private final ExecutorService thread_pool;
  @@ -54,7 +54,10 @@
   
       private long SERVICES_RSP_TIMEOUT=10000;  
   
  -    public Multiplexer(JChannel channel) {
  +    public Multiplexer(JChannel channel) {       
  +    	if(channel == null || !channel.isOpen())
  +    		throw new IllegalArgumentException("Channel " + channel + " cannot be used for Multiplexer");
  +       
           this.channel=channel;
           this.channel.setUpHandler(this);
           this.channel.setOpt(Channel.BLOCK, Boolean.TRUE); // we want to handle BLOCK events ourselves                
  @@ -74,11 +77,11 @@
        * @return The set of service IDs
        */
       public Set getApplicationIds() {
  -        return services != null? Collections.unmodifiableSet(services.keySet()) : null;
  +        return getServiceIds();
       }
   
       public Set<String> getServiceIds() {
  -        return services != null? Collections.unmodifiableSet(services.keySet()) : null;
  +        return Collections.unmodifiableSet(services.keySet());
       }
   
   
  @@ -102,7 +105,7 @@
       }
   
       public boolean stateTransferListenersPresent() {
  -        return state_transfer_listeners != null && !state_transfer_listeners.isEmpty();
  +        return !state_transfer_listeners.isEmpty();
       }
       
       public synchronized void registerForStateTransfer(String appl_id, String substate_id) {
  @@ -340,17 +343,12 @@
                   passToAllMuxChannels(evt);
                   break;
   
  -            case Event.BLOCK:
  -                blocked=true;
  -                if(!services.isEmpty()) {
  -                    passToAllMuxChannels(evt, true, true); // do block and bypass the thread pool
  -                }
  +            case Event.BLOCK:               
  +                passToAllMuxChannels(evt, true, true); // do block and bypass the thread pool               
                   waitUntilThreadPoolHasNoRunningTasks(1000);
                   return null;
   
  -            case Event.UNBLOCK: // process queued-up MergeViews
  -                if(blocked)
  -                    blocked=false;
  +            case Event.UNBLOCK: // process queued-up MergeViews                
                   passToAllMuxChannels(evt);
                   break;
   
  @@ -365,7 +363,7 @@
           int num_threads=0;
           long end_time=System.currentTimeMillis() + timeout;
   
  -        while(fifo_queue != null && (num_threads=fifo_queue.size()) > 0 && System.currentTimeMillis() < end_time) {
  +        while((num_threads=fifo_queue.size()) > 0 && System.currentTimeMillis() < end_time) {
               Util.sleep(100);
           }
           return num_threads;

User: vlada   
  Date: 07/10/22 11:23:24

  Modified:    src/org/jgroups/mux Multiplexer.java
  Log:
  formatting
  set service message ack to 2 secs
  
  Revision  Changes    Path
  1.77      +3 -4      JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.76
  retrieving revision 1.77
  diff -u -r1.76 -r1.77
  --- Multiplexer.java	22 Oct 2007 18:06:34 -0000	1.76
  +++ Multiplexer.java	22 Oct 2007 18:23:24 -0000	1.77
  @@ -20,7 +20,7 @@
    * message is removed and the MuxChannel corresponding to the header's service ID is retrieved from the map,
    * and MuxChannel.up() is called with the message.
    * @author Bela Ban
  - * @version $Id: Multiplexer.java,v 1.76 2007/10/22 18:06:34 vlada Exp $
  + * @version $Id: Multiplexer.java,v 1.77 2007/10/22 18:23:24 vlada Exp $
    */
   public class Multiplexer implements UpHandler {
   	
  @@ -583,11 +583,10 @@
               int size=service_ack_collector.size();
               
               long start, stop, service_ack_collection_timeout;
  -            service_ack_collection_timeout = 1000;
  +            service_ack_collection_timeout = 2000;
               start = System.currentTimeMillis();
               try {
  -                service_ack_collector
  -                        .waitForAllAcks(service_ack_collection_timeout);
  +                service_ack_collector.waitForAllAcks(service_ack_collection_timeout);
                   stop = System.currentTimeMillis();
                   if (log.isTraceEnabled())
                       log.trace("received all service ACKs (" + size + ")  in "

User: vlada   
  Date: 07/10/23 08:10:29

  Modified:    src/org/jgroups/mux Multiplexer.java
  Log:
  ns
  
  Revision  Changes    Path
  1.78      +16 -18    JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.77
  retrieving revision 1.78
  diff -u -r1.77 -r1.78
  --- Multiplexer.java	22 Oct 2007 18:23:24 -0000	1.77
  +++ Multiplexer.java	23 Oct 2007 15:10:28 -0000	1.78
  @@ -19,8 +19,8 @@
    * JChannel (there can only be 1 Multiplexer per JChannel). When up() is called with a message, the header of the
    * message is removed and the MuxChannel corresponding to the header's service ID is retrieved from the map,
    * and MuxChannel.up() is called with the message.
  - * @author Bela Ban
  - * @version $Id: Multiplexer.java,v 1.77 2007/10/22 18:23:24 vlada Exp $
  + * @author Bela Ban, Vladimir Blagojevic
  + * @version $Id: Multiplexer.java,v 1.78 2007/10/23 15:10:28 vlada Exp $
    */
   public class Multiplexer implements UpHandler {
   	
  @@ -40,7 +40,7 @@
        * messages to the same service are processed FIFO */
       private final FIFOMessageQueue<String,Runnable> fifo_queue=new FIFOMessageQueue<String,Runnable>();
       
  -    /** To collect VIEW_ACKs from all members */
  +    /** To collect service acks from Multiplexers */
       private final AckCollector service_ack_collector=new AckCollector();
   
   
  @@ -57,7 +57,7 @@
        * Used to collect responses to LIST_SERVICES_REQ */
       private final Map<Address, Set<String>> service_responses=new HashMap<Address, Set<String>>();
   
  -    private long SERVICES_RSP_TIMEOUT=10000;  
  +    private long service_response_timeout=10000;  
   
       public Multiplexer(JChannel channel) {       
       	if(channel == null || !channel.isOpen())
  @@ -95,11 +95,11 @@
   
   
       public long getServicesResponseTimeout() {
  -        return SERVICES_RSP_TIMEOUT;
  +        return service_response_timeout;
       }
   
       public void setServicesResponseTimeout(long services_rsp_timeout) {
  -        this.SERVICES_RSP_TIMEOUT=services_rsp_timeout;
  +        this.service_response_timeout=services_rsp_timeout;
       }
   
       /** Returns a copy of the current view <em>minus</em> the nodes on which service service_id is <em>not</em> running
  @@ -572,6 +572,7 @@
           
           if(oob)
              service_msg.setFlag(Message.OOB);
  +        
           service_msg.putHeader(NAME, hdr);
           if(bypassFlush && channel.flushSupported())
              service_msg.putHeader(FLUSH.NAME, new FLUSH.FlushHeader(FLUSH.FlushHeader.FLUSH_BYPASS));
  @@ -580,17 +581,14 @@
           
           if (synchronous) {
               service_ack_collector.reset(null, service_state.get(service));
  -            int size=service_ack_collector.size();
  -            
  -            long start, stop, service_ack_collection_timeout;
  -            service_ack_collection_timeout = 2000;
  -            start = System.currentTimeMillis();
  +            int size=service_ack_collector.size();                       
  +            long service_ack_collection_timeout = 2000;
  +            long start = System.currentTimeMillis();
               try {
  -                service_ack_collector.waitForAllAcks(service_ack_collection_timeout);
  -                stop = System.currentTimeMillis();
  +                service_ack_collector.waitForAllAcks(service_ack_collection_timeout);                
                   if (log.isTraceEnabled())
                       log.trace("received all service ACKs (" + size + ")  in "
  -                            + (stop - start) + "ms");
  +                            + (System.currentTimeMillis() - start) + "ms");
               } catch (TimeoutException e) {
                   log.warn("failed to collect all service ACKs (" + size
                           + ") for " + service_msg + " after "
  @@ -712,7 +710,8 @@
           MuxHeader hdr=new MuxHeader(si);
           ack.putHeader(NAME, hdr);
           
  -        channel.send(ack);
  +        if(channel.isConnected())
  +            channel.send(ack);
       }
   
       private void handleServicesRsp(Address sender, byte[] state) throws Exception {       
  @@ -812,7 +811,7 @@
        * @param view
        */
       private void handleMergeView(MergeView view) throws Exception {
  -        long time_to_wait=SERVICES_RSP_TIMEOUT, start;
  +        long time_to_wait=service_response_timeout, start;
           int num_members=view.size(); // include myself
           Map<Address, Set<String>> copy=null;
   
  @@ -888,8 +887,7 @@
               List<Address> hosts=service_state.get(service);           
               Vector<Address> membersCopy = new Vector<Address>(view.getMembers());
               membersCopy.retainAll(hosts);
  -            MergeView v=new MergeView(view.getVid(), membersCopy, view.getSubgroups());            
  -            // ch.up(evt);
  +            MergeView v=new MergeView(view.getVid(), membersCopy, view.getSubgroups());               
               passToMuxChannel(ch, new Event(Event.VIEW_CHANGE, v), fifo_queue, null, service, false);
           }
       }

User: vlada   
  Date: 07/10/29 11:50:42

  Modified:    src/org/jgroups/mux Multiplexer.java
  Log:
  process STATE_TRANSFER_OUTPUTSTREAM concurrently at Multiplexer
  
  Revision  Changes    Path
  1.80      +23 -9     JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.79
  retrieving revision 1.80
  diff -u -r1.79 -r1.80
  --- Multiplexer.java	23 Oct 2007 15:42:39 -0000	1.79
  +++ Multiplexer.java	29 Oct 2007 18:50:27 -0000	1.80
  @@ -36,7 +36,7 @@
    * @author Bela Ban, Vladimir Blagojevic
    * @see MuxChannel
    * @see Channel
  - * @version $Id: Multiplexer.java,v 1.79 2007/10/23 15:42:39 vlada Exp $
  + * @version $Id: Multiplexer.java,v 1.80 2007/10/29 18:50:27 vlada Exp $
    */
   public class Multiplexer implements UpHandler {
   	
  @@ -361,9 +361,16 @@
                   break;
   
               case Event.GET_APPLSTATE:
  +                return handleStateRequest(evt,true);
               case Event.STATE_TRANSFER_OUTPUTSTREAM:
  -                return handleStateRequest(evt);
  -
  +                //Vladimir Oct 29,2007 Multiplexer.java 1.79
  +                //STREAMING_STATE_TRANSFER does not require return value.
  +                //If there is not return value STATE_TRANSFER_OUTPUTSTREAM event 
  +                //can be processed concurrently by Multiplexer along with other messages 
  +                //for a specific MuxChannel
  +                //@see Multiplexer#passToMuxChannel();
  +                handleStateRequest(evt,false);
  +                break;
               case Event.GET_STATE_OK:
               case Event.STATE_TRANSFER_INPUTSTREAM:
                   handleStateResponse(evt);
  @@ -595,8 +602,15 @@
           
           channel.send(service_msg);
           
  -        if (synchronous) {
  -            service_ack_collector.reset(null, service_state.get(service));
  +        if (synchronous) {           
  +            //the host that is sending this message should also ack
  +            CopyOnWriteArrayList<Address> muxChannels = new CopyOnWriteArrayList<Address>();
  +            muxChannels.add(host);           
  +            List<Address> list = service_state.get(service);                
  +            if(list != null && !list.isEmpty()){
  +                muxChannels.addAllAbsent(list);               
  +            }  
  +            service_ack_collector.reset(null, muxChannels);
               int size=service_ack_collector.size();                       
               long service_ack_collection_timeout = 2000;
               long start = System.currentTimeMillis();
  @@ -619,7 +633,7 @@
   
   
   
  -    private Object handleStateRequest(Event evt) {
  +    private Object handleStateRequest(Event evt, boolean hasReturnValue) {
           StateTransferInfo info=(StateTransferInfo)evt.getArg();
           String id=info.state_id;
           String original_id=id;
  @@ -642,7 +656,7 @@
                     + " does not have service with id " + id);
   
               // state_id will be null, get regular state from the service named state_id
  -            StateTransferInfo ret=(StateTransferInfo)passToMuxChannel(mux_ch, evt, fifo_queue, requester, id, true);
  +            StateTransferInfo ret=(StateTransferInfo)passToMuxChannel(mux_ch, evt, fifo_queue, requester, id, hasReturnValue);
               if(ret != null)
           	ret.state_id=original_id;
               return ret;
  @@ -790,7 +804,7 @@
           synchronized(service_state) {
               hosts=service_state.get(service);
               if(hosts == null) {
  -                hosts=new ArrayList<Address>();
  +                hosts=new CopyOnWriteArrayList<Address>();
                   service_state.put(service,  hosts);
               }
               if(!hosts.contains(host)) {
  @@ -885,7 +899,7 @@
                   for(String service:service_list) {                    
                       List<Address> my_services=service_state.get(service);
                       if(my_services == null) {
  -                        my_services=new ArrayList<Address>();
  +                        my_services=new CopyOnWriteArrayList<Address>();
                           service_state.put(service, my_services);
                       }

User: vlada   
  Date: 07/10/30 10:53:07

  Modified:    src/org/jgroups/mux Multiplexer.java
  Log:
  [JGRP-570] - Complete thread naming for all channel threads
  
  Revision  Changes    Path
  1.81      +9 -17     JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.80
  retrieving revision 1.81
  diff -u -r1.80 -r1.81
  --- Multiplexer.java	29 Oct 2007 18:50:27 -0000	1.80
  +++ Multiplexer.java	30 Oct 2007 17:53:07 -0000	1.81
  @@ -3,8 +3,10 @@
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
   import org.jgroups.*;
  +import org.jgroups.ThreadFactory;
   import org.jgroups.TimeoutException;
   import org.jgroups.protocols.pbcast.FLUSH;
  +import org.jgroups.stack.ProtocolStack;
   import org.jgroups.stack.StateTransferInfo;
   import org.jgroups.util.AckCollector;
   import org.jgroups.util.FIFOMessageQueue;
  @@ -36,7 +38,7 @@
    * @author Bela Ban, Vladimir Blagojevic
    * @see MuxChannel
    * @see Channel
  - * @version $Id: Multiplexer.java,v 1.80 2007/10/29 18:50:27 vlada Exp $
  + * @version $Id: Multiplexer.java,v 1.81 2007/10/30 17:53:07 vlada Exp $
    */
   public class Multiplexer implements UpHandler {
   	
  @@ -177,27 +179,17 @@
       protected ThreadPoolExecutor createThreadPool() {
           int min_threads=1, max_threads=4;
           long keep_alive=30000;
  -
  -        ThreadFactory factory=new ThreadFactory() {           
  -            ThreadGroup mux_threads=new ThreadGroup(Util.getGlobalThreadGroup(), "MultiplexerThreads");
  -
  -            Map<String,Object> m = channel.getInfo(); 
  -            ThreadNamingPattern pattern = (ThreadNamingPattern) m.get("thread_naming_pattern");
  -            public Thread newThread(Runnable command) {
  -                Thread ret=new Thread(mux_threads, command, "Multiplexer");
  -                if(pattern != null){
  -                   pattern.renameThread(ret);
  -                }                
  -                return ret;
  -            }
  -        };
  -
  +        
  +        Map<String,Object> m = channel.getInfo();
  +        ThreadNamingPattern pattern = (ThreadNamingPattern) m.get("thread_naming_pattern");
           min_threads=Global.getPropertyAsInteger(Global.MUX_MIN_THREADS, min_threads);
           max_threads=Global.getPropertyAsInteger(Global.MUX_MAX_THREADS, max_threads);
           keep_alive=Global.getPropertyAsLong(Global.MUX_KEEPALIVE, keep_alive);
   
  +        ThreadFactory factory = ProtocolStack.newThreadFactory(pattern, new ThreadGroup(Util.getGlobalThreadGroup(), "MultiplexerThreads"), "Multiplexer", false);
           return new ThreadPoolExecutor(min_threads, max_threads, keep_alive, TimeUnit.MILLISECONDS,
  -                                      new SynchronousQueue<Runnable>(), factory,
  +                                      new SynchronousQueue<Runnable>(), 
  +                                      factory,
                                         new ThreadPoolExecutor.CallerRunsPolicy());
       }

User: belaban 
  Date: 07/10/31 02:15:19

  Modified:    src/org/jgroups/mux Multiplexer.java
  Log:
  moved ThreadFactory to org.jgroups.util
  
  Revision  Changes    Path
  1.82      +3 -7      JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.81
  retrieving revision 1.82
  diff -u -r1.81 -r1.82
  --- Multiplexer.java	30 Oct 2007 17:53:07 -0000	1.81
  +++ Multiplexer.java	31 Oct 2007 09:15:19 -0000	1.82
  @@ -3,15 +3,11 @@
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
   import org.jgroups.*;
  -import org.jgroups.ThreadFactory;
   import org.jgroups.TimeoutException;
   import org.jgroups.protocols.pbcast.FLUSH;
   import org.jgroups.stack.ProtocolStack;
   import org.jgroups.stack.StateTransferInfo;
  -import org.jgroups.util.AckCollector;
  -import org.jgroups.util.FIFOMessageQueue;
  -import org.jgroups.util.ThreadNamingPattern;
  -import org.jgroups.util.Util;
  +import org.jgroups.util.*;
   
   import java.util.*;
   import java.util.concurrent.*;
  @@ -38,7 +34,7 @@
    * @author Bela Ban, Vladimir Blagojevic
    * @see MuxChannel
    * @see Channel
  - * @version $Id: Multiplexer.java,v 1.81 2007/10/30 17:53:07 vlada Exp $
  + * @version $Id: Multiplexer.java,v 1.82 2007/10/31 09:15:19 belaban Exp $
    */
   public class Multiplexer implements UpHandler {
   	
  @@ -186,7 +182,7 @@
           max_threads=Global.getPropertyAsInteger(Global.MUX_MAX_THREADS, max_threads);
           keep_alive=Global.getPropertyAsLong(Global.MUX_KEEPALIVE, keep_alive);
   
  -        ThreadFactory factory = ProtocolStack.newThreadFactory(pattern, new ThreadGroup(Util.getGlobalThreadGroup(), "MultiplexerThreads"), "Multiplexer", false);
  +        org.jgroups.util.ThreadFactory factory = ProtocolStack.newThreadFactory(pattern, new ThreadGroup(Util.getGlobalThreadGroup(), "MultiplexerThreads"), "Multiplexer", false);
           return new ThreadPoolExecutor(min_threads, max_threads, keep_alive, TimeUnit.MILLISECONDS,
                                         new SynchronousQueue<Runnable>(), 
                                         factory,

User: vlada   
  Date: 07/11/05 07:24:57

  Modified:    src/org/jgroups/mux Multiplexer.java
  Log:
  [JGRP-616] - NullPointerException in Multiplexer.java
  
  Revision  Changes    Path
  1.83      +10 -5     JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.82
  retrieving revision 1.83
  diff -u -r1.82 -r1.83
  --- Multiplexer.java	31 Oct 2007 09:15:19 -0000	1.82
  +++ Multiplexer.java	5 Nov 2007 15:24:57 -0000	1.83
  @@ -34,7 +34,7 @@
    * @author Bela Ban, Vladimir Blagojevic
    * @see MuxChannel
    * @see Channel
  - * @version $Id: Multiplexer.java,v 1.82 2007/10/31 09:15:19 belaban Exp $
  + * @version $Id: Multiplexer.java,v 1.83 2007/11/05 15:24:57 vlada Exp $
    */
   public class Multiplexer implements UpHandler {
   	
  @@ -638,10 +638,15 @@
               }
   
               MuxChannel mux_ch=services.get(id);
  -            if(mux_ch == null)
  -                throw new IllegalArgumentException("State provider "
  -                  + channel.getLocalAddress()
  -                  + " does not have service with id " + id);
  +            //JGRP-616
  +            if (mux_ch == null) {
  +                if (log.isWarnEnabled())
  +                    log.warn("State provider " + channel.getLocalAddress()
  +                            + " does not have service with id " + id
  +                            + ", returning null state");
  +
  +                return new StateTransferInfo(null, original_id, 0L, null);
  +            }
   
               // state_id will be null, get regular state from the service named state_id
               StateTransferInfo ret=(StateTransferInfo)passToMuxChannel(mux_ch, evt, fifo_queue, requester, id, hasReturnValue);

User: vlada   
  Date: 07/11/07 13:36:51

  Modified:    src/org/jgroups/mux Multiplexer.java
  Log:
  first initialize ack collector and *then* send a message
  
  Revision  Changes    Path
  1.84      +14 -5     JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.83
  retrieving revision 1.84
  diff -u -r1.83 -r1.84
  --- Multiplexer.java	5 Nov 2007 15:24:57 -0000	1.83
  +++ Multiplexer.java	7 Nov 2007 21:36:51 -0000	1.84
  @@ -34,7 +34,7 @@
    * @author Bela Ban, Vladimir Blagojevic
    * @see MuxChannel
    * @see Channel
  - * @version $Id: Multiplexer.java,v 1.83 2007/11/05 15:24:57 vlada Exp $
  + * @version $Id: Multiplexer.java,v 1.84 2007/11/07 21:36:51 vlada Exp $
    */
   public class Multiplexer implements UpHandler {
   	
  @@ -586,11 +586,10 @@
           
           service_msg.putHeader(NAME, hdr);
           if(bypassFlush && channel.flushSupported())
  -           service_msg.putHeader(FLUSH.NAME, new FLUSH.FlushHeader(FLUSH.FlushHeader.FLUSH_BYPASS));
  +           service_msg.putHeader(FLUSH.NAME, new FLUSH.FlushHeader(FLUSH.FlushHeader.FLUSH_BYPASS));             
           
  -        channel.send(service_msg);
  -        
  -        if (synchronous) {           
  +        if (synchronous) {   
  +            //for synchronous invocation we need to collect acks
               //the host that is sending this message should also ack
               CopyOnWriteArrayList<Address> muxChannels = new CopyOnWriteArrayList<Address>();
               muxChannels.add(host);           
  @@ -598,10 +597,16 @@
               if(list != null && !list.isEmpty()){
                   muxChannels.addAllAbsent(list);               
               }  
  +            
  +            //initialize collector and ...
               service_ack_collector.reset(null, muxChannels);
               int size=service_ack_collector.size();                       
               long service_ack_collection_timeout = 2000;
               long start = System.currentTimeMillis();
  +            
  +            //then send a message
  +            channel.send(service_msg);
  +            
               try {
                   service_ack_collector.waitForAllAcks(service_ack_collection_timeout);                
                   if (log.isTraceEnabled())
  @@ -616,6 +621,10 @@
                           + service_ack_collector.printReceived()
                           + "), local_addr=" + getLocalAddress());
               }
  +        } 
  +        else{
  +            //if asynchronous then fire and forget 
  +            channel.send(service_msg);            
           }
       }

User: vlada   
  Date: 07/11/07 13:46:23

  Modified:    src/org/jgroups/mux Multiplexer.java
  Log:
  ns
  
  Revision  Changes    Path
  1.85      +3 -4      JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.84
  retrieving revision 1.85
  diff -u -r1.84 -r1.85
  --- Multiplexer.java	7 Nov 2007 21:36:51 -0000	1.84
  +++ Multiplexer.java	7 Nov 2007 21:46:23 -0000	1.85
  @@ -34,7 +34,7 @@
    * @author Bela Ban, Vladimir Blagojevic
    * @see MuxChannel
    * @see Channel
  - * @version $Id: Multiplexer.java,v 1.84 2007/11/07 21:36:51 vlada Exp $
  + * @version $Id: Multiplexer.java,v 1.85 2007/11/07 21:46:23 vlada Exp $
    */
   public class Multiplexer implements UpHandler {
   	
  @@ -601,12 +601,11 @@
               //initialize collector and ...
               service_ack_collector.reset(null, muxChannels);
               int size=service_ack_collector.size();                       
  -            long service_ack_collection_timeout = 2000;
  -            long start = System.currentTimeMillis();
  +            long service_ack_collection_timeout = 2000;            
               
               //then send a message
               channel.send(service_msg);
  -            
  +            long start = System.currentTimeMillis();
               try {
                   service_ack_collector.waitForAllAcks(service_ack_collection_timeout);                
                   if (log.isTraceEnabled())

User: vlada   
  Date: 07/11/15 11:39:48

  Modified:    src/org/jgroups/mux Multiplexer.java
  Log:
  JGRP-623
  JGRP-622
  
  Revision  Changes    Path
  1.86      +20 -19    JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.85
  retrieving revision 1.86
  diff -u -r1.85 -r1.86
  --- Multiplexer.java	7 Nov 2007 21:46:23 -0000	1.85
  +++ Multiplexer.java	15 Nov 2007 19:39:48 -0000	1.86
  @@ -34,7 +34,7 @@
    * @author Bela Ban, Vladimir Blagojevic
    * @see MuxChannel
    * @see Channel
  - * @version $Id: Multiplexer.java,v 1.85 2007/11/07 21:46:23 vlada Exp $
  + * @version $Id: Multiplexer.java,v 1.86 2007/11/15 19:39:48 vlada Exp $
    */
   public class Multiplexer implements UpHandler {
   	
  @@ -424,9 +424,17 @@
               passToMuxChannel(ch, evt, fifo_queue, null, service_name, block, bypass_thread_pool);
           }
       }
  +    
  +    public void addServiceIfNotPresent(String id, MuxChannel ch) {
  +        services.putIfAbsent(id, ch);
  +    }
   
  -    public MuxChannel remove(String id) {
  -        return services.remove(id);
  +    protected MuxChannel removeService(String id) {
  +        MuxChannel ch = services.remove(id);
  +        //http://jira.jboss.com/jira/browse/JGRP-623
  +        if (ch != null)
  +            ch.up(new Event(Event.UNBLOCK));
  +        return ch;      
       }
   
   
  @@ -448,11 +456,6 @@
           }
       }
   
  -
  -    public void unregister(String appl_id) {
  -        services.remove(appl_id);
  -    }
  -
       public boolean close() {
           boolean all_closed=true;
           for(MuxChannel mux_ch: services.values()) {
  @@ -792,9 +795,10 @@
               }
           }
   
  -        Address local_address=getLocalAddress();
  -        if(local_address != null && host != null && host.equals(local_address))
  -            unregister(service);
  +        Address local_address = getLocalAddress();
  +        boolean isMyService = local_address != null && local_address.equals(host);
  +        if (isMyService)
  +            removeService(service);        
       }
   
   
  @@ -925,6 +929,7 @@
   
       private void adjustServiceView(Address host) {
   
  +        Address local_address = getLocalAddress();
           synchronized(service_state){
               for(Iterator<Map.Entry<String, List<Address>>> it = service_state.entrySet().iterator();it.hasNext();){
                   Map.Entry<String, List<Address>> entry = it.next();
  @@ -947,10 +952,10 @@
                                         + " not found, cannot dispatch service view "
                                         + service_view);
                       }
  -                }
  -                Address local_address = getLocalAddress();
  -                if(local_address != null && host != null && host.equals(local_address))
  -                    unregister(service);
  +                }                
  +                boolean isMyService = local_address != null && local_address.equals(host);
  +                if (isMyService)
  +                    removeService(service);
               }
           }
       }
  @@ -1012,10 +1017,6 @@
           return null;
       }
   
  -    public void addServiceIfNotPresent(String id, MuxChannel ch) {
  -        services.putIfAbsent(id, ch);
  -    }
  -
   
       private static class Task implements Runnable {
           Exchanger<Object> exchanger;

User: vlada   
  Date: 07/11/23 12:57:44

  Modified:    src/org/jgroups/mux Multiplexer.java
  Log:
  simplifications after review with Bela
  deprecate use_reading_thread
  close streams ourselves - client can make mistakes
  
  Revision  Changes    Path
  1.87      +6 -12     JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.86
  retrieving revision 1.87
  diff -u -r1.86 -r1.87
  --- Multiplexer.java	15 Nov 2007 19:39:48 -0000	1.86
  +++ Multiplexer.java	23 Nov 2007 20:57:44 -0000	1.87
  @@ -34,7 +34,7 @@
    * @author Bela Ban, Vladimir Blagojevic
    * @see MuxChannel
    * @see Channel
  - * @version $Id: Multiplexer.java,v 1.86 2007/11/15 19:39:48 vlada Exp $
  + * @version $Id: Multiplexer.java,v 1.87 2007/11/23 20:57:44 vlada Exp $
    */
   public class Multiplexer implements UpHandler {
   	
  @@ -350,18 +350,12 @@
   
               case Event.GET_APPLSTATE:
                   return handleStateRequest(evt,true);
  -            case Event.STATE_TRANSFER_OUTPUTSTREAM:
  -                //Vladimir Oct 29,2007 Multiplexer.java 1.79
  -                //STREAMING_STATE_TRANSFER does not require return value.
  -                //If there is not return value STATE_TRANSFER_OUTPUTSTREAM event 
  -                //can be processed concurrently by Multiplexer along with other messages 
  -                //for a specific MuxChannel
  -                //@see Multiplexer#passToMuxChannel();
  -                handleStateRequest(evt,false);
  +            case Event.STATE_TRANSFER_OUTPUTSTREAM:              
  +                handleStateRequest(evt,true);
                   break;
               case Event.GET_STATE_OK:
               case Event.STATE_TRANSFER_INPUTSTREAM:
  -                handleStateResponse(evt);
  +                handleStateResponse(evt,true);                              
                   break;
   
               case Event.SET_LOCAL_ADDRESS:                
  @@ -674,7 +668,7 @@
   
   
   
  -    private void handleStateResponse(Event evt) {
  +    private void handleStateResponse(Event evt,boolean block) {
           StateTransferInfo info=(StateTransferInfo)evt.getArg();
           MuxChannel mux_ch;
           Address state_sender=info.target;
  @@ -707,7 +701,7 @@
               StateTransferInfo tmp_info=info.copy();
               tmp_info.state_id=substate_id;
               Event tmpEvt=new Event(evt.getType(), tmp_info);
  -            passToMuxChannel(mux_ch, tmpEvt, fifo_queue, state_sender, appl_id, false);
  +            passToMuxChannel(mux_ch, tmpEvt, fifo_queue, state_sender, appl_id, block);
           }
       }

User: vlada   
  Date: 08/01/06 22:07:23

  Modified:    src/org/jgroups/mux Multiplexer.java
  Log:
  reduce member visibility
  
  Revision  Changes    Path
  1.88      +20 -33    JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.87
  retrieving revision 1.88
  diff -u -r1.87 -r1.88
  --- Multiplexer.java	23 Nov 2007 20:57:44 -0000	1.87
  +++ Multiplexer.java	7 Jan 2008 06:07:23 -0000	1.88
  @@ -34,7 +34,7 @@
    * @author Bela Ban, Vladimir Blagojevic
    * @see MuxChannel
    * @see Channel
  - * @version $Id: Multiplexer.java,v 1.87 2007/11/23 20:57:44 vlada Exp $
  + * @version $Id: Multiplexer.java,v 1.88 2008/01/07 06:07:23 vlada Exp $
    */
   public class Multiplexer implements UpHandler {
   	
  @@ -91,7 +91,7 @@
           }
       }
       
  -    public JChannel getChannel(){
  +    JChannel getChannel(){
           return channel;
       }
   
  @@ -121,13 +121,13 @@
        * @param service_id
        * @return The service view
        */
  -    public View getServiceView(String service_id) {
  +    View getServiceView(String service_id) {
           List<Address> hosts=service_state.get(service_id);
           if(hosts == null) return null;
           return generateServiceView(hosts);
       }
   
  -    public boolean stateTransferListenersPresent() {
  +    boolean stateTransferListenersPresent() {
           return !state_transfer_listeners.isEmpty();
       }
       
  @@ -138,7 +138,7 @@
           state_transfer_listeners.put(key, Boolean.FALSE);
       }
   
  -    public synchronized boolean getState(Address target, String id, long timeout) throws ChannelNotConnectedException, ChannelClosedException {
  +    synchronized boolean getState(Address target, String id, long timeout) throws ChannelNotConnectedException, ChannelClosedException {
           if(state_transfer_listeners.isEmpty())
               return false;            
           
  @@ -229,14 +229,14 @@
           return flushStarted && all_tranfers_ok;
       }
       
  -    public void sendServiceUpMessage(String service, Address host,boolean bypassFlush) throws Exception {
  +    void sendServiceUpMessage(String service, Address host,boolean bypassFlush) throws Exception {
           //we have to make this service message non OOB since we have
           //to FIFO order service messages and BLOCK/UNBLOCK messages        
           sendServiceMessage(true,ServiceInfo.SERVICE_UP, service, host,bypassFlush, null,false);        
       }
   
   
  -    public void sendServiceDownMessage(String service, Address host,boolean bypassFlush) throws Exception {
  +    void sendServiceDownMessage(String service, Address host,boolean bypassFlush) throws Exception {
          //we have to make this service message non OOB since we have
          //to FIFO order service messages and BLOCK/UNBLOCK messages        
          sendServiceMessage(true,ServiceInfo.SERVICE_DOWN, service, host,bypassFlush, null,false);       
  @@ -419,7 +419,7 @@
           }
       }
       
  -    public void addServiceIfNotPresent(String id, MuxChannel ch) {
  +    void addServiceIfNotPresent(String id, MuxChannel ch) {
           services.putIfAbsent(id, ch);
       }
   
  @@ -434,7 +434,7 @@
   
   
       /** Closes the underlying JChannel if all MuxChannels have been disconnected */
  -    public void disconnect() {
  +    void disconnect() {
           boolean all_disconnected=true;
           for(MuxChannel mux_ch: services.values()) {
               if(mux_ch.isConnected()) {
  @@ -471,14 +471,11 @@
   
       public void closeAll() {
           for(MuxChannel mux_ch: services.values()) {
  -            mux_ch.setConnected(false);
  -            mux_ch.setClosed(true);
  -            mux_ch.closeMessageQueue(true);
  -        }
  -        shutdownThreadPool();
  +            mux_ch.close();
  +        }        
       }
   
  -    public boolean shutdown() {
  +    boolean shutdown() {
           boolean all_closed=true;
           for(MuxChannel mux_ch: services.values()) {
               if(mux_ch.isOpen()) {
  @@ -497,45 +494,35 @@
           return all_closed;
       }
   
  -    public Address getLocalAddress() {       
  +    Address getLocalAddress() {       
       	return channel.getLocalAddress();             
       } 
       
  -    public boolean flushSupported(){
  +    boolean flushSupported(){
       	return channel.flushSupported();
       }
       
  -    public boolean startFlush(boolean automatic_resume){
  +    boolean startFlush(boolean automatic_resume){
       	return channel.startFlush(automatic_resume);
       }
       
  -    public void stopFlush(){
  +    void stopFlush(){
       	channel.stopFlush();
       }
       
  -    public boolean isConnected(){
  +    boolean isConnected(){
       	return channel.isConnected();
       }
       
  -    public void connect(String cluster_name) throws ChannelException{
  +    void connect(String cluster_name) throws ChannelException{
       	channel.connect(cluster_name);
       }
  -    
  -    /**
  -    Re-opens a closed channel. Throws an exception if the channel is already open. After this method
  -    returns, connect() may be called to join a group. The address of this member will be different from
  -    the previous incarnation.
  -    */
  -    public void open() throws ChannelException {
  -    	channel.open();
  -    }
  -
   
      /**
       Determines whether the channel is open; 
       i.e., the protocol stack has been created (may not be connected though).
       */
  -    public boolean isOpen(){
  +    boolean isOpen(){
       	return channel.isOpen();
       }
   
  @@ -550,7 +537,7 @@
       * @param service_id
       * @return
       */
  -    public Address getStateProvider(Address preferredTarget, String service_id) {
  +    Address getStateProvider(Address preferredTarget, String service_id) {
           Address result = null;      
           List<Address> hosts=service_state.get(service_id);
           if(hosts != null && !hosts.isEmpty()){

User: vlada   
  Date: 08/01/07 23:14:31

  Modified:    src/org/jgroups/mux Multiplexer.java
  Log:
  [JGRP-657] - Shunning does not work for Multiplexer
  
  Revision  Changes    Path
  1.89      +53 -3     JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.88
  retrieving revision 1.89
  diff -u -r1.88 -r1.89
  --- Multiplexer.java	7 Jan 2008 06:07:23 -0000	1.88
  +++ Multiplexer.java	8 Jan 2008 07:14:31 -0000	1.89
  @@ -34,7 +34,7 @@
    * @author Bela Ban, Vladimir Blagojevic
    * @see MuxChannel
    * @see Channel
  - * @version $Id: Multiplexer.java,v 1.88 2008/01/07 06:07:23 vlada Exp $
  + * @version $Id: Multiplexer.java,v 1.89 2008/01/08 07:14:31 vlada Exp $
    */
   public class Multiplexer implements UpHandler {
   	
  @@ -78,6 +78,7 @@
       		throw new IllegalArgumentException("Channel " + channel + " cannot be used for Multiplexer");
          
           this.channel=channel;
  +        this.channel.addChannelListener(new MultiplexerChannelListener());
           this.channel.setUpHandler(this);
           this.channel.setOpt(Channel.BLOCK, Boolean.TRUE); // we want to handle BLOCK events ourselves                
           
  @@ -370,6 +371,10 @@
               case Event.UNBLOCK: // process queued-up MergeViews                
                   passToAllMuxChannels(evt);
                   break;
  +            case Event.EXIT:
  +                //we are being shunned, close all services                
  +                closeAll();                
  +                break;
   
               default:
                   passToAllMuxChannels(evt);
  @@ -470,8 +475,10 @@
       }
   
       public void closeAll() {
  -        for(MuxChannel mux_ch: services.values()) {
  -            mux_ch.close();
  +        for(MuxChannel mux_ch: services.values()) {                         
  +            mux_ch.setConnected(false);                   
  +            mux_ch.setClosed(true);                 
  +            mux_ch.closeMessageQueue(true);                       
           }        
       }
   
  @@ -619,6 +626,13 @@
           String original_id=id;
           Address requester=info.target; // the sender of the state request
   
  +        if(id == null){
  +        	if(log.isWarnEnabled()){
  +	            log.warn("Invalid state request arrived at Multiplexer, dropping it");
  +	        }
  +            return null;
  +        }
  +        
           try {
               int index=id.indexOf(SEPARATOR);
               if(index > -1) {
  @@ -997,6 +1011,42 @@
           }
           return null;
       }
  +    
  +    private class MultiplexerChannelListener extends ChannelListenerAdapter{        
  +
  +        //handle reconnecting of services after being shunned and 
  +        //then reconnected back 
  +        @Override
  +        public void channelReconnected(Address addr) {
  +            if(log.isDebugEnabled())
  +                log.debug("Reconnecting services " + services.keySet());
  +            
  +            for(MuxChannel mux_ch: services.values()) {                         
  +                try {
  +                    if(log.isDebugEnabled())
  +                        log.debug("Reconnecting service " + mux_ch.getId());
  +                    
  +                    mux_ch.open();
  +                    boolean reconnect = ((Boolean) mux_ch.getOpt(Channel.AUTO_RECONNECT)).booleanValue();
  +                    boolean getState = ((Boolean) mux_ch.getOpt(Channel.AUTO_GETSTATE)).booleanValue();
  +                    boolean fetchAndGetState = reconnect && getState;
  +                    if(fetchAndGetState){
  +                        mux_ch.connect(mux_ch.getClusterName(),null,null,10000);
  +                    }else{
  +                        if(reconnect){
  +                            mux_ch.connect(mux_ch.getClusterName());
  +                        }                        
  +                        if(getState){
  +                            mux_ch.getState(null, 5000);
  +                        }
  +                    }
  +                } catch (ChannelException e) {                   
  +                    if(log.isErrorEnabled()) 
  +                        log.error("MuxChannel reconnect failed " + e);                                     
  +                }                                               
  +            }
  +        }                
  +    }
   
   
       private static class Task implements Runnable {

User: vlada   
  Date: 08/01/24 17:45:07

  Modified:    src/org/jgroups/mux Tag: Branch_JGroups_2_6 Multiplexer.java
  Log:
  ns
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.85.2.5  +12 -12    JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.85.2.4
  retrieving revision 1.85.2.5
  diff -u -r1.85.2.4 -r1.85.2.5
  --- Multiplexer.java	16 Jan 2008 09:15:14 -0000	1.85.2.4
  +++ Multiplexer.java	25 Jan 2008 01:45:06 -0000	1.85.2.5
  @@ -35,7 +35,7 @@
    * @author Bela Ban, Vladimir Blagojevic
    * @see MuxChannel
    * @see Channel
  - * @version $Id: Multiplexer.java,v 1.85.2.4 2008/01/16 09:15:14 vlada Exp $
  + * @version $Id: Multiplexer.java,v 1.85.2.5 2008/01/25 01:45:06 vlada Exp $
    */
   public class Multiplexer implements UpHandler {
   	
  @@ -303,12 +303,17 @@
                       catch(Exception e) {
                           if(log.isErrorEnabled())
                               log.error("failed handling merge view", e);
  -                    }                                       
  -                }
  -                else { // regular view
  -                    synchronized(service_responses) {
  -                        service_responses.clear();
  +                    }finally{
  +                        synchronized(service_responses){                            
  +                            service_responses.clear();
  +                        }
  +                        synchronized(services_merged_collector){
  +                            services_merged_collector.clear();
  +                        }
  +                        services_merged.set(false);                       
                       }
  +                }
  +                else { // regular view                    
                       HashMap<String,List<Address>> payload = (HashMap<String, List<Address>>) view.getPayload("service_state");                                      
                       if(payload != null){
                           synchronized(service_state){                           
  @@ -914,8 +919,7 @@
           }              
   
           synchronized(service_responses){
  -            copy = new HashMap<Address, Set<String>>(service_responses);
  -            service_responses.clear();
  +            copy = new HashMap<Address, Set<String>>(service_responses);            
           }
   
           if(log.isDebugEnabled())
  @@ -923,11 +927,7 @@
   
           // merges service_responses with service_state and emits MergeViews for
           // the services affected (MuxChannel)
  -        mergeServiceState(view, copy);
  -        synchronized(services_merged_collector){
  -            services_merged_collector.clear();
  -        }
  -        services_merged.set(false);
  +        mergeServiceState(view, copy);       
       } 
   
       private void mergeServiceState(MergeView view, Map<Address, Set<String>> copy) {

User: vlada   
  Date: 08/01/24 17:45:12

  Modified:    src/org/jgroups/mux Multiplexer.java
  Log:
  ns
  
  Revision  Changes    Path
  1.92      +13 -13    JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.91
  retrieving revision 1.92
  diff -u -r1.91 -r1.92
  --- Multiplexer.java	16 Jan 2008 06:55:08 -0000	1.91
  +++ Multiplexer.java	25 Jan 2008 01:45:12 -0000	1.92
  @@ -35,7 +35,7 @@
    * @author Bela Ban, Vladimir Blagojevic
    * @see MuxChannel
    * @see Channel
  - * @version $Id: Multiplexer.java,v 1.91 2008/01/16 06:55:08 vlada Exp $
  + * @version $Id: Multiplexer.java,v 1.92 2008/01/25 01:45:12 vlada Exp $
    */
   public class Multiplexer implements UpHandler {
   	
  @@ -303,12 +303,17 @@
                       catch(Exception e) {
                           if(log.isErrorEnabled())
                               log.error("failed handling merge view", e);
  -                    }                                       
  -                }
  -                else { // regular view
  -                    synchronized(service_responses) {
  -                        service_responses.clear();
  +                    }finally{
  +                        synchronized(service_responses){                            
  +                            service_responses.clear();
  +                        }
  +                        synchronized(services_merged_collector){
  +                            services_merged_collector.clear();
  +                        }
  +                        services_merged.set(false);                       
                       }
  +                }
  +                else { // regular view                    
                       HashMap<String,List<Address>> payload = (HashMap<String, List<Address>>) view.getPayload("service_state");                                      
                       if(payload != null){
                           synchronized(service_state){                           
  @@ -914,8 +919,7 @@
           }              
   
           synchronized(service_responses){
  -            copy = new HashMap<Address, Set<String>>(service_responses);
  -            service_responses.clear();
  +            copy = new HashMap<Address, Set<String>>(service_responses);            
           }
   
           if(log.isDebugEnabled())
  @@ -923,11 +927,7 @@
   
           // merges service_responses with service_state and emits MergeViews for
           // the services affected (MuxChannel)
  -        mergeServiceState(view, copy);
  -        synchronized(services_merged_collector){
  -            services_merged_collector.clear();
  -        }
  -        services_merged.set(false);
  +        mergeServiceState(view, copy);       
       } 
   
       private void mergeServiceState(MergeView view, Map<Address, Set<String>> copy) {

User: belaban 
  Date: 08/02/04 06:22:02

  Modified:    src/org/jgroups/mux Multiplexer.java
  Log:
  added check for null MuxChannel on merge
  
  Revision  Changes    Path
  1.93      +9 -7      JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.92
  retrieving revision 1.93
  diff -u -r1.92 -r1.93
  --- Multiplexer.java	25 Jan 2008 01:45:12 -0000	1.92
  +++ Multiplexer.java	4 Feb 2008 14:22:02 -0000	1.93
  @@ -35,7 +35,7 @@
    * @author Bela Ban, Vladimir Blagojevic
    * @see MuxChannel
    * @see Channel
  - * @version $Id: Multiplexer.java,v 1.92 2008/01/25 01:45:12 vlada Exp $
  + * @version $Id: Multiplexer.java,v 1.93 2008/02/04 14:22:02 belaban Exp $
    */
   public class Multiplexer implements UpHandler {
   	
  @@ -956,13 +956,15 @@
           }
   
           // now emit MergeViews for all services which were modified
  -        for(String service:modified_services) {           
  +        for(String service: modified_services) {
               MuxChannel ch=services.get(service);
  -            List<Address> hosts=service_state.get(service);           
  -            Vector<Address> membersCopy = new Vector<Address>(view.getMembers());
  -            membersCopy.retainAll(hosts);
  -            MergeView v=new MergeView(view.getVid(), membersCopy, view.getSubgroups());               
  -            passToMuxChannel(ch, new Event(Event.VIEW_CHANGE, v), fifo_queue, null, service, false);
  +            if(ch != null) {
  +                List<Address> hosts=service_state.get(service);
  +                Vector<Address> membersCopy = new Vector<Address>(view.getMembers());
  +                membersCopy.retainAll(hosts);
  +                MergeView v=new MergeView(view.getVid(), membersCopy, view.getSubgroups());
  +                passToMuxChannel(ch, new Event(Event.VIEW_CHANGE, v), fifo_queue, null, service, false);
  +            }
           }
       }

User: belaban 
  Date: 08/02/04 06:24:46

  Modified:    src/org/jgroups/mux Tag: Branch_JGroups_2_6 Multiplexer.java
  Log:
  added check for null (non-existent) MuxChannel on merging, to prevent NPE
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.85.2.6  +8 -6      JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.85.2.5
  retrieving revision 1.85.2.6
  diff -u -r1.85.2.5 -r1.85.2.6
  --- Multiplexer.java	25 Jan 2008 01:45:06 -0000	1.85.2.5
  +++ Multiplexer.java	4 Feb 2008 14:24:46 -0000	1.85.2.6
  @@ -35,7 +35,7 @@
    * @author Bela Ban, Vladimir Blagojevic
    * @see MuxChannel
    * @see Channel
  - * @version $Id: Multiplexer.java,v 1.85.2.5 2008/01/25 01:45:06 vlada Exp $
  + * @version $Id: Multiplexer.java,v 1.85.2.6 2008/02/04 14:24:46 belaban Exp $
    */
   public class Multiplexer implements UpHandler {
   	
  @@ -958,11 +958,13 @@
           // now emit MergeViews for all services which were modified
           for(String service:modified_services) {           
               MuxChannel ch=services.get(service);
  -            List<Address> hosts=service_state.get(service);           
  -            Vector<Address> membersCopy = new Vector<Address>(view.getMembers());
  -            membersCopy.retainAll(hosts);
  -            MergeView v=new MergeView(view.getVid(), membersCopy, view.getSubgroups());               
  -            passToMuxChannel(ch, new Event(Event.VIEW_CHANGE, v), fifo_queue, null, service, false);
  +            if(ch != null) {
  +                List<Address> hosts=service_state.get(service);           
  +                Vector<Address> membersCopy = new Vector<Address>(view.getMembers());
  +                membersCopy.retainAll(hosts);
  +                MergeView v=new MergeView(view.getVid(), membersCopy, view.getSubgroups());
  +                passToMuxChannel(ch, new Event(Event.VIEW_CHANGE, v), fifo_queue, null, service, false);
  +            }
           }
       }

User: vlada   
  Date: 08/02/06 22:20:53

  Modified:    src/org/jgroups/mux Multiplexer.java
  Log:
  [JGRP-663] - Multiplexer does not respect Message OOB flag
  
  Revision  Changes    Path
  1.94      +20 -5     JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.93
  retrieving revision 1.94
  diff -u -r1.93 -r1.94
  --- Multiplexer.java	4 Feb 2008 14:22:02 -0000	1.93
  +++ Multiplexer.java	7 Feb 2008 06:20:53 -0000	1.94
  @@ -35,7 +35,7 @@
    * @author Bela Ban, Vladimir Blagojevic
    * @see MuxChannel
    * @see Channel
  - * @version $Id: Multiplexer.java,v 1.93 2008/02/04 14:22:02 belaban Exp $
  + * @version $Id: Multiplexer.java,v 1.94 2008/02/07 06:20:53 vlada Exp $
    */
   public class Multiplexer implements UpHandler {
   	
  @@ -274,17 +274,32 @@
                       }
                       catch(Exception e) {
                           if(log.isErrorEnabled())
  -                            log.error("failure in handling service state request", e);
  +                            log.error("failure in handling service message " + hdr.info
  +                                  + " from sender "
  +                                  + sender, e);
                       }                    
                       return null;
                   }                
                   else {
  -                  //regular message between MuxChannel(s)
  -                    MuxChannel mux_ch=services.get(hdr.id);
  +                    //regular message between MuxChannel(s)
  +                    final MuxChannel mux_ch=services.get(hdr.id);
                       if(mux_ch == null) {
                           return null;
                       }
  -                    return passToMuxChannel(mux_ch, evt, fifo_queue, sender, hdr.id, false); // don't block !                                                          
  +                    //is it oob
  +                    if(msg.isFlagSet(Message.OOB)){
  +                        if(thread_pool == null) {
  +                            return mux_ch.up(evt);
  +                        }else{
  +                            thread_pool.execute(new Runnable(){
  +                                public void run() {
  +                                    mux_ch.up(evt);    
  +                                }});
  +                            return null;
  +                        }                                             
  +                    }else{
  +                        return passToMuxChannel(mux_ch, evt, fifo_queue, sender, hdr.id, false); // don't block !
  +                    }                                                                           
                   }                
   
               case Event.VIEW_CHANGE:

User: vlada   
  Date: 08/02/06 22:20:49

  Modified:    src/org/jgroups/mux Tag: Branch_JGroups_2_6 Multiplexer.java
  Log:
  [JGRP-663] - Multiplexer does not respect Message OOB flag
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.85.2.7  +22 -7     JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.85.2.6
  retrieving revision 1.85.2.7
  diff -u -r1.85.2.6 -r1.85.2.7
  --- Multiplexer.java	4 Feb 2008 14:24:46 -0000	1.85.2.6
  +++ Multiplexer.java	7 Feb 2008 06:20:49 -0000	1.85.2.7
  @@ -35,7 +35,7 @@
    * @author Bela Ban, Vladimir Blagojevic
    * @see MuxChannel
    * @see Channel
  - * @version $Id: Multiplexer.java,v 1.85.2.6 2008/02/04 14:24:46 belaban Exp $
  + * @version $Id: Multiplexer.java,v 1.85.2.7 2008/02/07 06:20:49 vlada Exp $
    */
   public class Multiplexer implements UpHandler {
   	
  @@ -274,17 +274,32 @@
                       }
                       catch(Exception e) {
                           if(log.isErrorEnabled())
  -                            log.error("failure in handling service state request", e);
  +                            log.error("failure in handling service message " + hdr.info
  +                                  + " from sender "
  +                                  + sender, e);
                       }                    
                       return null;
                   }                
                   else {
  -                  //regular message between MuxChannel(s)
  -                    MuxChannel mux_ch=services.get(hdr.id);
  +                    //regular message between MuxChannel(s)
  +                    final MuxChannel mux_ch=services.get(hdr.id);
                       if(mux_ch == null) {
                           return null;
                       }
  -                    return passToMuxChannel(mux_ch, evt, fifo_queue, sender, hdr.id, false); // don't block !                                                          
  +                    //is it oob
  +                    if(msg.isFlagSet(Message.OOB)){
  +                        if(thread_pool == null) {
  +                            return mux_ch.up(evt);
  +                        }else{
  +                            thread_pool.execute(new Runnable(){
  +                                public void run() {
  +                                    mux_ch.up(evt);    
  +                                }});
  +                            return null;
  +                        }                                             
  +                    }else{
  +                        return passToMuxChannel(mux_ch, evt, fifo_queue, sender, hdr.id, false); // don't block !
  +                    }                                                                           
                   }                
   
               case Event.VIEW_CHANGE:
  @@ -956,10 +971,10 @@
           }
   
           // now emit MergeViews for all services which were modified
  -        for(String service:modified_services) {           
  +        for(String service: modified_services) {
               MuxChannel ch=services.get(service);
               if(ch != null) {
  -                List<Address> hosts=service_state.get(service);           
  +                List<Address> hosts=service_state.get(service);
                   Vector<Address> membersCopy = new Vector<Address>(view.getMembers());
                   membersCopy.retainAll(hosts);
                   MergeView v=new MergeView(view.getVid(), membersCopy, view.getSubgroups());

User: belaban 
  Date: 08/02/07 00:21:49

  Modified:    src/org/jgroups/mux Multiplexer.java
  Log:
  simplified http://jira.jboss.com/jira/browse/JGRP-663 (OOB flag with MuxChannel)
  
  Revision  Changes    Path
  1.95      +6 -23     JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.94
  retrieving revision 1.95
  diff -u -r1.94 -r1.95
  --- Multiplexer.java	7 Feb 2008 06:20:53 -0000	1.94
  +++ Multiplexer.java	7 Feb 2008 08:21:49 -0000	1.95
  @@ -35,7 +35,7 @@
    * @author Bela Ban, Vladimir Blagojevic
    * @see MuxChannel
    * @see Channel
  - * @version $Id: Multiplexer.java,v 1.94 2008/02/07 06:20:53 vlada Exp $
  + * @version $Id: Multiplexer.java,v 1.95 2008/02/07 08:21:49 belaban Exp $
    */
   public class Multiplexer implements UpHandler {
   	
  @@ -274,33 +274,16 @@
                       }
                       catch(Exception e) {
                           if(log.isErrorEnabled())
  -                            log.error("failure in handling service message " + hdr.info
  -                                  + " from sender "
  -                                  + sender, e);
  +                            log.error("failure in handling service message " + hdr.info + " from sender " + sender, e);
                       }                    
                       return null;
  -                }                
  +                }
                   else {
                       //regular message between MuxChannel(s)
                       final MuxChannel mux_ch=services.get(hdr.id);
  -                    if(mux_ch == null) {
  -                        return null;
  -                    }
  -                    //is it oob
  -                    if(msg.isFlagSet(Message.OOB)){
  -                        if(thread_pool == null) {
  -                            return mux_ch.up(evt);
  -                        }else{
  -                            thread_pool.execute(new Runnable(){
  -                                public void run() {
  -                                    mux_ch.up(evt);    
  -                                }});
  -                            return null;
  -                        }                                             
  -                    }else{
  -                        return passToMuxChannel(mux_ch, evt, fifo_queue, sender, hdr.id, false); // don't block !
  -                    }                                                                           
  -                }                
  +                    return mux_ch == null? null :
  +                            passToMuxChannel(mux_ch, evt, fifo_queue, sender, hdr.id, false, msg.isFlagSet(Message.OOB));
  +                }
   
               case Event.VIEW_CHANGE:
                   Vector<Address> old_members=view != null? view.getMembers() : null;

User: vlada   
  Date: 08/02/12 18:16:42

  Modified:    src/org/jgroups/mux Tag: Branch_JGroups_2_6 Multiplexer.java
  Log:
  [JGRP-636] - NullPointerException in Multiplexer
  Fix for STATE_TRANSFER as well.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.85.2.11 +8 -4      JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.85.2.10
  retrieving revision 1.85.2.11
  diff -u -r1.85.2.10 -r1.85.2.11
  --- Multiplexer.java	12 Feb 2008 03:23:38 -0000	1.85.2.10
  +++ Multiplexer.java	13 Feb 2008 02:16:42 -0000	1.85.2.11
  @@ -35,7 +35,7 @@
    * @author Bela Ban, Vladimir Blagojevic
    * @see MuxChannel
    * @see Channel
  - * @version $Id: Multiplexer.java,v 1.85.2.10 2008/02/12 03:23:38 vlada Exp $
  + * @version $Id: Multiplexer.java,v 1.85.2.11 2008/02/13 02:16:42 vlada Exp $
    */
   public class Multiplexer implements UpHandler {
   
  @@ -661,9 +661,9 @@
   
           if(id == null) {
               if(log.isWarnEnabled()) {
  -                log.warn("Invalid state request arrived at Multiplexer, dropping it");
  +                log.warn("Invalid state request " + info + " arrived at Multiplexer, dropping it");
               }
  -            return null;
  +            return new StateTransferInfo(null, original_id, 0L, null);
           }
   
           try {
  @@ -695,8 +695,12 @@
                                                                         requester,
                                                                         id,
                                                                         hasReturnValue);
  -            if(ret != null)
  +            if(ret != null) {
                   ret.state_id=original_id;
  +            }
  +            else {
  +                return new StateTransferInfo(null, original_id, 0L, null);
  +            }
               return ret;
           }
           catch(Throwable ex) {

User: vlada   
  Date: 08/02/12 18:16:50

  Modified:    src/org/jgroups/mux Multiplexer.java
  Log:
  [JGRP-636] - NullPointerException in Multiplexer
  Fix for STATE_TRANSFER as well.
  
  Revision  Changes    Path
  1.97      +7 -3      JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.96
  retrieving revision 1.97
  diff -u -r1.96 -r1.97
  --- Multiplexer.java	12 Feb 2008 04:01:20 -0000	1.96
  +++ Multiplexer.java	13 Feb 2008 02:16:50 -0000	1.97
  @@ -35,7 +35,7 @@
    * @author Bela Ban, Vladimir Blagojevic
    * @see MuxChannel
    * @see Channel
  - * @version $Id: Multiplexer.java,v 1.96 2008/02/12 04:01:20 vlada Exp $
  + * @version $Id: Multiplexer.java,v 1.97 2008/02/13 02:16:50 vlada Exp $
    */
   public class Multiplexer implements UpHandler {
   
  @@ -661,9 +661,9 @@
   
           if(id == null) {
               if(log.isWarnEnabled()) {
  -                log.warn("Invalid state request arrived at Multiplexer, dropping it");
  +                log.warn("Invalid state request " + info + " arrived at Multiplexer, dropping it");
               }
  -            return null;
  +            return new StateTransferInfo(null, original_id, 0L, null);
           }
   
           try {
  @@ -695,8 +695,12 @@
                                                                         requester,
                                                                         id,
                                                                         hasReturnValue);
  -            if(ret != null)
  +            if(ret != null) {
                   ret.state_id=original_id;
  +            }
  +            else {
  +                return new StateTransferInfo(null, original_id, 0L, null);
  +            }
               return ret;
           }
           catch(Throwable ex) {

User: vlada   
  Date: 08/02/13 22:40:09

  Modified:    src/org/jgroups/mux Tag: Branch_JGroups_2_6 Multiplexer.java
  Log:
  ns
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.85.2.13 +11 -1     JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.85.2.12
  retrieving revision 1.85.2.13
  diff -u -r1.85.2.12 -r1.85.2.13
  --- Multiplexer.java	14 Feb 2008 01:55:26 -0000	1.85.2.12
  +++ Multiplexer.java	14 Feb 2008 06:40:08 -0000	1.85.2.13
  @@ -35,7 +35,7 @@
    * @author Bela Ban, Vladimir Blagojevic
    * @see MuxChannel
    * @see Channel
  - * @version $Id: Multiplexer.java,v 1.85.2.12 2008/02/14 01:55:26 vlada Exp $
  + * @version $Id: Multiplexer.java,v 1.85.2.13 2008/02/14 06:40:08 vlada Exp $
    */
   public class Multiplexer implements UpHandler {
   
  @@ -597,6 +597,16 @@
               }
               return;
           }
  +        
  +        if(!channel.isOpen() || !channel.isConnected()) {
  +            if(log.isWarnEnabled()) {
  +                log.warn("Underlying multiplexer channel " + channel.getLocalAddress()
  +                         + " is not connected, cannot send ServiceInfo."
  +                         + ServiceInfo.typeToString(type)
  +                         + " message");
  +            }
  +            return;
  +        }            
   
           Message service_msg=new Message();
           service_msg.putHeader(NAME, new MuxHeader(new ServiceInfo(type, service, host, payload)));

User: vlada   
  Date: 08/02/13 22:41:14

  Modified:    src/org/jgroups/mux Multiplexer.java
  Log:
  ns
  
  Revision  Changes    Path
  1.99      +11 -1     JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.98
  retrieving revision 1.99
  diff -u -r1.98 -r1.99
  --- Multiplexer.java	14 Feb 2008 01:55:29 -0000	1.98
  +++ Multiplexer.java	14 Feb 2008 06:41:14 -0000	1.99
  @@ -35,7 +35,7 @@
    * @author Bela Ban, Vladimir Blagojevic
    * @see MuxChannel
    * @see Channel
  - * @version $Id: Multiplexer.java,v 1.98 2008/02/14 01:55:29 vlada Exp $
  + * @version $Id: Multiplexer.java,v 1.99 2008/02/14 06:41:14 vlada Exp $
    */
   public class Multiplexer implements UpHandler {
   
  @@ -597,6 +597,16 @@
               }
               return;
           }
  +        
  +        if(!channel.isOpen() || !channel.isConnected()) {
  +            if(log.isWarnEnabled()) {
  +                log.warn("Underlying multiplexer channel " + channel.getLocalAddress()
  +                         + " is not connected, cannot send ServiceInfo."
  +                         + ServiceInfo.typeToString(type)
  +                         + " message");
  +            }
  +            return;
  +        }            
   
           Message service_msg=new Message();
           service_msg.putHeader(NAME, new MuxHeader(new ServiceInfo(type, service, host, payload)));

User: vlada   
  Date: 08/04/01 18:12:03

  Modified:    src/org/jgroups/mux Tag: Branch_JGroups_2_6 Multiplexer.java
  Log:
  expose service_ack_timeout
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.85.2.14 +15 -5     JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.85.2.13
  retrieving revision 1.85.2.14
  diff -u -r1.85.2.13 -r1.85.2.14
  --- Multiplexer.java	14 Feb 2008 06:40:08 -0000	1.85.2.13
  +++ Multiplexer.java	2 Apr 2008 01:12:02 -0000	1.85.2.14
  @@ -35,7 +35,7 @@
    * @author Bela Ban, Vladimir Blagojevic
    * @see MuxChannel
    * @see Channel
  - * @version $Id: Multiplexer.java,v 1.85.2.13 2008/02/14 06:40:08 vlada Exp $
  + * @version $Id: Multiplexer.java,v 1.85.2.14 2008/04/02 01:12:02 vlada Exp $
    */
   public class Multiplexer implements UpHandler {
   
  @@ -63,6 +63,8 @@
   
       /** To collect service acks from Multiplexers */
       private final AckCollector service_ack_collector=new AckCollector();
  +    
  +    protected long service_ack_timeout = 2000;
   
       /** Cluster view */
       private volatile View view=null;
  @@ -135,6 +137,15 @@
       public void setServicesResponseTimeout(long services_rsp_timeout) {
           this.service_response_timeout=services_rsp_timeout;
       }
  +    
  +
  +    public long getServiceAckTimeout() {
  +        return service_ack_timeout;
  +    }
  +
  +    public void setServiceAckTimeout(long service_ack_timeout) {
  +        this.service_ack_timeout=service_ack_timeout;
  +    }
   
       /**
        * Returns a copy of the current view <em>minus</em> the nodes on which
  @@ -629,14 +640,13 @@
   
               //initialize collector and ...
               service_ack_collector.reset(null, muxChannels);
  -            int size=service_ack_collector.size();
  -            long service_ack_collection_timeout=2000;
  +            int size=service_ack_collector.size();            
   
               //then send a message
               channel.send(service_msg);
               long start=System.currentTimeMillis();
               try {
  -                service_ack_collector.waitForAllAcks(service_ack_collection_timeout);
  +                service_ack_collector.waitForAllAcks(service_ack_timeout);
                   if(log.isTraceEnabled())
                       log.trace("received all service ACKs (" + size
                                 + ")  in "
  @@ -648,7 +658,7 @@
                            + ") for "
                            + service_msg
                            + " after "
  -                         + service_ack_collection_timeout
  +                         + service_ack_timeout
                            + "ms, missing ACKs from "
                            + service_ack_collector.printMissing()
                            + " (received="

User: vlada   
  Date: 08/04/01 18:12:06

  Modified:    src/org/jgroups/mux Multiplexer.java
  Log:
  expose service_ack_timeout
  
  Revision  Changes    Path
  1.100     +15 -5     JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.99
  retrieving revision 1.100
  diff -u -r1.99 -r1.100
  --- Multiplexer.java	14 Feb 2008 06:41:14 -0000	1.99
  +++ Multiplexer.java	2 Apr 2008 01:12:06 -0000	1.100
  @@ -35,7 +35,7 @@
    * @author Bela Ban, Vladimir Blagojevic
    * @see MuxChannel
    * @see Channel
  - * @version $Id: Multiplexer.java,v 1.99 2008/02/14 06:41:14 vlada Exp $
  + * @version $Id: Multiplexer.java,v 1.100 2008/04/02 01:12:06 vlada Exp $
    */
   public class Multiplexer implements UpHandler {
   
  @@ -63,6 +63,8 @@
   
       /** To collect service acks from Multiplexers */
       private final AckCollector service_ack_collector=new AckCollector();
  +    
  +    protected long service_ack_timeout = 2000;
   
       /** Cluster view */
       private volatile View view=null;
  @@ -135,6 +137,15 @@
       public void setServicesResponseTimeout(long services_rsp_timeout) {
           this.service_response_timeout=services_rsp_timeout;
       }
  +    
  +
  +    public long getServiceAckTimeout() {
  +        return service_ack_timeout;
  +    }
  +
  +    public void setServiceAckTimeout(long service_ack_timeout) {
  +        this.service_ack_timeout=service_ack_timeout;
  +    }
   
       /**
        * Returns a copy of the current view <em>minus</em> the nodes on which
  @@ -629,14 +640,13 @@
   
               //initialize collector and ...
               service_ack_collector.reset(null, muxChannels);
  -            int size=service_ack_collector.size();
  -            long service_ack_collection_timeout=2000;
  +            int size=service_ack_collector.size();            
   
               //then send a message
               channel.send(service_msg);
               long start=System.currentTimeMillis();
               try {
  -                service_ack_collector.waitForAllAcks(service_ack_collection_timeout);
  +                service_ack_collector.waitForAllAcks(service_ack_timeout);
                   if(log.isTraceEnabled())
                       log.trace("received all service ACKs (" + size
                                 + ")  in "
  @@ -648,7 +658,7 @@
                            + ") for "
                            + service_msg
                            + " after "
  -                         + service_ack_collection_timeout
  +                         + service_ack_timeout
                            + "ms, missing ACKs from "
                            + service_ack_collector.printMissing()
                            + " (received="

User: vlada   
  Date: 08/04/21 01:43:09

  Modified:    src/org/jgroups/mux Multiplexer.java
  Log:
  log warning when submitting tasks to ThreadPoolExecutor that has been shut down
  
  Revision  Changes    Path
  1.102     +2 -2      JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.101
  retrieving revision 1.102
  diff -u -r1.101 -r1.102
  --- Multiplexer.java	8 Apr 2008 14:49:05 -0000	1.101
  +++ Multiplexer.java	21 Apr 2008 08:43:09 -0000	1.102
  @@ -36,7 +36,7 @@
    * @author Bela Ban, Vladimir Blagojevic
    * @see MuxChannel
    * @see Channel
  - * @version $Id: Multiplexer.java,v 1.101 2008/04/08 14:49:05 belaban Exp $
  + * @version $Id: Multiplexer.java,v 1.102 2008/04/21 08:43:09 vlada Exp $
    */
   @Experimental(comment="because of impedance mismatches between a MuxChannel and JChannel, this might get deprecated " +
           "in the future. The replacement would be a shared transport (see the documentation for details)")
  @@ -224,7 +224,7 @@
           return new ThreadPoolExecutor(min_threads, max_threads, keep_alive, TimeUnit.MILLISECONDS,
                                         new SynchronousQueue<Runnable>(), 
                                         factory,
  -                                      new ThreadPoolExecutor.CallerRunsPolicy());
  +                                      new ShutdownRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy()));
       }
   
       protected void shutdownThreadPool() {

User: vlada   
  Date: 08/04/21 01:44:11

  Modified:    src/org/jgroups/mux Tag: Branch_JGroups_2_6 Multiplexer.java
  Log:
  log warning when submitting tasks to ThreadPoolExecutor that has been shut down
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.85.2.15 +2 -2      JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.85.2.14
  retrieving revision 1.85.2.15
  diff -u -r1.85.2.14 -r1.85.2.15
  --- Multiplexer.java	2 Apr 2008 01:12:02 -0000	1.85.2.14
  +++ Multiplexer.java	21 Apr 2008 08:44:10 -0000	1.85.2.15
  @@ -35,7 +35,7 @@
    * @author Bela Ban, Vladimir Blagojevic
    * @see MuxChannel
    * @see Channel
  - * @version $Id: Multiplexer.java,v 1.85.2.14 2008/04/02 01:12:02 vlada Exp $
  + * @version $Id: Multiplexer.java,v 1.85.2.15 2008/04/21 08:44:10 vlada Exp $
    */
   public class Multiplexer implements UpHandler {
   
  @@ -221,7 +221,7 @@
           return new ThreadPoolExecutor(min_threads, max_threads, keep_alive, TimeUnit.MILLISECONDS,
                                         new SynchronousQueue<Runnable>(), 
                                         factory,
  -                                      new ThreadPoolExecutor.CallerRunsPolicy());
  +                                      new ShutdownRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy()));
       }
   
       protected void shutdownThreadPool() {

User: belaban 
  Date: 08/05/20 04:27:35

  Modified:    src/org/jgroups/mux Multiplexer.java
  Log:
  - first commit for moving timer thread pool from ProtocolStack to transport (http://jira.jboss.com/jira/browse/JGRP-737)
  - merged all thread factories into one (DefaultThreadfactory)
  - Changed naming of threads slightly (http://jira.jboss.com/jira/browse/JGRP-644)
  
  Revision  Changes    Path
  1.103     +3 -2      JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.102
  retrieving revision 1.103
  diff -u -r1.102 -r1.103
  --- Multiplexer.java	21 Apr 2008 08:43:09 -0000	1.102
  +++ Multiplexer.java	20 May 2008 11:27:35 -0000	1.103
  @@ -9,6 +9,7 @@
   import org.jgroups.stack.ProtocolStack;
   import org.jgroups.stack.StateTransferInfo;
   import org.jgroups.util.*;
  +import org.jgroups.util.ThreadFactory;
   
   import java.util.*;
   import java.util.concurrent.*;
  @@ -36,7 +37,7 @@
    * @author Bela Ban, Vladimir Blagojevic
    * @see MuxChannel
    * @see Channel
  - * @version $Id: Multiplexer.java,v 1.102 2008/04/21 08:43:09 vlada Exp $
  + * @version $Id: Multiplexer.java,v 1.103 2008/05/20 11:27:35 belaban Exp $
    */
   @Experimental(comment="because of impedance mismatches between a MuxChannel and JChannel, this might get deprecated " +
           "in the future. The replacement would be a shared transport (see the documentation for details)")
  @@ -220,7 +221,7 @@
           max_threads=Global.getPropertyAsInteger(Global.MUX_MAX_THREADS, max_threads);
           keep_alive=Global.getPropertyAsLong(Global.MUX_KEEPALIVE, keep_alive);
   
  -        org.jgroups.util.ThreadFactory factory = ProtocolStack.newThreadFactory(pattern, new ThreadGroup(Util.getGlobalThreadGroup(), "MultiplexerThreads"), "Multiplexer", false);
  +        ThreadFactory factory=new DefaultThreadFactory(Util.getGlobalThreadGroup(), "Multiplexer", false, true);
           return new ThreadPoolExecutor(min_threads, max_threads, keep_alive, TimeUnit.MILLISECONDS,
                                         new SynchronousQueue<Runnable>(), 
                                         factory,

User: belaban 
  Date: 08/05/22 05:32:10

  Modified:    src/org/jgroups/mux Multiplexer.java
  Log:
  ns
  
  Revision  Changes    Path
  1.104     +1 -2      JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.103
  retrieving revision 1.104
  diff -u -r1.103 -r1.104
  --- Multiplexer.java	20 May 2008 11:27:35 -0000	1.103
  +++ Multiplexer.java	22 May 2008 12:32:09 -0000	1.104
  @@ -37,7 +37,7 @@
    * @author Bela Ban, Vladimir Blagojevic
    * @see MuxChannel
    * @see Channel
  - * @version $Id: Multiplexer.java,v 1.103 2008/05/20 11:27:35 belaban Exp $
  + * @version $Id: Multiplexer.java,v 1.104 2008/05/22 12:32:09 belaban Exp $
    */
   @Experimental(comment="because of impedance mismatches between a MuxChannel and JChannel, this might get deprecated " +
           "in the future. The replacement would be a shared transport (see the documentation for details)")
  @@ -216,7 +216,6 @@
           long keep_alive=30000;
   
           Map<String,Object> m=channel.getInfo();
  -        ThreadNamingPattern pattern=(ThreadNamingPattern)m.get("thread_naming_pattern");
           min_threads=Global.getPropertyAsInteger(Global.MUX_MIN_THREADS, min_threads);
           max_threads=Global.getPropertyAsInteger(Global.MUX_MAX_THREADS, max_threads);
           keep_alive=Global.getPropertyAsLong(Global.MUX_KEEPALIVE, keep_alive);

User: belaban 
  Date: 08/05/22 06:23:08

  Modified:    src/org/jgroups/mux Tag: Branch_JGroups_2_6 Multiplexer.java
  Log:
  - moved Timer into TP (http://jira.jboss.com/jira/browse/JGRP-737)
  - moved thread pools into TP
  - fixed thread naming (http://jira.jboss.com/jira/browse/JGRP-644)
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.85.2.16 +3 -3      JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.85.2.15
  retrieving revision 1.85.2.16
  diff -u -r1.85.2.15 -r1.85.2.16
  --- Multiplexer.java	21 Apr 2008 08:44:10 -0000	1.85.2.15
  +++ Multiplexer.java	22 May 2008 13:23:08 -0000	1.85.2.16
  @@ -8,6 +8,7 @@
   import org.jgroups.stack.ProtocolStack;
   import org.jgroups.stack.StateTransferInfo;
   import org.jgroups.util.*;
  +import org.jgroups.util.ThreadFactory;
   
   import java.util.*;
   import java.util.concurrent.*;
  @@ -35,7 +36,7 @@
    * @author Bela Ban, Vladimir Blagojevic
    * @see MuxChannel
    * @see Channel
  - * @version $Id: Multiplexer.java,v 1.85.2.15 2008/04/21 08:44:10 vlada Exp $
  + * @version $Id: Multiplexer.java,v 1.85.2.16 2008/05/22 13:23:08 belaban Exp $
    */
   public class Multiplexer implements UpHandler {
   
  @@ -212,12 +213,11 @@
           long keep_alive=30000;
   
           Map<String,Object> m=channel.getInfo();
  -        ThreadNamingPattern pattern=(ThreadNamingPattern)m.get("thread_naming_pattern");
           min_threads=Global.getPropertyAsInteger(Global.MUX_MIN_THREADS, min_threads);
           max_threads=Global.getPropertyAsInteger(Global.MUX_MAX_THREADS, max_threads);
           keep_alive=Global.getPropertyAsLong(Global.MUX_KEEPALIVE, keep_alive);
   
  -        org.jgroups.util.ThreadFactory factory = ProtocolStack.newThreadFactory(pattern, new ThreadGroup(Util.getGlobalThreadGroup(), "MultiplexerThreads"), "Multiplexer", false);
  +        ThreadFactory factory=new DefaultThreadFactory(Util.getGlobalThreadGroup(), "Multiplexer", false, true);
           return new ThreadPoolExecutor(min_threads, max_threads, keep_alive, TimeUnit.MILLISECONDS,
                                         new SynchronousQueue<Runnable>(), 
                                         factory,

User: belaban 
  Date: 09/02/23 11:47:00

  Modified:    src/org/jgroups/mux Tag: Branch_JGroups_2_8_LogicalAddresses
                        Multiplexer.java
  Log:
  ns
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.105.4.2 +1 -5      JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.105.4.1
  retrieving revision 1.105.4.2
  diff -u -r1.105.4.1 -r1.105.4.2
  --- Multiplexer.java	23 Feb 2009 08:59:52 -0000	1.105.4.1
  +++ Multiplexer.java	23 Feb 2009 11:47:00 -0000	1.105.4.2
  @@ -36,7 +36,7 @@
    * @author Bela Ban, Vladimir Blagojevic
    * @see MuxChannel
    * @see Channel
  - * @version $Id: Multiplexer.java,v 1.105.4.1 2009/02/23 08:59:52 belaban Exp $
  + * @version $Id: Multiplexer.java,v 1.105.4.2 2009/02/23 11:47:00 belaban Exp $
    */
   @Experimental(comment="because of impedance mismatches between a MuxChannel and JChannel, this might get deprecated " +
           "in the future. The replacement would be a shared transport (see the documentation for details)")
  @@ -411,10 +411,6 @@
                   handleStateResponse(evt, true);
                   break;
   
  -            case Event.SET_LOCAL_ADDRESS:
  -                passToAllMuxChannels(evt);
  -                break;
  -
               case Event.BLOCK:
                   passToAllMuxChannels(evt, true, true);
                   return null;

User: belaban 
  Date: 09/02/26 15:46:01

  Modified:    src/org/jgroups/mux Tag: Branch_JGroups_2_8_LogicalAddresses
                        Multiplexer.java
  Log:
  a few changes plus https://jira.jboss.org/jira/browse/JGRP-915
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.105.4.3 +2 -2      JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.105.4.2
  retrieving revision 1.105.4.3
  diff -u -r1.105.4.2 -r1.105.4.3
  --- Multiplexer.java	23 Feb 2009 11:47:00 -0000	1.105.4.2
  +++ Multiplexer.java	26 Feb 2009 15:46:01 -0000	1.105.4.3
  @@ -36,7 +36,7 @@
    * @author Bela Ban, Vladimir Blagojevic
    * @see MuxChannel
    * @see Channel
  - * @version $Id: Multiplexer.java,v 1.105.4.2 2009/02/23 11:47:00 belaban Exp $
  + * @version $Id: Multiplexer.java,v 1.105.4.3 2009/02/26 15:46:01 belaban Exp $
    */
   @Experimental(comment="because of impedance mismatches between a MuxChannel and JChannel, this might get deprecated " +
           "in the future. The replacement would be a shared transport (see the documentation for details)")
  @@ -638,7 +638,7 @@
               }
   
               //initialize collector and ...
  -            service_ack_collector.reset(null, muxChannels);
  +            service_ack_collector.reset(muxChannels);
               int size=service_ack_collector.size();            
   
               //then send a message

User: vlada   
  Date: 09/03/04 17:16:03

  Modified:    src/org/jgroups/mux Multiplexer.java
  Log:
  [JGRP-922] - FLUSH: let application handle concurrent flushing
  
  Revision  Changes    Path
  1.106     +6 -3      JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.105
  retrieving revision 1.106
  diff -u -r1.105 -r1.106
  --- Multiplexer.java	29 May 2008 08:22:05 -0000	1.105
  +++ Multiplexer.java	4 Mar 2009 17:16:01 -0000	1.106
  @@ -37,7 +37,7 @@
    * @author Bela Ban, Vladimir Blagojevic
    * @see MuxChannel
    * @see Channel
  - * @version $Id: Multiplexer.java,v 1.105 2008/05/29 08:22:05 belaban Exp $
  + * @version $Id: Multiplexer.java,v 1.106 2009/03/04 17:16:01 vlada Exp $
    */
   @Experimental(comment="because of impedance mismatches between a MuxChannel and JChannel, this might get deprecated " +
           "in the future. The replacement would be a shared transport (see the documentation for details)")
  @@ -250,7 +250,7 @@
       private boolean fetchServiceStates(Address target, Set<String> keys, long timeout) throws ChannelClosedException,
                                                                                         ChannelNotConnectedException {
           boolean rc, all_tranfers_ok=false;
  -        boolean flushStarted=channel.startFlush(false);
  +        boolean flushStarted=Util.startFlush(channel);
           if(flushStarted) {
               try {
                   for(String stateId:keys) {
  @@ -546,7 +546,10 @@
       }
   
       boolean startFlush(boolean automatic_resume) {
  -        return channel.startFlush(automatic_resume);
  +    	boolean result = Util.startFlush(channel);
  +    	if(automatic_resume)
  +    		channel.stopFlush();
  +    	return result;
       }
   
       void stopFlush() {

User: vlada   
  Date: 09/03/16 21:18:41

  Modified:    src/org/jgroups/mux Tag: Branch_JGroups_2_6 Multiplexer.java
  Log:
  [JGRP-922]FLUSH: let application handle concurrent flushing
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.85.2.17 +6 -3      JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.85.2.16
  retrieving revision 1.85.2.17
  diff -u -r1.85.2.16 -r1.85.2.17
  --- Multiplexer.java	22 May 2008 13:23:08 -0000	1.85.2.16
  +++ Multiplexer.java	16 Mar 2009 21:18:41 -0000	1.85.2.17
  @@ -36,7 +36,7 @@
    * @author Bela Ban, Vladimir Blagojevic
    * @see MuxChannel
    * @see Channel
  - * @version $Id: Multiplexer.java,v 1.85.2.16 2008/05/22 13:23:08 belaban Exp $
  + * @version $Id: Multiplexer.java,v 1.85.2.17 2009/03/16 21:18:41 vlada Exp $
    */
   public class Multiplexer implements UpHandler {
   
  @@ -246,7 +246,7 @@
       private boolean fetchServiceStates(Address target, Set<String> keys, long timeout) throws ChannelClosedException,
                                                                                         ChannelNotConnectedException {
           boolean rc, all_tranfers_ok=false;
  -        boolean flushStarted=channel.startFlush(false);
  +        boolean flushStarted=Util.startFlush(channel);
           if(flushStarted) {
               try {
                   for(String stateId:keys) {
  @@ -542,7 +542,10 @@
       }
   
       boolean startFlush(boolean automatic_resume) {
  -        return channel.startFlush(automatic_resume);
  +        boolean b = Util.startFlush(channel);
  +        if(automatic_resume)
  +        	channel.stopFlush();
  +        return b;
       }
   
       void stopFlush() {

User: belaban 
  Date: 09/05/13 13:07:00

  Modified:    src/org/jgroups/mux Multiplexer.java
  Log:
  replaced commons-logging with own wrapper (https://jira.jboss.org/jira/browse/JGRP-645)
  
  Revision  Changes    Path
  1.108     +3 -3      JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.107
  retrieving revision 1.108
  diff -u -r1.107 -r1.108
  --- Multiplexer.java	9 Apr 2009 09:11:25 -0000	1.107
  +++ Multiplexer.java	13 May 2009 13:07:00 -0000	1.108
  @@ -1,7 +1,7 @@
   package org.jgroups.mux;
   
  -import org.apache.commons.logging.Log;
  -import org.apache.commons.logging.LogFactory;
  +import org.jgroups.logging.Log;
  +import org.jgroups.logging.LogFactory;
   import org.jgroups.*;
   import org.jgroups.TimeoutException;
   import org.jgroups.annotations.Experimental;
  @@ -36,7 +36,7 @@
    * @author Bela Ban, Vladimir Blagojevic
    * @see MuxChannel
    * @see Channel
  - * @version $Id: Multiplexer.java,v 1.107 2009/04/09 09:11:25 belaban Exp $
  + * @version $Id: Multiplexer.java,v 1.108 2009/05/13 13:07:00 belaban Exp $
    */
   @Experimental(comment="because of impedance mismatches between a MuxChannel and JChannel, this might get deprecated " +
           "in the future. The replacement would be a shared transport (see the documentation for details)")

User: belaban 
  Date: 09/08/11 09:44:59

  Modified:    src/org/jgroups/mux Multiplexer.java
  Log:
  ns
  
  Revision  Changes    Path
  1.110     +2 -4      JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.109
  retrieving revision 1.110
  diff -u -r1.109 -r1.110
  --- Multiplexer.java	17 Jun 2009 16:20:10 -0000	1.109
  +++ Multiplexer.java	11 Aug 2009 09:44:59 -0000	1.110
  @@ -36,7 +36,7 @@
    * @author Bela Ban, Vladimir Blagojevic
    * @see MuxChannel
    * @see Channel
  - * @version $Id: Multiplexer.java,v 1.109 2009/06/17 16:20:10 belaban Exp $
  + * @version $Id: Multiplexer.java,v 1.110 2009/08/11 09:44:59 belaban Exp $
    */
   @Experimental(comment="because of impedance mismatches between a MuxChannel and JChannel, this might get deprecated " +
           "in the future. The replacement would be a shared transport (see the documentation for details)")
  @@ -656,9 +656,7 @@
                            + service_ack_timeout
                            + "ms, missing ACKs from "
                            + service_ack_collector.printMissing()
  -                         + " (received="
  -                         + service_ack_collector.printReceived()
  -                         + "), local_addr="
  +                         + ", local_addr="
                            + getLocalAddress());
               }
           }

User: belaban 
  Date: 09/08/11 11:28:28

  Modified:    src/org/jgroups/mux Tag: Branch_JGroups_2_6 Multiplexer.java
  Log:
  fixed leak in GMS.ack_collector/merge_ack_colector (https://jira.jboss.org/jira/browse/JGRP-1016)
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.85.2.18 +3 -6      JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.85.2.17
  retrieving revision 1.85.2.18
  diff -u -r1.85.2.17 -r1.85.2.18
  --- Multiplexer.java	16 Mar 2009 21:18:41 -0000	1.85.2.17
  +++ Multiplexer.java	11 Aug 2009 11:28:28 -0000	1.85.2.18
  @@ -5,7 +5,6 @@
   import org.jgroups.*;
   import org.jgroups.TimeoutException;
   import org.jgroups.protocols.pbcast.FLUSH;
  -import org.jgroups.stack.ProtocolStack;
   import org.jgroups.stack.StateTransferInfo;
   import org.jgroups.util.*;
   import org.jgroups.util.ThreadFactory;
  @@ -36,7 +35,7 @@
    * @author Bela Ban, Vladimir Blagojevic
    * @see MuxChannel
    * @see Channel
  - * @version $Id: Multiplexer.java,v 1.85.2.17 2009/03/16 21:18:41 vlada Exp $
  + * @version $Id: Multiplexer.java,v 1.85.2.18 2009/08/11 11:28:28 belaban Exp $
    */
   public class Multiplexer implements UpHandler {
   
  @@ -642,7 +641,7 @@
               }
   
               //initialize collector and ...
  -            service_ack_collector.reset(null, muxChannels);
  +            service_ack_collector.reset(muxChannels);
               int size=service_ack_collector.size();            
   
               //then send a message
  @@ -664,9 +663,7 @@
                            + service_ack_timeout
                            + "ms, missing ACKs from "
                            + service_ack_collector.printMissing()
  -                         + " (received="
  -                         + service_ack_collector.printReceived()
  -                         + "), local_addr="
  +                         + ", local_addr="
                            + getLocalAddress());
               }
           }

User: belaban 
  Date: 09/09/06 13:51:10

  Modified:    src/org/jgroups/mux Multiplexer.java
  Log:
  - removed getName() and overwriting of 'name' in most protocols
  - getName() and 'name' are now defined in Protocol
  - The 'name' prop' allows for overridinf of 'name'
  
  Revision  Changes    Path
  1.111     +2 -2      JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.110
  retrieving revision 1.111
  diff -u -r1.110 -r1.111
  --- Multiplexer.java	11 Aug 2009 09:44:59 -0000	1.110
  +++ Multiplexer.java	6 Sep 2009 13:51:10 -0000	1.111
  @@ -36,7 +36,7 @@
    * @author Bela Ban, Vladimir Blagojevic
    * @see MuxChannel
    * @see Channel
  - * @version $Id: Multiplexer.java,v 1.110 2009/08/11 09:44:59 belaban Exp $
  + * @version $Id: Multiplexer.java,v 1.111 2009/09/06 13:51:10 belaban Exp $
    */
   @Experimental(comment="because of impedance mismatches between a MuxChannel and JChannel, this might get deprecated " +
           "in the future. The replacement would be a shared transport (see the documentation for details)")
  @@ -621,7 +621,7 @@
               service_msg.setFlag(Message.OOB);
   
           if(channel.flushSupported())
  -            service_msg.putHeader(FLUSH.NAME, new FLUSH.FlushHeader(FLUSH.FlushHeader.FLUSH_BYPASS));
  +            service_msg.putHeader("FLUSH", new FLUSH.FlushHeader(FLUSH.FlushHeader.FLUSH_BYPASS));
   
           if(synchronous) {
               //for synchronous invocation we need to collect acks

User: belaban 
  Date: 09/10/14 09:41:23

  Modified:    src/org/jgroups/mux Multiplexer.java
  Log:
  replaced JChannel.shutdown() with Util.shutdown()
  
  Revision  Changes    Path
  1.112     +7 -2      JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.111
  retrieving revision 1.112
  diff -u -r1.111 -r1.112
  --- Multiplexer.java	6 Sep 2009 13:51:10 -0000	1.111
  +++ Multiplexer.java	14 Oct 2009 09:41:23 -0000	1.112
  @@ -36,7 +36,7 @@
    * @author Bela Ban, Vladimir Blagojevic
    * @see MuxChannel
    * @see Channel
  - * @version $Id: Multiplexer.java,v 1.111 2009/09/06 13:51:10 belaban Exp $
  + * @version $Id: Multiplexer.java,v 1.112 2009/10/14 09:41:23 belaban Exp $
    */
   @Experimental(comment="because of impedance mismatches between a MuxChannel and JChannel, this might get deprecated " +
           "in the future. The replacement would be a shared transport (see the documentation for details)")
  @@ -518,7 +518,12 @@
               if(log.isTraceEnabled()) {
                   log.trace("shutting down underlying JChannel as all MuxChannels are closed");
               }
  -            channel.shutdown();
  +            try {
  +                Util.shutdown(channel);
  +            }
  +            catch(Exception e) {
  +                e.printStackTrace();
  +            }
               services.clear();
               shutdownThreadPool();
           }

User: belaban 
  Date: 10/09/17 11:55:26

  Modified:    src/org/jgroups/mux Multiplexer.java
  Log:
  use of Util.createConcurrentMap() instead of new ConcurrentHashMap()
  
  Revision  Changes    Path
  1.114     +5 -5      JGroups/src/org/jgroups/mux/Multiplexer.java
  
  Index: Multiplexer.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/mux/Multiplexer.java,v
  retrieving revision 1.113
  retrieving revision 1.114
  diff -u -r1.113 -r1.114
  --- Multiplexer.java	5 Mar 2010 08:59:12 -0000	1.113
  +++ Multiplexer.java	17 Sep 2010 11:55:26 -0000	1.114
  @@ -1,11 +1,11 @@
   package org.jgroups.mux;
   
  -import org.jgroups.logging.Log;
  -import org.jgroups.logging.LogFactory;
   import org.jgroups.*;
   import org.jgroups.TimeoutException;
  -import org.jgroups.conf.ClassConfigurator;
   import org.jgroups.annotations.Experimental;
  +import org.jgroups.conf.ClassConfigurator;
  +import org.jgroups.logging.Log;
  +import org.jgroups.logging.LogFactory;
   import org.jgroups.protocols.pbcast.FLUSH;
   import org.jgroups.stack.StateTransferInfo;
   import org.jgroups.util.*;
  @@ -37,7 +37,7 @@
    * @author Bela Ban, Vladimir Blagojevic
    * @see MuxChannel
    * @see Channel
  - * @version $Id: Multiplexer.java,v 1.113 2010/03/05 08:59:12 belaban Exp $
  + * @version $Id: Multiplexer.java,v 1.114 2010/09/17 11:55:26 belaban Exp $
    */
   @Experimental(comment="because of impedance mismatches between a MuxChannel and JChannel, this might get deprecated " +
           "in the future. The replacement would be a shared transport (see the documentation for details)")
  @@ -53,7 +53,7 @@
        * Map<String,MuxChannel>. Maintains the mapping between service IDs and
        * their associated MuxChannels
        */
  -    private final ConcurrentMap<String,MuxChannel> services=new ConcurrentHashMap<String,MuxChannel>();
  +    private final ConcurrentMap<String, MuxChannel> services=Util.createConcurrentMap();
       private final JChannel channel;
   
       /** Thread pool to concurrently process messages sent to different services */