mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-06 23:27:04 +02:00
Code Issues Projects Releases Wiki Activity

CLEANUP: pollers: remove dead code in the polling loop

Browse Source 
As reported by Ilya and Coverity in issue #1858, since recent commit
eea152ee6 ("BUG/MINOR: signals/poller: ensure wakeup from signals")
which removed the test for the global signal flag from the pollers'
loop, the remaining "wake" flag doesn't need to be tested since it
already participates to zeroing the wait_time and will be caught
on the previous line.

Let's just remove that test now.
This commit is contained in:
Willy Tarreau 2022-09-12 09:35:44 +02:00
parent 62bde43779
commit af985e0151
3 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ev_epoll.c
View File

@ -238,8 +238,6 @@ static void _do_poll(struct poller *p, int exp, int wake)
} }
if (timeout || !wait_time) if (timeout || !wait_time)
break; break;
if (wake)
break;
if (tick_isset(exp) && tick_is_expired(exp, now_ms)) if (tick_isset(exp) && tick_is_expired(exp, now_ms))
break; break;
} while (1); } while (1);

2
src/ev_evports.c
View File

@ -217,8 +217,6 @@ static void _do_poll(struct poller *p, int exp, int wake)
break; break;
if (timeout || !wait_time) if (timeout || !wait_time)
break; break;
if (wake)
break;
if (tick_isset(exp) && tick_is_expired(exp, now_ms)) if (tick_isset(exp) && tick_is_expired(exp, now_ms))
break; break;
} while(1); } while(1);

2
src/ev_kqueue.c
View File

@ -191,8 +191,6 @@ static void _do_poll(struct poller *p, int exp, int wake)
} }
if (timeout || !wait_time) if (timeout || !wait_time)
break; break;
if (wake)
break;
if (tick_isset(exp) && tick_is_expired(exp, now_ms)) if (tick_isset(exp) && tick_is_expired(exp, now_ms))
break; break;
} while (1); } while (1);