CLEANUP: task: remove thread_mask from the struct task

It was not used anymore since everything moved to ->tid, so let's
remove it.

diff --git a/include/haproxy/task-t.h b/include/haproxy/task-t.h
index ec6aa133345bcc183511d35a703dbe3c76ef5f12..9d74fd91a18e173c3eabce20dd14de5da05865d0 100644 (file)
--- a/include/haproxy/task-t.h
+++ b/include/haproxy/task-t.h
@@ -113,7 +113,6 @@ struct task {
        int expire;                     /* next expiration date for this task, in ticks */
        short nice;                     /* task prio from -1024 to +1024 */
        short tid;                      /* TID where it's allowed to run, <0 if anywhere */
-       unsigned long thread_mask;      /* mask of thread IDs authorized to process the task */
        uint64_t call_date;             /* date of the last task wakeup or call */
        uint64_t lat_time;              /* total latency time experienced */
        uint64_t cpu_time;              /* total CPU time consumed */

diff --git a/include/haproxy/task.h b/include/haproxy/task.h
index 66add67a9cce1e73a66ac628565a8fe2bdf26f9b..2d537d81bd3d044fd07de4ce1e1500b66d30b6c0 100644 (file)
--- a/include/haproxy/task.h
+++ b/include/haproxy/task.h
@@ -342,12 +342,10 @@ static inline void task_set_affinity(struct task *t, unsigned long thread_mask)
 
        if (unlikely(task_in_wq(t))) {
                task_unlink_wq(t);
-               t->thread_mask = thread_mask;
                t->tid = thr;
                task_queue(t);
        }
        else {
-               t->thread_mask = thread_mask;
                t->tid = thr;
        }
 }
@@ -545,7 +543,6 @@ static inline struct task *task_init(struct task *t, unsigned long thread_mask)
        t->wq.node.leaf_p = NULL;
        t->rq.node.leaf_p = NULL;
        t->state = TASK_SLEEPING;
-       t->thread_mask = thread_mask;
        if (atleast2(thread_mask)) {
                t->state |= TASK_SHARED_WQ;
                t->tid = -1;

diff --git a/src/hlua.c b/src/hlua.c
index 29843f4e7f2f209cb7c390266a77618e33c7de86..b5465e8b8ee120e4c0d03948899dc94bb1ea3248 100644 (file)
--- a/src/hlua.c
+++ b/src/hlua.c
@@ -8462,9 +8462,6 @@ struct task *hlua_process_task(struct task *task, void *context, unsigned int st
        struct hlua *hlua = context;
        enum hlua_exec status;
 
-       if (atleast2(task->thread_mask))
-               task_set_affinity(task, tid_bit);
-
        if (task->tid < 0)
                task->tid = tid;
 

diff --git a/src/stream.c b/src/stream.c
index 867cba8a59d0ac1ce32dfac46b603b5ffd101417..e90ac352548bc699a21a25fb8511074c82367731 100644 (file)
--- a/src/stream.c
+++ b/src/stream.c
@@ -3284,7 +3284,7 @@ static int stats_dump_full_strm_to_buffer(struct stconn *sc, struct stream *strm
                }
 
                chunk_appendf(&trash,
-                            "  task=%p (state=0x%02x nice=%d calls=%u rate=%u exp=%s tid=%d tmask=0x%lx%s",
+                            "  task=%p (state=0x%02x nice=%d calls=%u rate=%u exp=%s tid=%d%s",
                             strm->task,
                             strm->task->state,
                             strm->task->nice, strm->task->calls, read_freq_ctr(&strm->call_rate),
@@ -3293,7 +3293,6 @@ static int stats_dump_full_strm_to_buffer(struct stconn *sc, struct stream *strm
                                             human_time(TICKS_TO_MS(strm->task->expire - now_ms),
                                             TICKS_TO_MS(1000)) : "<NEVER>",
                             strm->task->tid,
-                            strm->task->thread_mask,
                             task_in_rq(strm->task) ? ", running" : "");
 
                chunk_appendf(&trash,
@@ -3335,14 +3334,13 @@ static int stats_dump_full_strm_to_buffer(struct stconn *sc, struct stream *strm
                }
                else if ((tmpctx = sc_appctx(scf)) != NULL) {
                        chunk_appendf(&trash,
-                                     "      app0=%p st0=%d st1=%d st2=%d applet=%s tid=%d tmask=0x%lx nice=%d calls=%u rate=%u cpu=%llu lat=%llu\n",
+                                     "      app0=%p st0=%d st1=%d st2=%d applet=%s tid=%d nice=%d calls=%u rate=%u cpu=%llu lat=%llu\n",
                                      tmpctx,
                                      tmpctx->st0,
                                      tmpctx->st1,
                                      tmpctx->_st2,
                                      tmpctx->applet->name,
                                      tmpctx->t->tid,
-                                     tmpctx->t->thread_mask,
                                      tmpctx->t->nice, tmpctx->t->calls, read_freq_ctr(&tmpctx->call_rate),
                                      (unsigned long long)tmpctx->t->cpu_time, (unsigned long long)tmpctx->t->lat_time);
                }
@@ -3375,14 +3373,13 @@ static int stats_dump_full_strm_to_buffer(struct stconn *sc, struct stream *strm
                }
                else if ((tmpctx = sc_appctx(scb)) != NULL) {
                        chunk_appendf(&trash,
-                                     "      app1=%p st0=%d st1=%d st2=%d applet=%s tid=%d tmask=0x%lx nice=%d calls=%u rate=%u cpu=%llu lat=%llu\n",
+                                     "      app1=%p st0=%d st1=%d st2=%d applet=%s tid=%d nice=%d calls=%u rate=%u cpu=%llu lat=%llu\n",
                                      tmpctx,
                                      tmpctx->st0,
                                      tmpctx->st1,
                                      tmpctx->_st2,
                                      tmpctx->applet->name,
                                      tmpctx->t->tid,
-                                     tmpctx->t->thread_mask,
                                      tmpctx->t->nice, tmpctx->t->calls, read_freq_ctr(&tmpctx->call_rate),
                                      (unsigned long long)tmpctx->t->cpu_time, (unsigned long long)tmpctx->t->lat_time);
                }