CVS update: JGroups/src/org/jgroups JChannel.java

"Bela Ban" <[email protected]> Mon, 13 Sep 2010 12:58:56 +0000
Newsgroups gmane.comp.java.javagroups.cvs
Message-ID <[email protected]>
  User: belaban 
  Date: 10/09/13 12:58:56

  Modified:    src/org/jgroups JChannel.java
  Log:
  added support for dumping of attr lists in probe.sh
  
  Revision  Changes    Path
  1.244     +17 -4     JGroups/src/org/jgroups/JChannel.java
  
  Index: JChannel.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/JChannel.java,v
  retrieving revision 1.243
  retrieving revision 1.244
  diff -u -r1.243 -r1.244
  --- JChannel.java	24 Aug 2010 06:55:39 -0000	1.243
  +++ JChannel.java	13 Sep 2010 12:58:55 -0000	1.244
  @@ -80,7 +80,7 @@
    * the construction of the stack will be aborted.
    *
    * @author Bela Ban
  - * @version $Id: JChannel.java,v 1.243 2010/08/24 06:55:39 belaban Exp $
  + * @version $Id: JChannel.java,v 1.244 2010/09/13 12:58:55 belaban Exp $
    */
   @MBean(description="JGroups channel")
   public class JChannel extends Channel {
  @@ -687,9 +687,13 @@
           return retval;
       }
   
  +    public Map<String,Object> dumpStats(String protocol_name, List<String> attrs) {
  +        return prot_stack.dumpStats(protocol_name, attrs);
  +    }
  +
       @ManagedOperation
       public Map<String,Object> dumpStats(String protocol_name) {
  -        return prot_stack.dumpStats(protocol_name);
  +        return prot_stack.dumpStats(protocol_name, null);
       }
   
       protected Map<String,Long> dumpChannelStats() {
  @@ -2060,8 +2064,17 @@
                       Map<String, Object> tmp_stats;
                       int index=key.indexOf("=");
                       if(index > -1) {
  -                        String value=key.substring(index +1);
  -                        tmp_stats=dumpStats(value);
  +                        List<String> list=null;
  +                        String protocol_name=key.substring(index +1);
  +                        index=protocol_name.indexOf(".");
  +                        if(index > -1) {
  +                            String rest=protocol_name;
  +                            protocol_name=protocol_name.substring(0, index);
  +                            String attrs=rest.substring(index +1); // e.g. "num_sent,msgs,num_received_msgs"
  +                            list=Util.parseStringList(attrs, ",");
  +                        }
  +
  +                        tmp_stats=dumpStats(protocol_name, list);
                       }
                       else
                           tmp_stats=dumpStats();
  
  
  

------------------------------------------------------------------------------
Start uncovering the many advantages of virtual appliances
and start using them to simplify application deployment and
accelerate your shift to cloud computing
http://p.sf.net/sfu/novell-sfdev2dev