ircd: radixtree: allow irc_radixtree_elem_find() to find a fuzzy match instead of...

[solanum.git] / ircd / irc_dictionary.c

diff --git a/ircd/irc_dictionary.c b/ircd/irc_dictionary.c
index 8bfd4ad88075fa311b209772128d14aa66bae134..6e86128c0b5b5282e18511c24617b3e34e66bf24 100644 (file)
--- a/ircd/irc_dictionary.c
+++ b/ircd/irc_dictionary.c
@@ -37,8 +37,12 @@ struct Dictionary
        unsigned int count;
        char *id;
        unsigned int dirty:1;
+
+       rb_dlink_node node;
 };
 
+static rb_dlink_list dictionary_list = {NULL, NULL, 0};
+
 /*
  * irc_dictionary_create(const char *name, DCF compare_cb)
  *
@@ -63,6 +67,8 @@ struct Dictionary *irc_dictionary_create(const char *name,
        dtree->compare_cb = compare_cb;
        dtree->id = rb_strdup(name);
 
+       rb_dlinkAdd(dtree, &dtree->node, &dictionary_list);
+
        return dtree;
 }
 
@@ -116,7 +122,7 @@ irc_dictionary_get_comparator_func(struct Dictionary *dict)
 
 /*
  * irc_dictionary_get_linear_index(struct Dictionary *dict,
- *     const char *key)
+ *     const void *key)
  *
  * Gets a linear index number for key.
  *
@@ -131,7 +137,7 @@ irc_dictionary_get_comparator_func(struct Dictionary *dict)
  *     - rebuilds the linear index if the tree is marked as dirty.
  */
 int
-irc_dictionary_get_linear_index(struct Dictionary *dict, const char *key)
+irc_dictionary_get_linear_index(struct Dictionary *dict, const void *key)
 {
        struct DictionaryElement *elem;
 
@@ -159,7 +165,7 @@ irc_dictionary_get_linear_index(struct Dictionary *dict, const char *key)
 }
 
 /*
- * irc_dictionary_retune(struct Dictionary *dict, const char *key)
+ * irc_dictionary_retune(struct Dictionary *dict, const void *key)
  *
  * Retunes the tree, self-optimizing for the element which belongs to key.
  *
@@ -173,7 +179,7 @@ irc_dictionary_get_linear_index(struct Dictionary *dict, const char *key)
  *     - a new root node is nominated.
  */
 static void
-irc_dictionary_retune(struct Dictionary *dict, const char *key)
+irc_dictionary_retune(struct Dictionary *dict, const void *key)
 {
        struct DictionaryElement n, *tn, *left, *right, *node;
        int ret;
@@ -444,6 +450,8 @@ void irc_dictionary_destroy(struct Dictionary *dtree,
                rb_free(n);
        }
 
+       rb_dlinkDelete(&dtree->node, &dictionary_list);
+
        rb_free(dtree);
 }
 
@@ -626,7 +634,7 @@ void irc_dictionary_foreach_next(struct Dictionary *dtree,
 }
 
 /*
- * irc_dictionary_find(struct Dictionary *dtree, const char *key)
+ * irc_dictionary_find(struct Dictionary *dtree, const void *key)
  *
  * Looks up a DTree node by name.
  *
@@ -641,7 +649,7 @@ void irc_dictionary_foreach_next(struct Dictionary *dtree,
  * Side Effects:
  *     - none
  */
