[jboss-cvs] JBossRemoting/src/main/org/jboss/remoting/transport/bisocket ...

[Ron Sigal]

  User: rsigal  
  Date: 07/02/23 01:57:37

  Modified:    src/main/org/jboss/remoting/transport/bisocket   Tag:
                        remoting_2_x BisocketServerInvoker.java
                        Bisocket.java
  Log:
  JBREM-650: Added pingWindowFactor configuration parameter.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.9   +53 -4     JBossRemoting/src/main/org/jboss/remoting/transport/bisocket/BisocketServerInvoker.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: BisocketServerInvoker.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/transport/bisocket/BisocketServerInvoker.java,v
  retrieving revision 1.1.2.8
  retrieving revision 1.1.2.9
  diff -u -b -r1.1.2.8 -r1.1.2.9
  --- BisocketServerInvoker.java	14 Feb 2007 05:10:51 -0000	1.1.2.8
  +++ BisocketServerInvoker.java	23 Feb 2007 06:57:37 -0000	1.1.2.9
  @@ -57,7 +57,7 @@
   /**
    *
    * @author <a href="ron.sigal at jboss.com">Ron Sigal</a>
  - * @version $Revision: 1.1.2.8 $
  + * @version $Revision: 1.1.2.9 $
    * <p>
    * Copyright Nov 23, 2006
    * </p>
  @@ -75,7 +75,8 @@
      private SecondaryServerSocketThread secondaryServerSocketThread;
      private Map controlConnectionThreadMap = new HashMap();
      private int pingFrequency = Bisocket.PING_FREQUENCY_DEFAULT;
  -   private int pingWindow = 2 * pingFrequency;
  +   private int pingWindowFactor = Bisocket.PING_WINDOW_FACTOR_DEFAULT;
  +   private int pingWindow = pingWindowFactor * pingFrequency;
      private ControlMonitorTimerTask controlMonitorTimerTask;
      protected boolean isCallbackServer = false;
   
  @@ -222,7 +223,20 @@
      public void setPingFrequency(int pingFrequency)
      {
         this.pingFrequency = pingFrequency;
  -      pingWindow = 2 * pingFrequency;
  +      pingWindow = pingWindowFactor * pingFrequency;
  +   }
  +   
  +   
  +   public int getPingWindowFactor()
  +   {
  +      return pingWindowFactor;
  +   }
  +   
  +   
  +   public void setPingWindowFactor(int pingWindowFactor)
  +   {
  +      this.pingWindowFactor = pingWindowFactor;
  +      pingWindow = pingWindowFactor * pingFrequency;
      }
   
   
  @@ -241,6 +255,41 @@
                     Bisocket.IS_CALLBACK_SERVER + "\": " + o);
         }
   
  +      o = configuration.get(Bisocket.PING_FREQUENCY);
  +      if (o instanceof String && ((String) o).length() > 0)
  +      {
  +            try
  +            {
  +               pingFrequency = Integer.valueOf(((String) o)).intValue();
  +            }
  +            catch (NumberFormatException e)
  +            {
  +               log.warn("Invalid format for " + "\"" + Bisocket.PING_FREQUENCY + "\": " + o);
  +            }
  +      }
  +      else if (o != null)
  +      {
  +         log.warn("\"" + Bisocket.PING_FREQUENCY + "\" must be specified as a String");
  +      }
  +      
  +      o = configuration.get(Bisocket.PING_WINDOW_FACTOR);
  +      if (o instanceof String && ((String) o).length() > 0)
  +      {
  +            try
  +            {
  +               pingWindowFactor = Integer.valueOf(((String) o)).intValue();
  +            }
  +            catch (NumberFormatException e)
  +            {
  +               log.warn("Invalid format for " + "\"" + Bisocket.PING_WINDOW_FACTOR + "\": " + o);
  +            }
  +      }
  +      else if (o != null)
  +      {
  +         log.warn("\"" + Bisocket.PING_WINDOW_FACTOR + "\" must be specified as a String");
  +      }
  +      
  +      pingWindow = pingWindowFactor * pingFrequency;
         super.setup();
      }
   
  
  
  
  1.1.2.3   +13 -1     JBossRemoting/src/main/org/jboss/remoting/transport/bisocket/Bisocket.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Bisocket.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/transport/bisocket/Bisocket.java,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -b -r1.1.2.2 -r1.1.2.3
  --- Bisocket.java	19 Dec 2006 06:04:04 -0000	1.1.2.2
  +++ Bisocket.java	23 Feb 2007 06:57:37 -0000	1.1.2.3
  @@ -23,7 +23,7 @@
   
   /** 
    * @author <a href="ron.sigal at jboss.com">Ron Sigal</a>
  - * @version $Revision: 1.1.2.2 $
  + * @version $Revision: 1.1.2.3 $
    * <p>
    * Copyright Nov 22, 2006
    * </p>
  @@ -38,6 +38,18 @@
      public static final byte CREATE_CONTROL_SOCKET  = 2;
      public static final byte CREATE_ORDINARY_SOCKET = 3;
      
  +   /**
  +    * Configuration key and default value for frequency with which pings are sent
  +    * on a control connection.
  +    */
      public static final String PING_FREQUENCY = "pingFrequency";
      public static final int PING_FREQUENCY_DEFAULT = 5000;
  +   
  +   /**
  +    * Configuration key and default value for window within which a ping on a 
  +    * control connection must be receeived for the connection to be considered
  +    * alive.
  +    */
  +   public static final String PING_WINDOW_FACTOR = "pingWindowFactor";
  +   public static final int PING_WINDOW_FACTOR_DEFAULT = 2;
   }