Use correct timeout

lucasart · web-flow · commit 83c508b065bd · 2021-07-10T08:33:05.000+08:00
Fixes #46
diff --git a/src/engine.c b/src/engine.c
@@ -214,13 +214,13 @@ static void engine_parse_cmd(const char *cmd, str_t *cwd, str_t *run, str_t **ar
         vec_push(*args, str_init_from(token));
 }
 
-Engine engine_init(Worker *w, const char *cmd, const char *name, const str_t *options) {
+Engine engine_init(Worker *w, const char *cmd, const char *name, const str_t *options,
+                   int64_t timeOut) {
     if (!*cmd)
         DIE("[%d] missing command to start engine.\n", w->id);
 
-    Engine e = {
-        .name = str_init_from_c(*name ? name : cmd) // default value
-    };
+    Engine e = {.name = str_init_from_c(*name ? name : cmd), // default value
+                .timeOut = timeOut};
 
     // Parse cmd into (cwd, run, args): we want to execute run from cwd with args.
     scope(str_destroy) str_t cwd = str_init(), run = str_init();
diff --git a/src/engine.h b/src/engine.h
@@ -45,7 +45,8 @@ typedef struct {
     int64_t time;
 } Info;
 
-Engine engine_init(Worker *w, const char *cmd, const char *name, const str_t *options);
+Engine engine_init(Worker *w, const char *cmd, const char *name, const str_t *options,
+                   int64_t timeOut);
 void engine_destroy(Worker *w, Engine *e);
 
 void engine_readln(const Worker *w, const Engine *e, str_t *line);
diff --git a/src/main.c b/src/main.c
@@ -95,13 +95,12 @@ static void *thread_start(void *arg) {
         for (int i = 0; i < 2; i++)
             if (job.ei[i] != ei[i]) {
                 ei[i] = job.ei[i];
-                engines[i].timeOut = eo[ei[i]].timeOut;
 
                 if (engines[i].in)
                     engine_destroy(w, &engines[i]);
 
-                engines[i] =
-                    engine_init(w, eo[ei[i]].cmd.buf, eo[ei[i]].name.buf, eo[ei[i]].options);
+                engines[i] = engine_init(w, eo[ei[i]].cmd.buf, eo[ei[i]].name.buf,
+                                         eo[ei[i]].options, eo[ei[i]].timeOut);
                 job_queue_set_name(&jq, ei[i], engines[i].name.buf);
             }
 
@@ -196,7 +195,7 @@ int main(int argc, const char **argv) {
         // are likely to face a completely unresponsive engine, where any attempt at I/O will block
         // the master thread, on top of the already blocked worker. Hence, we must DIE().
         for (int i = 0; i < options.concurrency; i++)
-            if (deadline_overdue(&Workers[i]) > 1000)
+            if (deadline_overdue(&Workers[i]))
                 DIE("[%d] engine %s is unresponsive\n", Workers[i].id,
                     Workers[i].deadline.engineName.buf);
     } while (!job_queue_done(&jq));
diff --git a/src/workers.c b/src/workers.c
@@ -47,20 +47,15 @@ void deadline_clear(Worker *w) {
     pthread_mutex_unlock(&w->deadline.mtx);
 }
 
-int64_t deadline_overdue(Worker *w) {
+bool deadline_overdue(Worker *w) {
     pthread_mutex_lock(&w->deadline.mtx);
 
     const int64_t timeLimit = w->deadline.timeLimit;
     const bool set = w->deadline.set;
 
     pthread_mutex_unlock(&w->deadline.mtx);
 
-    const int64_t time = system_msec();
-
-    if (set && time > timeLimit)
-        return time - timeLimit;
-    else
-        return 0;
+    return set && system_msec() > timeLimit;
 }
 
 Worker worker_init(int i, const char *logName) {
diff --git a/src/workers.h b/src/workers.h
@@ -42,7 +42,7 @@ void worker_destroy(Worker *w);
 
 void deadline_set(Worker *w, const char *engineName, int64_t timeLimit);
 void deadline_clear(Worker *w);
-int64_t deadline_overdue(Worker *w);
+bool deadline_overdue(Worker *w);
 
 void workers_busy_add(int n);
 int workers_busy_count(void);
