Changeset 9b9e13bd4b3785fb55a4554ca02ceae0e7f34fd7

Timestamp:

10/06/11 16:19:04 (8 months ago)

Author:

Neutron Soutmun <neo.neutron@…>

Children:

823108d8770786f2ef1ae5aae248241916093346

Parents:

6ff4a7845cd86f6a6af7c80845bf3f5ae04e9cfc

git-committer:

Neutron Soutmun <neo.neutron@…> (10/06/11 16:19:04)

Message:

squid-auth-helper multi-threaded support

• tools/squid-auth-helper.c:
  • Support the concurrency > 1 in squid config setting. Could reduce the children to get more memory back as it is not necessary to spawn children much to serve the same scale now.
  • Create up to 8 threads to serve the requests.

Files:

• tools/squid-auth-helper.c (modified) (4 diffs)

tools/squid-auth-helper.c

@@ -15 +15 @@
 #include <arpa/inet.h>
 #include <xmlrpc.h>
+#include <semaphore.h>
+#include <pthread.h>
 
 struct vserver_info
@@ -23 +25 @@
 };
 
+struct helper_opts
+{
+  gchar   ch_tag[16];
+  gchar   ip[40];
+};
+
+typedef struct helper_opts HelperOpts;
+
 GList *vservers = 0;
+
+pthread_mutex_t helper_mtx = PTHREAD_MUTEX_INITIALIZER;
+sem_t           helper_sem;
 
 enum lcfg_status
@@ -101 +114 @@
 }
 