-struct DictionaryElement *irc_dictionary_find(struct Dictionary *dict, const char *key)
+struct DictionaryElement *irc_dictionary_find(struct Dictionary *dict, const void *key)
 {
        s_assert(dict != NULL);
        s_assert(key != NULL);
@@ -656,7 +664,7 @@ struct DictionaryElement *irc_dictionary_find(struct Dictionary *dict, const cha
 }
 
 /*
- * irc_dictionary_add(struct Dictionary *dtree, const char *key, void *data)
+ * irc_dictionary_add(struct Dictionary *dtree, const void *key, void *data)
  *
  * Creates a new DTree node and binds data to it.
  *
@@ -672,7 +680,7 @@ struct DictionaryElement *irc_dictionary_find(struct Dictionary *dict, const cha
  * Side Effects:
  *     - data is inserted into the DTree.
  */
-struct DictionaryElement *irc_dictionary_add(struct Dictionary *dict, const char *key, void *data)
+struct DictionaryElement *irc_dictionary_add(struct Dictionary *dict, const void *key, void *data)
 {
        struct DictionaryElement *delem;
 
@@ -685,20 +693,13 @@ struct DictionaryElement *irc_dictionary_add(struct Dictionary *dict, const char
        delem->key = key;
        delem->data = data;
 
-       /* TBD: is this needed? --nenolod */
-       if (delem->key == NULL)
-       {
-               rb_free(delem);
-               return NULL;
-       }
-
        irc_dictionary_link(dict, delem);
 
        return delem;
 }
 
 /*
- * irc_dictionary_delete(struct Dictionary *dtree, const char *key)
+ * irc_dictionary_delete(struct Dictionary *dtree, const void *key)
  *
  * Deletes data from a dictionary tree.
  *
@@ -716,7 +717,7 @@ struct DictionaryElement *irc_dictionary_add(struct Dictionary *dict, const char
  * Notes:
  *     - the returned data needs to be mowgli_freed/released manually!
  */
-void *irc_dictionary_delete(struct Dictionary *dtree, const char *key)
+void *irc_dictionary_delete(struct Dictionary *dtree, const void *key)
 {
        struct DictionaryElement *delem = irc_dictionary_find(dtree, key);
        void *data;
@@ -733,7 +734,7 @@ void *irc_dictionary_delete(struct Dictionary *dtree, const char *key)
 }
 
 /*
- * irc_dictionary_retrieve(struct Dictionary *dtree, const char *key)
+ * irc_dictionary_retrieve(struct Dictionary *dtree, const void *key)
  *
  * Retrieves data from a dictionary.
  *
@@ -748,7 +749,7 @@ void *irc_dictionary_delete(struct Dictionary *dtree, const char *key)
  * Side Effects:
  *     - none
  */
-void *irc_dictionary_retrieve(struct Dictionary *dtree, const char *key)
+void *irc_dictionary_retrieve(struct Dictionary *dtree, const void *key)
 {
        struct DictionaryElement *delem = irc_dictionary_find(dtree, key);
 
@@ -788,9 +789,9 @@ stats_recurse(struct DictionaryElement *delem, int depth, int *pmaxdepth)
        if (depth > *pmaxdepth)
                *pmaxdepth = depth;
        result = depth;
-       if (delem->left)
+       if (delem && delem->left)
                result += stats_recurse(delem->left, depth + 1, pmaxdepth);
-       if (delem->right)
+       if (delem && delem->right)
                result += stats_recurse(delem->right, depth + 1, pmaxdepth);
        return result;
 }
@@ -818,16 +819,26 @@ void irc_dictionary_stats(struct Dictionary *dict, void (*cb)(const char *line,
 
        s_assert(dict != NULL);
 
-       if (dict->id != NULL)
-               rb_snprintf(str, sizeof str, "Dictionary stats for %s (%d)",
-                               dict->id, dict->count);
+       if (dict->count)
+       {
+               maxdepth = 0;
+               sum = stats_recurse(dict->root, 0, &maxdepth);
+               snprintf(str, sizeof str, "%-30s %-15s %-10d %-10d %-10d %-10d", dict->id, "DICT", dict->count, sum, sum / dict->count, maxdepth);
+       }
        else
-               rb_snprintf(str, sizeof str, "Dictionary stats for <%p> (%d)",
-                               (void *)dict, dict->count);
-       cb(str, privdata);
-       maxdepth = 0;
-       sum = stats_recurse(dict->root, 0, &maxdepth);
-       rb_snprintf(str, sizeof str, "Depth sum %d Avg depth %d Max depth %d", sum, sum / dict->count, maxdepth);
+       {
+               snprintf(str, sizeof str, "%-30s %-15s %-10s %-10s %-10s %-10s", dict->id, "DICT", "0", "0", "0", "0");
+       }
+
        cb(str, privdata);
-       return;
+}
+
+void irc_dictionary_stats_walk(void (*cb)(const char *line, void *privdata), void *privdata)
+{
+       rb_dlink_node *ptr;
+
+       RB_DLINK_FOREACH(ptr, dictionary_list.head)
+       {
+               irc_dictionary_stats(ptr->data, cb, privdata);
+       }
 }