Changeset 363 for trunk

Timestamp:

Oct 21, 2011, 1:08:28 AM (13 years ago)

Author:

katerina

Message:

Change zAVL implementation to allow integer keys.

Location:

trunk

Files:

• include/sh_inotify.h (modified) (1 diff)
• include/zAVLTree.h (modified) (3 diffs)
• src/cutest_zAVLTree.c (modified) (1 diff)
• src/sh_files.c (modified) (3 diffs)
• src/sh_forward.c (modified) (1 diff)
• src/sh_log_evalrule.c (modified) (1 diff)
• src/sh_log_mark.c (modified) (1 diff)
• src/sh_nmail.c (modified) (1 diff)
• src/sh_utmp.c (modified) (1 diff)
• src/zAVLTree.c (modified) (3 diffs)

trunk/include/sh_inotify.h

@@ -6 +6 @@
 typedef struct 
 {
+  /*
+  void * list_of_watches;
+  */
+
   int    watch[SH_INOTIFY_MAX];
   int    flag[SH_INOTIFY_MAX];
   char * file[SH_INOTIFY_MAX];
-  int    count;
 
+  int     count;
+  int  max_count;
 } sh_watches;
+
+#define SH_INOTIFY_INITIALIZER { { 0 }, { 0 }, { NULL}, 0, 0 }
 
 int sh_inotify_wait_for_change(char * filename, sh_watches * watches, 

trunk/include/zAVLTree.h

@@ -33 +33 @@
 
 /* typedef the keytype */
-typedef const char * zAVLKey;
+typedef const void * zAVLKey;
 
 /* Comparison function for strings is strcmp(). */
-#define zAVLKey_cmp(tree, a, b) (strcmp((a), (b)))
+/* #define zAVLKey_cmp(tree, a, b) (strcmp((a), (b))) */
+
+#define zAVL_KEY_STRING 0
+#define zAVL_KEY_INT    1
 
 
@@ -53 +56 @@
   long count;
   zAVLKey (*getkey)(const void *item);
+  int keytype;
 } zAVLTree;
 
@@ -62 +66 @@
 
 
-extern zAVLTree *zAVLAllocTree (zAVLKey (*getkey)(void const *item));
+extern zAVLTree *zAVLAllocTree (zAVLKey (*getkey)(void const *item), int keytype);
 extern void zAVLFreeTree (zAVLTree *avltree, void (freeitem)(void *item));
 extern int zAVLInsert (zAVLTree *avltree, void *item);

trunk/src/cutest_zAVLTree.c

@@ -44 +44 @@
   CuAssertTrue(tc, NULL == ptr);
 
-  ztest_tree = zAVLAllocTree (ztest_key);
+  ztest_tree = zAVLAllocTree (ztest_key, zAVL_KEY_STRING);
   CuAssertPtrNotNull(tc, ztest_tree);
 

trunk/src/sh_files.c

@@ -897 +897 @@
   if (zfileList == NULL)
     {
-      zfileList = zAVLAllocTree (zdirstack_key);
+      zfileList = zAVLAllocTree (zdirstack_key, zAVL_KEY_STRING);
       if (zfileList == NULL) 
         {
@@ -975 +975 @@
           if (zglobList == NULL)
             {
-              zglobList = zAVLAllocTree (zdirstack_key);
+              zglobList = zAVLAllocTree (zdirstack_key, zAVL_KEY_STRING);
               if (zglobList == NULL) 
                 {
@@ -1456 +1456 @@
   if (tree == NULL)
     {
-      tree = zAVLAllocTree (zdirstack_key);
+      tree = zAVLAllocTree (zdirstack_key, zAVL_KEY_STRING);
       if (tree == NULL) 
         {

trunk/src/sh_forward.c

@@ -2088 +2088 @@
   if (all_clients == NULL)
     {
-      all_clients = zAVLAllocTree (sh_avl_key);
+      all_clients = zAVLAllocTree (sh_avl_key, zAVL_KEY_STRING);
       if (all_clients == NULL) 
         {

trunk/src/sh_log_evalrule.c

@@ -1122 +1122 @@
     {
       DEBUG("debug: allocate new counterlist AVL tree\n");
-      rule->counterlist = zAVLAllocTree(sh_eval_getkey);
+      rule->counterlist = zAVLAllocTree(sh_eval_getkey, zAVL_KEY_STRING);
     }
 

trunk/src/sh_log_mark.c

@@ -77 +77 @@
   if (!(marklist))
     {
-      marklist = zAVLAllocTree(sh_log_mark_getkey);
+      marklist = zAVLAllocTree(sh_log_mark_getkey, zAVL_KEY_STRING);
     }
 

trunk/src/sh_nmail.c

@@ -957 +957 @@
     }
 
-  mailkeys = zAVLAllocTree (sh_nmail_getkey);
+  mailkeys = zAVLAllocTree (sh_nmail_getkey, zAVL_KEY_STRING);
   goto start;
 }

trunk/src/sh_utmp.c

@@ -558 +558 @@
 
 #if defined(HAVE_PTHREAD)
-static sh_watches inotify_watch;
+static sh_watches inotify_watch = SH_INOTIFY_INITIALIZER;
 #endif
 

trunk/src/zAVLTree.c

@@ -53 +53 @@
 #define ZAVL_NO 0
 
+/* The comparison function. Was a macro, but this allows for more
+ * flexibility (non-string keys). The key is a (void *) now, and
+ * the type is stored in the zAVLTree struct. Oct 21, 2011, rw
+ */
+static int zAVLKey_cmp(const zAVLTree * tree, zAVLKey a, zAVLKey b)
+{
+  if (tree->keytype == zAVL_KEY_STRING)
+    {
+      return (strcmp((char*)a, (char *)b));
+    }
+  else /* zAVL_KEY_INT */
+    {
+      int x = *((int *)a);
+      int y = *((int *)b);
+
+      if      (x > y) return  1;
+      else if (x < y) return -1;
+      else return 0;
+    }
+}
 
 /*
@@ -62 +82 @@
  * was a malloc failure, then NULL is returned.
  */
-zAVLTree *zAVLAllocTree (zAVLKey (*getkey)(void const *item))
+zAVLTree *zAVLAllocTree (zAVLKey (*getkey)(void const *item), int keytype)
 {
   zAVLTree *rc;
@@ -73 +93 @@
   rc->count = 0;
   rc->getkey = getkey;
+  rc->keytype = keytype;
   return rc;
 }