BUILD/MINOR: sched: drop the DEBUG_TASK parts from latest fix
authorWilly Tarreau <w@1wt.eu>
Tue, 1 Mar 2022 14:24:08 +0000 (15:24 +0100)
committerWilly Tarreau <w@1wt.eu>
Tue, 1 Mar 2022 14:29:14 +0000 (15:29 +0100)
Latest commit b21c85773 ("BUG/MAJOR: sched: prevent rare concurrent
wakeup of multi-threaded tasks") did include some DEBUG_TASK blocks
that are for 2.4 and above. They're normally not enabled in 2.3 but
if some users share the same build scripts this may inadvertently
be enabled and cause a build failure. Let's just drop this part.

There's no upstream commit ID since it's a fix for an incomplete backport.
Signed-off-by: Willy Tarreau <w@1wt.eu>

include/haproxy/task.h

index 6734027..572a9db 100644 (file)
@@ -247,13 +247,6 @@ static inline void _task_drop_running(struct task *t, unsigned int f, const char
 #else
                struct eb_root *root = &sched->rqueue;
 #endif
-#ifdef DEBUG_TASK
-               if ((unsigned int)t->debug.caller_idx > 1)
-                       ABORT_NOW();
-               t->debug.caller_idx = !t->debug.caller_idx;
-               t->debug.caller_file[t->debug.caller_idx] = file;
-               t->debug.caller_line[t->debug.caller_idx] = line;
-#endif
                __task_wakeup(t, root);
        }
 }