Changeset 357

Timestamp:

31/08/07 02:24:28 (15 months ago)

Author:

smoku

Message:

c2s and s2s packet throughput counter implemented

Location:

trunk

Files:

• c2s/c2s.c (modified) (4 diffs)
• c2s/c2s.h (modified) (3 diffs)
• c2s/main.c (modified) (4 diffs)
• etc/c2s.xml.dist.in (modified) (1 diff)
• etc/s2s.xml.dist.in (modified) (1 diff)
• s2s/in.c (modified) (1 diff)
• s2s/main.c (modified) (3 diffs)
• s2s/out.c (modified) (1 diff)
• s2s/s2s.h (modified) (1 diff)

trunk/c2s/c2s.c

@@ -210 +210 @@
             /* we're counting packets */
             sess->packet_count++;
+            sess->c2s->packet_count++;
 
             nad = (nad_t) data;
@@ -427 +428 @@
     c2s_t c2s = (c2s_t) arg;
     struct sockaddr_storage sa;
-    int namelen = sizeof(sa), port, nbytes;
+    int namelen = sizeof(sa), port, nbytes, flags = 0;
 
     switch(a) {
@@ -504 +505 @@
             xhash_put(c2s->sessions, sess->skey, (void *) sess);
 
+            flags = SX_SASL_OFFER;
 #ifdef HAVE_SSL
             /* go ssl wrappermode if they're on the ssl port */
             if(port == c2s->local_ssl_port)
-                sx_server_init(sess->s, SX_SSL_WRAPPER | SX_SASL_OFFER);
-            else
-                sx_server_init(sess->s, SX_SASL_OFFER);
-#else
-            sx_server_init(sess->s, SX_SASL_OFFER);
+                flags |= SX_SSL_WRAPPER;
 #endif
+#ifdef HAVE_LIBZ
+            flags |= SX_COMPRESS_OFFER;
+#endif
+            sx_server_init(sess->s, flags);
+
             break;
     }
@@ -1046 +1049 @@
                 }
 
+                /* we're counting packets */
+                sess->packet_count++;
+                sess->c2s->packet_count++;
+
                 /* remove sm specifics */
                 nad_set_attr(nad, 1, ns, "c2s", NULL, 0);

trunk/c2s/c2s.h

@@ -28 +28 @@
 #include "sx/sx.h"
 #include "sx/ssl.h"
+#include "sx/compress.h"
 #ifdef HEADER_MD5_H
 #  define MD5_H
@@ -144 +145 @@
     sx_plugin_t         sx_ssl;
     sx_plugin_t         sx_sasl;
+    sx_plugin_t         sx_compress;
 
     /** router's conn */
@@ -165 +167 @@
     char                *log_facility;
     char                *log_ident;
+
+    /** packet counter */
+    long long int       packet_count;
+    char                *packet_stats;
 
     /** connect retry */

trunk/c2s/main.c

@@ -113 +113 @@
         c2s->log_ident = config_get_one(c2s->config, "log.file", 0);
 
+    c2s->packet_stats = config_get_one(c2s->config, "stats.packet", 0);
+
     c2s->local_ip = config_get_one(c2s->config, "local.ip", 0);
     if(c2s->local_ip == NULL)
@@ -495 +497 @@
     sess_t sess;
     union xhashv xhv;
-#ifdef POOL_DEBUG
-    time_t pool_time = 0;
-#endif
+    time_t check_time = 0;
     
 #ifdef HAVE_UMASK
@@ -642 +642 @@
     }
 
+#ifdef HAVE_LIBZ
+    /* get compression up and running */
+    c2s->sx_compress = sx_env_plugin(c2s->sx_env, sx_compress_init);
+    if(c2s->sx_compress == NULL) {
+        log_write(c2s->log, LOG_ERR, "failed to initialise compression");
+    }
+#endif
+
+    /* get bind up */
     sx_env_plugin(c2s->sx_env, bind_init, c2s);
 
