commit d432fe8: [Test] Fix functional tests case

Vsevolod Stakhov vsevolod at highsecure.ru
Sat Jun 22 12:14:50 UTC 2019


Author: Vsevolod Stakhov
Date: 2019-06-21 12:50:42 +0100
URL: https://github.com/rspamd/rspamd/commit/d432fe8292abdceea2bae0b4a07ea5256247f92d

[Test] Fix functional tests case

---
 src/libserver/task.c | 15 +++++++++++----
 src/libserver/task.h |  2 +-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/libserver/task.c b/src/libserver/task.c
index 3c92e05b9..04be61744 100644
--- a/src/libserver/task.c
+++ b/src/libserver/task.c
@@ -75,7 +75,7 @@ struct rspamd_task *
 rspamd_task_new (struct rspamd_worker *worker, struct rspamd_config *cfg,
 				 rspamd_mempool_t *pool,
 				 struct rspamd_lang_detector *lang_det,
-				 struct ev_loop *ev_base)
+				 struct ev_loop *event_loop)
 {
 	struct rspamd_task *new_task;
 
@@ -101,9 +101,16 @@ rspamd_task_new (struct rspamd_worker *worker, struct rspamd_config *cfg,
 		}
 	}
 
-	new_task->event_loop = ev_base;
-	new_task->task_timestamp = ev_time ();
-	new_task->time_virtual = ev_now (ev_base);
+	new_task->event_loop = event_loop;
+	if (event_loop) {
+		new_task->task_timestamp = ev_time ();
+		new_task->time_virtual = ev_now (event_loop);
+	}
+	else {
+		new_task->task_timestamp = ev_time ();
+		new_task->time_virtual = rspamd_get_virtual_ticks ();
+	}
+
 	new_task->time_real_finish = NAN;
 	new_task->time_virtual_finish = NAN;
 
diff --git a/src/libserver/task.h b/src/libserver/task.h
index 7b30f97cd..d581378b7 100644
--- a/src/libserver/task.h
+++ b/src/libserver/task.h
@@ -219,7 +219,7 @@ struct rspamd_task *rspamd_task_new (struct rspamd_worker *worker,
 									 struct rspamd_config *cfg,
 									 rspamd_mempool_t *pool,
 									 struct rspamd_lang_detector *lang_det,
-									 struct ev_loop *ev_base);
+									 struct ev_loop *event_loop);
 /**
  * Destroy task object and remove its IO dispatcher if it exists
  */


More information about the Commits mailing list