@@ -1,3 +1,10 @@

+Wed Nov 12 19:03:36 EET 2008 (edwin)

+------------------------------------

+ * clamd/thrmgr.c, unit_tests/check_clamav.c,

+ unit_tests/check_regex.c: update unit tests to new API.

+ Initialization order changed, make sure stats_tls_key is

+ initialized.

+

 Wed Nov 12 17:52:12 EET 2008 (edwin)

 ------------------------------------

  * contrib/clamdtop/TODO, contrib/clamdtop/clamdtop.c: refactor, minor fixes

@@ -433,7 +433,9 @@ static const char *IDLE_TASK = "IDLE";

 /* no mutex is needed, we are using  thread local variable */

 void thrmgr_setactivetask(const char *filename, const char* command)

 {

-	struct task_desc *desc = pthread_getspecific(stats_tls_key);

+	struct task_desc *desc;

+	pthread_once(&stats_tls_key_once, stats_tls_key_alloc);

+	desc = pthread_getspecific(stats_tls_key);

 	if(!desc)

 		return;

 	desc->filename = filename;

@@ -447,7 +449,9 @@ void thrmgr_setactivetask(const char *filename, const char* command)

 void thrmgr_setactiveengine(const struct cl_engine *engine)

 {

-	struct task_desc *desc = pthread_getspecific(stats_tls_key);

+	struct task_desc *desc;

+	pthread_once(&stats_tls_key_once, stats_tls_key_alloc);

+	desc = pthread_getspecific(stats_tls_key);

 	if(!desc)

 		return;

 	desc->engine = engine;

@@ -483,6 +487,7 @@ static void stats_destroy(threadpool_t *pool)

 	if(pool->tasks == desc)

 		pool->tasks = desc->nxt;

 	free(desc);

+	pthread_setspecific(stats_tls_key, NULL);

 }

 static void *thrmgr_worker(void *arg)

@@ -502,6 +507,7 @@ static void *thrmgr_worker(void *arg)

 			stats_init(threadpool);

 			stats_inited = TRUE;

 		}

+		thrmgr_setactiveengine(NULL);

 		thrmgr_setactivetask(NULL, IDLE_TASK);

 		timeout.tv_sec = time(NULL) + threadpool->idle_timeout;

 		timeout.tv_nsec = 0;

@@ -404,7 +404,7 @@ void dconf_teardown(void)

 }

-int main(int argc, char **argv)

+int main(void)

 {

     int nf;

     Suite *s = test_cl_suite();

@@ -281,10 +281,11 @@ static void psetup_impl(int load2)

 {

 	FILE *f;

 	int rc;

-	rc = cli_initengine(&engine, CL_DB_STDOPT);

-	fail_unless(rc == 0, "cl_initengine");

+	engine = cl_engine_new(CL_DB_STDOPT);

+	fail_unless(!!engine , "cl_engine_new");

-	fail_unless(!!engine->phishcheck, "engine->phishcheck");

+	phishing_init(engine);

+	fail_unless(!!engine->phishcheck, "phishing_init");

 	rc = init_domainlist(engine);

 	fail_unless(rc == 0,"init_domainlist");

@@ -338,7 +339,7 @@ static void psetup2(void)

 static void pteardown(void)

 {

 	if(engine) {

-		cl_free(engine);

+		cl_engine_free(engine);

 	}

 	engine = NULL;

 }