+static void *
+service (void *args)
+{
+  HelperOpts *opts = (HelperOpts *) args;
+  GList   *vs;
+  struct in_addr ip_addr;
+  guint32  src_ip;
+  guint    vserver_id;
+  gchar    query[32];
+  gchar   *reply;
+  GNetXmlRpcClient *client;
+  gint port = 8123;
+
+  if (inet_aton (opts->ip, &ip_addr) == 0)
+    {
+      /* ERR: Invalid source IP address */
+      pthread_mutex_lock (&helper_mtx);
+      printf ("%sOK user=%s\n", opts->ch_tag, opts->ip);
+      fflush (stdout);
+      pthread_mutex_unlock (&helper_mtx);
+      goto out;
+    }
+  src_ip = ntohl (ip_addr.s_addr);
+
+  vserver_id = ~0;
+  for (vs = vservers; vs; vs = vs->next)
+    {
+      struct vserver_info *info = (struct vserver_info *) vs->data;
+      if ((src_ip & (~0 << (32 - info->mask))) == info->net_ip)
+        {
+          vserver_id = info->id;
+          break;
+        }
+    }
+
+  if (vserver_id == ~0)
+    {
+      /* ERR: vserver_id not found */
+      pthread_mutex_lock (&helper_mtx);
+      printf ("%sOK user=%s\n", opts->ch_tag, opts->ip);
+      fflush (stdout);
+      pthread_mutex_unlock (&helper_mtx);
+      goto out;
+    }
+
+  /* query RahuNAS daemon for user name via xmlrpc */
+  client = gnet_xmlrpc_client_new ("localhost", "/RPC2", port);
+  if (!client)
+    {
+      /* ERR: Failed to connect to localhost XMLRPC */
+      pthread_mutex_lock (&helper_mtx);
+      printf ("%sOK user=%s\n", opts->ch_tag, opts->ip);
+      fflush (stdout);
+      pthread_mutex_unlock (&helper_mtx);
+      goto out;
+    }
+
+  snprintf (query, sizeof query, "%s|%d", opts->ip, vserver_id);
+  if (gnet_xmlrpc_client_call (client,
+                   "getsessioninfo",
+                   query,
+                   /* output  */
+                   &reply) == 0)
+    {
+      gchar *tok;
+      /* reply format: id|user|sess-id|sess-start|mac|sess-timeout */
+      tok = strtok (reply, "|"); /* id */
+      tok = strtok (NULL, "|"); /* user */
+      pthread_mutex_lock (&helper_mtx);
+      printf ("%sOK user=%s\n", opts->ch_tag, tok);
+      fflush (stdout);
+      pthread_mutex_unlock (&helper_mtx);
+      g_free (reply);
+    }
+  else
+    {
+      /* ERR: Error calling 'getsessioninfo' XMLRPC */
+      pthread_mutex_lock (&helper_mtx);
+      printf ("%sOK user=%s\n", opts->ch_tag, opts->ip);
+      fflush (stdout);
+      pthread_mutex_unlock (&helper_mtx);
+    }
+
+  gnet_xmlrpc_client_delete (client);
+
+out:
+  sem_post (&helper_sem);
+  pthread_exit (NULL);
+}
+
 int
 main(int argc, char *argv[])
 {
+  GList *vs;
   gchar line[1024];
-  GList *vs;
+  int   max_concurrent = 8;
+  HelperOpts rr_opts[8];
+  int   rr_idx = 0;
 
   gnet_init ();
@@ -112 +218 @@
   ftw ("/etc/rahunas/rahunas.d", ftw_read_vserver, 20);
 
+  /* Init semaphore */
+  sem_init (&helper_sem, 0, max_concurrent);
+
+  /* Init helper options */
+  memset (&rr_opts, '\0', sizeof (rr_opts));
+
   /* read input from squid */
-  while (fgets (line, sizeof line, stdin))
-    {
-      int      len;
-      struct in_addr ip_addr;
-      guint32  src_ip;
-      guint    vserver_id;
-      gchar    query[32];
-      gchar   *reply;
-      GNetXmlRpcClient *client;
-      gint port = 8123;
-
+  while (fgets (line, sizeof (line), stdin))
+    {
+      pthread_t p;
+      int       len;
+      gchar    *sep = NULL;
+
+      line[sizeof (line) - 1] = '\0';
       len = strlen (line);
-      if (line[len] == '\n')
-        line[len--] = '\0';
-
-      if (inet_aton (line, &ip_addr) == 0)
-        {
-          /* ERR: Invalid source IP address */
-          printf ("OK user=%s\n", line);
+      if (line[len - 1] == '\n')
+        line[--len] = '\0';
+
+      sep = strchr (line, ' ');
+      if (sep)
+        {
+          *sep = '\0';
+          strncpy (&rr_opts[rr_idx].ch_tag, line,
+                     sizeof (rr_opts[rr_idx].ch_tag) - 2);
+          strcat (&rr_opts[rr_idx].ch_tag, " ");
+
+          /* Strip white-space */
+          sep++;
+          while (*sep == ' ' && (sep - line) < sizeof (line))
+            sep++;
+
+          if ((sep - line) < sizeof (line))
+            {
+              strncpy (&rr_opts[rr_idx].ip, sep,
+                         sizeof (rr_opts[rr_idx].ip) - 1);
+            }
+          else
+            {
+              rr_opts[rr_idx].ip[0] = '\0';
+            }
+        }
+      else
+        {
+          rr_opts[rr_idx].ch_tag[0] = '\0';
+          strncpy (&rr_opts[rr_idx].ip, line, sizeof (rr_opts[rr_idx].ip) - 1);
+        }
+
+      sem_wait (&helper_sem);
+
+      if (pthread_create (&p, NULL, (void *(*)(void *))service,
+            (void *)&rr_opts[rr_idx]) != 0)
+        {
+          pthread_mutex_lock (&helper_mtx);
+          printf ("%sOK user=%s\n", rr_opts[rr_idx].ch_tag, rr_opts[rr_idx].ip);
           fflush (stdout);
-          continue;
-        }
-      src_ip = ntohl (ip_addr.s_addr);
-
-      vserver_id = ~0;
-      for (vs = vservers; vs; vs = vs->next)
-        {
-          struct vserver_info *info = (struct vserver_info *) vs->data;
-          if ((src_ip & (~0 << (32 - info->mask))) == info->net_ip)
-            {
-              vserver_id = info->id;
-              break;
-            }
-        }
-
-      if (vserver_id == ~0)
-        {
-          /* ERR: vserver_id not found */
-          printf ("OK user=%s\n", line);
-          fflush (stdout);
-          continue;
-        }
-
-      /* query RahuNAS daemon for user name via xmlrpc */
-      client = gnet_xmlrpc_client_new ("localhost", "/RPC2", port);
-      if (!client)
-        {
-          /* ERR: Failed to connect to localhost XMLRPC */
-          printf ("OK user=%s\n", line);
-          fflush (stdout);
-          continue;
-        }
-  
-      snprintf (query, sizeof query, "%s|%d", line, vserver_id);
-      if (gnet_xmlrpc_client_call (client,
-                                   "getsessioninfo",
-                                   query,
-                                   /* output  */
-                                   &reply) == 0)
-        {
-          gchar *tok;
-          /* reply format: id|user|sess-id|sess-start|mac|sess-timeout */
-          tok = strtok (reply, "|"); /* id */
-          tok = strtok (NULL, "|"); /* user */
-          printf ("OK user=%s\n", tok);
-          fflush (stdout);
-          g_free (reply);
+          pthread_mutex_unlock (&helper_mtx);
         }
       else
         {
-          /* ERR: Error calling 'getsessioninfo' XMLRPC */
-          printf ("OK user=%s\n", line);
-          fflush (stdout);
-        }
-
-      gnet_xmlrpc_client_delete (client);
+          pthread_detach (p);
+        }
+
+      rr_idx++;
+      rr_idx = rr_idx < max_concurrent ? rr_idx : 0;
     }