Changeset 639

Timestamp:

27/07/08 21:52:22 (4 months ago)

Author:

smoku

Message:

Implemented MIO read throttling in c2s. Now we pause reading socket instead of disconnection on throttle.

Location:

trunk

Files:

• c2s/c2s.c (modified) (3 diffs)
• c2s/main.c (modified) (5 diffs)
• etc/c2s.xml.dist.in (modified) (1 diff)
• sx/Makefile.am (modified) (1 diff)

trunk/c2s/c2s.c

@@ -59 +59 @@
                     }
 
-                    log_write(sess->c2s->log, LOG_NOTICE, "%d is throttled, disconnecting", sess->fd->fd);
-
-                    /* Disconnect the user.  Ideally we would just stop
-                       reading from their socket until the throttle time
-                       expires.  But that's difficult. */
-                    sx_kill(s);
                     return -1;
                 }
@@ -238 +232 @@
                         sess->stanza_rate_log = 1;
                     }
-
-                    log_write(sess->c2s->log, LOG_NOTICE, "%d is throttled, disconnecting", sess->fd->fd);
-
-                    /* Disconnect the user.  Ideally we would just stop
-                       reading from their socket and delay processing of this
-                       stanza until the throttle time expires.  But that's
-                       difficult. */
-                    sx_kill(s);
-                    return -1;
                 }
 
@@ -519 +504 @@
 
         if(rate_check(rt) == 0) {
-            log_write(c2s->log, LOG_NOTICE, "[%d] [%s] is being rate limited", fd->fd, ip);
+            log_write(c2s->log, LOG_NOTICE, "[%d] [%s] is being connect rate limited", fd->fd, ip);
             return 1;
         }

trunk/c2s/main.c

@@ -181 +181 @@
     c2s->stanza_size_limit = j_atoi(config_get_one(c2s->config, "io.limits.stanzasize", 0), 0);
 
+    /* tweak timed checks with rate times */
+    if(c2s->io_check_interval == 0) {
+        if(c2s->byte_rate_total != 0)
+            c2s->io_check_interval = c2s->byte_rate_wait;
+
+        if(c2s->stanza_rate_total != 0 && c2s->io_check_interval > c2s->stanza_rate_wait)
+            c2s->io_check_interval = c2s->stanza_rate_wait;
+    }
+
     str = config_get_one(c2s->config, "io.access.order", 0);
     if(str == NULL || strcmp(str, "deny,allow") != 0)
@@ -475 +484 @@
             }
 
-            /* Using SSF is potentially dangerous, as SASL can alse set the
+            /* Using SSF is potentially dangerous, as SASL can also set the
              * SSF of the connection. However, SASL shouldn't do so until after
              * we've finished mechanism establishment 
@@ -529 +538 @@
             }
 
+            if(sess->rate != NULL && sess->rate->bad != 0 && rate_check(sess->rate) != 0) {
+                /* read the pending bytes when rate limit is no longer in effect */
+                log_debug(ZONE, "reading throttled %d", sess->fd->fd);
+                sess->s->want_read = 1;
+                sx_can_read(sess->s);
+            }
+
         } while(xhash_iter_next(c2s->sessions));
 }
@@ -537 +553 @@
     char *config_file;
     int optchar;
+    int mio_timeout;
     sess_t sess;
     bres_t res;
@@ -706 +723 @@
     _c2s_router_connect(c2s);
 
+    mio_timeout = ((c2s->io_check_interval != 0 && c2s->io_check_interval < 5) ?
+        c2s->io_check_interval : 5);
+
     while(!c2s_shutdown) {
-        mio_run(c2s->mio, 5);
+        mio_run(c2s->mio, mio_timeout);
 
         if(c2s_logrotate) {

trunk/etc/c2s.xml.dist.in

@@ -209 +209 @@
            The format is:
 
-             <stanzas seconds='Y' throttle='Z'>X</bytes>
+             <stanzas seconds='Y' throttle='Z'>X</stanzas>
 
            Default Y 1, default Z is 5. Set X to 0 to disable -->

trunk/sx/Makefile.am

@@ -1 +1 @@
 noinst_LTLIBRARIES = libsx.la
 noinst_HEADERS = plugins.h sasl.h sx.h
-
-SUBDIRS =
 
 libsx_la_SOURCES = callback.c chain.c client.c env.c error.c io.c server.c sx.c