From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Thu, 19 Mar 2015 18:43:03 +0000 (+0000)
Subject: Use regexp hash functions for task re_cache.
X-Git-Tag: 0.9.0~451^2~15
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=033d4b2d749fca44e4b067f9a5486a289b61a95e;p=rspamd.git

Use regexp hash functions for task re_cache.
---

diff --git a/src/libserver/task.c b/src/libserver/task.c
index f6eeef2b1..a4286634f 100644
--- a/src/libserver/task.c
+++ b/src/libserver/task.c
@@ -73,7 +73,7 @@ rspamd_task_new (struct rspamd_worker *worker)
 	rspamd_mempool_add_destructor (new_task->task_pool,
 		(rspamd_mempool_destruct_t) g_hash_table_unref,
 		new_task->results);
-	new_task->re_cache = g_hash_table_new (rspamd_str_hash, rspamd_str_equal);
+	new_task->re_cache = g_hash_table_new (rspamd_regexp_hash, rspamd_regexp_equal);
 	rspamd_mempool_add_destructor (new_task->task_pool,
 		(rspamd_mempool_destruct_t) g_hash_table_unref,
 		new_task->re_cache);
diff --git a/src/libutil/regexp.c b/src/libutil/regexp.c
index b8bd4454c..bf1a1762d 100644
--- a/src/libutil/regexp.c
+++ b/src/libutil/regexp.c
@@ -436,7 +436,7 @@ rspamd_regexp_get_ud (rspamd_regexp_t *re)
 	return re->ud;
 }
 
-static gboolean
+gboolean
 rspamd_regexp_equal (gconstpointer a, gconstpointer b)
 {
 	const guchar *ia = a, *ib = b;
@@ -444,7 +444,7 @@ rspamd_regexp_equal (gconstpointer a, gconstpointer b)
 	return (memcmp (ia, ib, sizeof (regexp_id_t)) == 0);
 }
 
-static guint32
+guint32
 rspamd_regexp_hash (gconstpointer a)
 {
 	const guchar *ia = a;
diff --git a/src/libutil/regexp.h b/src/libutil/regexp.h
index 3c08de71a..fc236c1b3 100644
--- a/src/libutil/regexp.h
+++ b/src/libutil/regexp.h
@@ -89,6 +89,13 @@ void rspamd_regexp_set_ud (rspamd_regexp_t *re, gpointer ud);
  */
 gpointer rspamd_regexp_get_ud (rspamd_regexp_t *re);
 
+/**
+ * Get regexp ID suitable for hashing
+ * @param re
+ * @return
+ */
+gpointer rspamd_regexp_get_id (rspamd_regexp_t *re);
+
 /**
  * Get pattern for the specified regexp object
  * @param re
@@ -151,6 +158,21 @@ gboolean rspamd_regexp_cache_remove (struct rspamd_regexp_cache *cache,
  */
 void rspamd_regexp_cache_destroy (struct rspamd_regexp_cache *cache);
 
+/**
+ * Return the value for regexp hash based on its ID
+ * @param a
+ * @return
+ */
+guint32 rspamd_regexp_hash (gconstpointer a);
+
+/**
+ * Compare two regexp objects based on theirs ID
+ * @param a
+ * @param b
+ * @return
+ */
+gboolean rspamd_regexp_equal (gconstpointer a, gconstpointer b);
+
 /**
  * Initialize superglobal regexp cache and library
  */