diff options
| author | Vsevolod Stakhov <vsevolod@rambler-co.ru> | 2012-02-13 21:51:10 +0400 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@rambler-co.ru> | 2012-02-13 21:51:10 +0400 |
| commit | a5b48a05a94d178c342bbad69a330addb518d148 (patch) | |
| tree | ee7ab452cd4a98fdb7503e78cc52a3d4f66dd27e /src/filter.c | |
| parent | 0d64c808b7310b6e233ec570649fbb281a3f2b13 (diff) | |
| download | rspamd-a5b48a05a94d178c342bbad69a330addb518d148.tar.gz rspamd-a5b48a05a94d178c342bbad69a330addb518d148.zip | |
* More things to be thread-safe:
- pool allocator is now thread-safe
- lua subsystem now holds lock to avoid lua stack corruption
- events subsystem now using conditional variables to wait for async_threads
- insert_result is thread-safe now
Diffstat (limited to 'src/filter.c')
| -rw-r--r-- | src/filter.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/src/filter.c b/src/filter.c index cf8a63d0d..bca6d17d4 100644 --- a/src/filter.c +++ b/src/filter.c @@ -140,6 +140,12 @@ insert_metric_result (struct worker_task *task, struct metric *metric, const gch } +#if ((GLIB_MAJOR_VERSION == 2) && (GLIB_MINOR_VERSION <= 30)) +static GStaticMutex result_mtx = G_STATIC_MUTEX_INIT; +#else +G_LOCK_DEFINE (result_mtx); +#endif + static void insert_result_common (struct worker_task *task, const gchar *symbol, double flag, GList * opts, gboolean single) { @@ -147,6 +153,12 @@ insert_result_common (struct worker_task *task, const gchar *symbol, double flag struct cache_item *item; GList *cur, *metric_list; + /* Avoid concurrenting inserting of results */ +#if ((GLIB_MAJOR_VERSION == 2) && (GLIB_MINOR_VERSION <= 30)) + g_static_mutex_lock (&result_mtx); +#else + G_LOCK (result_mtx); +#endif metric_list = g_hash_table_lookup (task->cfg->metrics_symbols, symbol); if (metric_list) { cur = metric_list; @@ -174,6 +186,11 @@ insert_result_common (struct worker_task *task, const gchar *symbol, double flag /* XXX: it is not wise to destroy them here */ g_list_free (opts); } +#if ((GLIB_MAJOR_VERSION == 2) && (GLIB_MINOR_VERSION <= 30)) + g_static_mutex_unlock (&result_mtx); +#else + G_UNLOCK (result_mtx); +#endif } /* Insert result that may be increased on next insertions */ |