Changeset 134 for trunk/src/samhain.c

Timestamp:

Oct 26, 2007, 12:20:10 AM (17 years ago)

Author:

rainer

Message:

More thread-safety changes.

File:

• trunk/src/samhain.c (modified) (6 diffs)

trunk/src/samhain.c

@@ -138 +138 @@
 #endif
 
+#ifdef HAVE_PTHREAD
+typedef struct gt {
+  size_t g_count;
+  char * g_glob;
+};
+
+pthread_key_t g_key;
+
+int sh_g_thread()
+{
+  struct gt * ptr = malloc(sizeof(struct gt));
+  if (!gt)
+    return -1;
+  ptr->g_count    = 0;
+  ptr->g_glob     = calloc(1, SH_MAX_GLOBS * (GLOB_LEN+1));
+  if (!(ptr->g_glob))
+    return -1;
+  return pthread_setspecific(g_key, ptr);
+}
+
+void sh_g_destroy(void * data)
+{
+  struct gt * ptr = (struct gt *) data;
+  free(ptr->g_glob);
+  free(ptr);
+  return;
+}
+
+static void sh_g_init()
+{
+  if (0 != pthread_key_create(&g_key, sh_g_destroy))
+    {
+      perror("1");
+      exit(EXIT_FAILURE);
+    }
+
+  if (0 != sh_g_thread())
+    {
+      perror("1");
+      exit(EXIT_FAILURE);
+    }
+  return;
+}
+#define SH_G_INIT sh_g_init()
+#else
+#define SH_G_INIT ((void)0)
+#endif
+
 char * globber(const char * str)
 {
@@ -143 +191 @@
   size_t j;
 
-  static   size_t  items = 0;
+#ifdef HAVE_PTHREAD
+  struct gt * ptr = pthread_getspecific(g_key);
+  size_t count = ptr->g_count;
+  char *  glob = ptr->g_glob;
+#else
   static   size_t  count = 0;
   static   char glob[SH_MAX_GLOBS * (GLOB_LEN+1)];
+#
 
   if (str == NULL)
@@ -152 +205 @@
     j = strlen(str);
 
-  ++items;
-
   ASSERT((j <= GLOB_LEN), _("j <= GLOB_LEN"))
 
@@ -164 +215 @@
     {
       count = 0;
-      items = 0;
     }
 
@@ -177 +227 @@
 
   i     = count;
+#ifdef HAVE_PTHREAD
+  ptr->count = count + j + 1;
+#else
   count = count + j + 1;
+#endif
   return &glob[i];
 }
@@ -1144 +1198 @@
   char  * my_argv[32];
 #endif
+
+  SH_G_INIT; /* Must precede any use of _() */
 
   SL_ENTER(_("main"));