Changeset 219 for trunk

Timestamp:

Feb 24, 2009, 8:02:21 PM (16 years ago)

Author:

katerina

Message:

New options SetThrottle and SetConnectionTimeout (ticket #146).

Location:

trunk

Files:

• docs/Changelog (modified) (1 diff)
• include/sh_forward.h (modified) (2 diffs)
• src/sh_forward.c (modified) (5 diffs)
• src/sh_readconf.c (modified) (2 diffs)

trunk/docs/Changelog

@@ -1 +1 @@
 2.5.3:
+        * Option SetThrottle to throttle throughput for db download
+        * Option SetConnectionTimeout to configure the client connection 
+          timeout configurable
         * Provide getrpcbynumber, getservbyname implementations
           to avoid dependencies with static linkage

trunk/include/sh_forward.h

@@ -30 +30 @@
 int sh_forward_create_password (const char * dummy);
 
-/* set time limit
+/* set timeout for active client connections
+ */
+int sh_forward_set_timeout (const char * c);
+
+/* set time limit after which client is reported dead 
  */
 int sh_forward_set_time_limit(const char * str);
@@ -108 +112 @@
 #ifdef SH_WITH_CLIENT
 
+/* Throttle file download
+ */
+int sh_forward_set_throttle_delay (const char * c);
+
 /* request file from server. file may be "CONF" or "DATA".
  */

trunk/src/sh_forward.c

@@ -842 +842 @@
   SL_RETURN(i, _("sh_forward_req_file")); 
 }
+
+static unsigned long sh_throttle_delay = 0;
+
+int sh_forward_set_throttle_delay (const char * c)
+{
+  long val;
+
+  SL_ENTER(_("sh_forward_set_throttle_delay"));
+
+  val = strtol (c, (char **)NULL, 10);
+  if (val < 0)
+    SL_RETURN( (-1), _("sh_forward_set_throttle_delay"));
+
+  val = (val > 1000) ? 1000 : val;
+
+  sh_throttle_delay = (unsigned long) val;
+  SL_RETURN( (0), _("sh_forward_set_throttle_delay"));
+}
+
 
 static  long sh_forward_try_impl (char * errmsg, char what)
@@ -1682 +1701 @@
                                         flag_err-KEY_LEN);
                         ++transfercount;
+                        /***
+                         ***  --- Delay for throughput throttling ---
+                         ***/
+                        if (sh_throttle_delay > 0)
+                          retry_msleep(sh_throttle_delay/1000, sh_throttle_delay % 1000);
+                        /***
+                         ***  --- End delay                       ---
+                         ***/
                         flag_err = 
                           sh_forward_send_crypt (sockfd, (char) theProto, 
@@ -4792 +4819 @@
 }
 
+#define  TIME_OUT_DEF 900
+static   unsigned long  time_out_val = TIME_OUT_DEF;
+
+int sh_forward_set_timeout (const char * c)
+{
+  long val;
+
+  SL_ENTER(_("sh_forward_set_time_out"));
+
+  val = strtol (c, (char **)NULL, 10);
+
+  if (val == 0)
+    {
+      val = TIME_OUT_DEF;
+    }
+  else if (val < 0)
+    {
+      time_out_val = TIME_OUT_DEF;
+      SL_RETURN( (-1), _("sh_forward_set_time_out"));
+    }
+
+  time_out_val = (unsigned long) val;
+  SL_RETURN( (0), _("sh_forward_set_time_out"));
+}
+
+
 static   sh_conn_t        * conns = NULL;
-#define  TIME_OUT_DEF 900
 static   int  maxconn = 0;  /* maximum number of simultaneous connections */
 
@@ -4906 +4958 @@
   unsigned long      time_now;
   unsigned long      time_last = 0;
-  unsigned long      time_out = TIME_OUT_DEF;  
+  unsigned long      time_out = time_out_val;  
   
   time_t told;
@@ -5198 +5250 @@
       /* -- Exponentially reduce timeout limit if more than 1/2 full. --
        */
+      /* Eliminate this, will cause problems when too much clients are
+       * starting up. */
+#if 0
       if (nowconn > (maxconn/2))
         time_out = ( (time_out/2) > 1) ? (time_out/2) : 1;
       else
-        time_out = TIME_OUT_DEF;
-      
+        time_out = time_out_val;
+#endif
       
       

trunk/src/sh_readconf.c

@@ -1056 +1056 @@
   { N_("setclienttimelimit"),  SH_SECTION_SRV,  SH_SECTION_MISC, 
     sh_forward_set_time_limit },
+  { N_("setconnectiontimeout"),SH_SECTION_SRV,  SH_SECTION_MISC, 
+    sh_forward_set_timeout },
   { N_("useclientseverity"),   SH_SECTION_SRV,  SH_SECTION_MISC, 
   sh_forward_use_clt_sev },
@@ -1083 +1085 @@
   { N_("setlogserver"),        SH_SECTION_CLT,  SH_SECTION_MISC, 
     sh_forward_setlogserver },
+  { N_("setthrottle"),         SH_SECTION_CLT,  SH_SECTION_MISC, 
+    sh_forward_set_throttle_delay},
 #endif
 #endif