From e00381f4655492dfcd8bb8c12065eb62229b20c1 Mon Sep 17 00:00:00 2001 From: oetiker Date: Tue, 14 Jul 2009 12:00:49 +0000 Subject: [PATCH] Handle race condition for "UPDATE" with new files. Problem found by Sebastian Harl. Patch by Kevin. git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk/program@1872 a5681a0c-68f1-0310-ab6d-d61299d08faa --- src/rrd_daemon.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/rrd_daemon.c b/src/rrd_daemon.c index 17ec97e..8b1fc9e 100644 --- a/src/rrd_daemon.c +++ b/src/rrd_daemon.c @@ -1314,6 +1314,7 @@ static int handle_request_update (HANDLER_PROTO) /* {{{ */ if (ci == NULL) /* {{{ */ { struct stat statbuf; + cache_item_t *tmp; /* don't hold the lock while we setup; stat(2) might block */ pthread_mutex_unlock(&cache_lock); @@ -1361,7 +1362,16 @@ static int handle_request_update (HANDLER_PROTO) /* {{{ */ pthread_cond_init(&ci->flushed, NULL); pthread_mutex_lock(&cache_lock); - g_tree_replace (cache_tree, (void *) ci->file, (void *) ci); + + /* another UPDATE might have added this entry in the meantime */ + tmp = g_tree_lookup (cache_tree, file); + if (tmp == NULL) + g_tree_replace (cache_tree, (void *) ci->file, (void *) ci); + else + { + free_cache_item (ci); + ci = tmp; + } } /* }}} */ assert (ci != NULL); -- 2.30.2