@@ -714 +723 @@
         }
 
+        if(time(NULL) > check_time + 60) {
 #ifdef POOL_DEBUG
-        if(time(NULL) > pool_time + 60) {
             pool_stat(1);
-            pool_time = time(NULL);
-        }
-#endif
+#endif
+            if(c2s->packet_stats != NULL) {
+                int fd = open(c2s->packet_stats, O_TRUNC | O_CREAT | O_WRONLY, S_IRUSR | S_IWUSR | S_IRGRP);
+                if(fd) {
+                    char buf[100];
+                    int len = snprintf(buf, 100, "%lld\n", c2s->packet_count);
+                    write(fd, buf, len);
+                    close(fd);
+                } else {
+                    log_write(c2s->log, LOG_ERR, "failed to write packet statistics to: %s", c2s->packet_stats);
+                    c2s_shutdown = 1;
+                }
+            }
+    
+            check_time = time(NULL);
+        }
     }
 

trunk/etc/c2s.xml.dist.in

@@ -264 +264 @@
   </io>
 
+  <!-- Statistics -->
+  <stats>
+    <!-- file containing count of packets that went through -->
+    <!--
+    <packet>@localstatedir@/jabberd/stats/c2s.packets</packet>
+    -->
+  </stats>
+
   <!-- Authentication/registration database configuration -->
   <authreg>

trunk/etc/s2s.xml.dist.in

@@ -166 +166 @@
   </check>
 
+  <!-- Statistics -->
+  <stats>
+    <!-- file containing count of packets that went through -->
+    <!--
+    <packet>@localstatedir@/jabberd/stats/s2s.packets</packet>
+    -->
+  </stats>
+
 </s2s>

trunk/s2s/in.c

@@ -257 +257 @@
             /* we're counting packets */
             in->packet_count++;
+            in->s2s->packet_count++;
 
             nad = (nad_t) data;

trunk/s2s/main.c

@@ -110 +110 @@
         s2s->log_ident = config_get_one(s2s->config, "log.file", 0);
 
+    s2s->packet_stats = config_get_one(s2s->config, "stats.packet", 0);
+
     s2s->local_ip = config_get_one(s2s->config, "local.ip", 0);
     if(s2s->local_ip == NULL)
@@ -381 +383 @@
     dnscache_t dns;
     union xhashv xhv;
-#ifdef POOL_DEBUG
-    time_t pool_time = 0;
-#endif
+    time_t check_time = 0;
 
 #ifdef HAVE_UMASK
@@ -578 +578 @@
         }
 
+        if(time(NULL) > check_time + 60) {
 #ifdef POOL_DEBUG
-        if(time(NULL) > pool_time + 60) {
             pool_stat(1);
-            pool_time = time(NULL);
-        }
-#endif
+#endif
+            if(s2s->packet_stats != NULL) {
+                int fd = open(s2s->packet_stats, O_TRUNC | O_CREAT | O_WRONLY, S_IRUSR | S_IWUSR | S_IRGRP);
+                if(fd) {
+                    char buf[100];
+                    int len = snprintf(buf, 100, "%lld\n", s2s->packet_count);
+                    write(fd, buf, len);
+                    close(fd);
+                } else {
+                    log_write(s2s->log, LOG_ERR, "failed to write packet statistics to: %s", s2s->packet_stats);
+                    s2s_shutdown = 1;
+                }
+            }
+    
+            check_time = time(NULL);
+        }
     }
 

trunk/s2s/out.c

@@ -633 +633 @@
             /* we're counting packets */
             out->packet_count++;
+            out->s2s->packet_count++;
 
             nad = (nad_t) data;

trunk/s2s/s2s.h

@@ -83 +83 @@
     char                *log_ident;
 
+    /** packet counter */
+    long long int       packet_count;
+    char                *packet_stats;
+
     /** connect retry */
     int                 retry_init;