diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2015-06-19 16:05:05 +0100 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2015-06-19 16:05:05 +0100 |
| commit | 928c509a55d571b012559a96a02457cc989705da (patch) | |
| tree | 50d574fbc7580b88fabd36004d08a0f476455e82 /src | |
| parent | 45c538da92ef6482a6e276be8064321c0636aff4 (diff) | |
| download | rspamd-928c509a55d571b012559a96a02457cc989705da.tar.gz rspamd-928c509a55d571b012559a96a02457cc989705da.zip | |
Fix mmaped files deinitialization.
Diffstat (limited to 'src')
| -rw-r--r-- | src/libstat/backends/mmaped_file.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/libstat/backends/mmaped_file.c b/src/libstat/backends/mmaped_file.c index b4d60ad0d..20bce6212 100644 --- a/src/libstat/backends/mmaped_file.c +++ b/src/libstat/backends/mmaped_file.c @@ -657,8 +657,6 @@ rspamd_mmaped_file_close_file (rspamd_mmaped_file_ctx * pool, close (file->fd); } - g_hash_table_remove (pool->files, file->cf); - g_slice_free1 (sizeof (*file), file); return 0; @@ -809,6 +807,7 @@ rspamd_mmaped_file_init (struct rspamd_stat_ctx *ctx, struct rspamd_config *cfg) gsize size; new = rspamd_mempool_alloc0 (cfg->cfg_pool, sizeof (rspamd_mmaped_file_ctx)); + new->pool = rspamd_mempool_new (rspamd_mempool_suggest_size ()); new->lock = rspamd_mempool_get_mutex (new->pool); new->mlock_ok = cfg->mlock_statfile_pool; new->files = g_hash_table_new (g_direct_hash, g_direct_equal); @@ -886,8 +885,7 @@ rspamd_mmaped_file_close (gpointer p) g_hash_table_unref (ctx->files); rspamd_mempool_unlock_mutex (ctx->lock); - - rspamd_mempool_delete (ctx->pool); + /* XXX: we don't delete pool here to avoid deadlocks */ } gpointer |