|
| 1 | +From 1ee031bc7531a4ab28609c70219304272d3f6aa5 Mon Sep 17 00:00:00 2001 |
| 2 | +From: Takashi Yano < [email protected]> |
| 3 | +Date: Tue, 21 Jan 2025 12:15:34 +0900 |
| 4 | +Subject: [PATCH 1002/1003] Cygwin: cygwait: Make cygwait() reentrant |
| 5 | + |
| 6 | +To allow cygwait() to be called in the signal handler, a locally |
| 7 | +created timer is used instead of _cygtls::locals.cw_timer if it is |
| 8 | +in use. |
| 9 | + |
| 10 | +Co-Authored-By: Corinna Vinschen < [email protected]> |
| 11 | +Signed-off-by: Takashi Yano < [email protected]> |
| 12 | +--- |
| 13 | + winsup/cygwin/cygtls.cc | 2 ++ |
| 14 | + winsup/cygwin/cygwait.cc | 22 +++++++++++++++------- |
| 15 | + winsup/cygwin/local_includes/cygtls.h | 3 ++- |
| 16 | + winsup/cygwin/select.cc | 10 +++++++++- |
| 17 | + 4 files changed, 28 insertions(+), 9 deletions(-) |
| 18 | + |
| 19 | +diff --git a/winsup/cygwin/cygtls.cc b/winsup/cygwin/cygtls.cc |
| 20 | +index afaee8e977..b8b5a01498 100644 |
| 21 | +--- a/winsup/cygwin/cygtls.cc |
| 22 | ++++ b/winsup/cygwin/cygtls.cc |
| 23 | +@@ -64,6 +64,7 @@ _cygtls::init_thread (void *x, DWORD (*func) (void *, void *)) |
| 24 | + initialized = CYGTLS_INITIALIZED; |
| 25 | + errno_addr = &(local_clib._errno); |
| 26 | + locals.cw_timer = NULL; |
| 27 | ++ locals.cw_timer_inuse = false; |
| 28 | + locals.pathbufs.clear (); |
| 29 | + |
| 30 | + if ((void *) func == (void *) cygthread::stub |
| 31 | +@@ -85,6 +86,7 @@ _cygtls::fixup_after_fork () |
| 32 | + signal_arrived = NULL; |
| 33 | + locals.select.sockevt = NULL; |
| 34 | + locals.cw_timer = NULL; |
| 35 | ++ locals.cw_timer_inuse = false; |
| 36 | + locals.pathbufs.clear (); |
| 37 | + wq.thread_ev = NULL; |
| 38 | + } |
| 39 | +diff --git a/winsup/cygwin/cygwait.cc b/winsup/cygwin/cygwait.cc |
| 40 | +index dbbe1db6e1..bb653f6b7c 100644 |
| 41 | +--- a/winsup/cygwin/cygwait.cc |
| 42 | ++++ b/winsup/cygwin/cygwait.cc |
| 43 | +@@ -58,16 +58,20 @@ cygwait (HANDLE object, PLARGE_INTEGER timeout, unsigned mask) |
| 44 | + } |
| 45 | + |
| 46 | + DWORD timeout_n; |
| 47 | ++ HANDLE local_timer = NULL; |
| 48 | ++ HANDLE &wait_timer = |
| 49 | ++ _my_tls.locals.cw_timer_inuse ? local_timer : _my_tls.locals.cw_timer; |
| 50 | + if (!timeout) |
| 51 | + timeout_n = WAIT_TIMEOUT + 1; |
| 52 | + else |
| 53 | + { |
| 54 | ++ if (!_my_tls.locals.cw_timer_inuse) |
| 55 | ++ _my_tls.locals.cw_timer_inuse = true; |
| 56 | + timeout_n = WAIT_OBJECT_0 + num++; |
| 57 | +- if (!_my_tls.locals.cw_timer) |
| 58 | +- NtCreateTimer (&_my_tls.locals.cw_timer, TIMER_ALL_ACCESS, NULL, |
| 59 | +- NotificationTimer); |
| 60 | +- NtSetTimer (_my_tls.locals.cw_timer, timeout, NULL, NULL, FALSE, 0, NULL); |
| 61 | +- wait_objects[timeout_n] = _my_tls.locals.cw_timer; |
| 62 | ++ if (!wait_timer) |
| 63 | ++ NtCreateTimer (&wait_timer, TIMER_ALL_ACCESS, NULL, NotificationTimer); |
| 64 | ++ NtSetTimer (wait_timer, timeout, NULL, NULL, FALSE, 0, NULL); |
| 65 | ++ wait_objects[timeout_n] = wait_timer; |
| 66 | + } |
| 67 | + |
| 68 | + while (1) |
| 69 | +@@ -100,7 +104,7 @@ cygwait (HANDLE object, PLARGE_INTEGER timeout, unsigned mask) |
| 70 | + { |
| 71 | + TIMER_BASIC_INFORMATION tbi; |
| 72 | + |
| 73 | +- NtQueryTimer (_my_tls.locals.cw_timer, TimerBasicInformation, &tbi, |
| 74 | ++ NtQueryTimer (wait_timer, TimerBasicInformation, &tbi, |
| 75 | + sizeof tbi, NULL); |
| 76 | + /* if timer expired, TimeRemaining is negative and represents the |
| 77 | + system uptime when signalled */ |
| 78 | +@@ -108,7 +112,11 @@ cygwait (HANDLE object, PLARGE_INTEGER timeout, unsigned mask) |
| 79 | + timeout->QuadPart = tbi.SignalState || tbi.TimeRemaining.QuadPart < 0LL |
| 80 | + ? 0LL : tbi.TimeRemaining.QuadPart; |
| 81 | + } |
| 82 | +- NtCancelTimer (_my_tls.locals.cw_timer, NULL); |
| 83 | ++ NtCancelTimer (wait_timer, NULL); |
| 84 | ++ if (local_timer) |
| 85 | ++ NtClose(local_timer); |
| 86 | ++ else |
| 87 | ++ _my_tls.locals.cw_timer_inuse = false; |
| 88 | + } |
| 89 | + |
| 90 | + if (res == WAIT_CANCELED && is_cw_cancel_self) |
| 91 | +diff --git a/winsup/cygwin/local_includes/cygtls.h b/winsup/cygwin/local_includes/cygtls.h |
| 92 | +index e4e3889aff..4bd79c36d7 100644 |
| 93 | +--- a/winsup/cygwin/local_includes/cygtls.h |
| 94 | ++++ b/winsup/cygwin/local_includes/cygtls.h |
| 95 | +@@ -135,6 +135,7 @@ struct _local_storage |
| 96 | + |
| 97 | + /* thread.cc */ |
| 98 | + HANDLE cw_timer; |
| 99 | ++ bool cw_timer_inuse; |
| 100 | + |
| 101 | + tls_pathbuf pathbufs; |
| 102 | + char ttybuf[32]; |
| 103 | +@@ -180,7 +181,7 @@ public: /* Do NOT remove this public: line, it's a marker for gentls_offsets. */ |
| 104 | + siginfo_t *sigwait_info; |
| 105 | + HANDLE signal_arrived; |
| 106 | + bool will_wait_for_signal; |
| 107 | +-#if 0 |
| 108 | ++#if 1 |
| 109 | + long __align; /* Needed to align context to 16 byte. */ |
| 110 | + #endif |
| 111 | + /* context MUST be aligned to 16 byte, otherwise RtlCaptureContext fails. |
| 112 | +diff --git a/winsup/cygwin/select.cc b/winsup/cygwin/select.cc |
| 113 | +index bc02c3f9d4..48e811e2a1 100644 |
| 114 | +--- a/winsup/cygwin/select.cc |
| 115 | ++++ b/winsup/cygwin/select.cc |
| 116 | +@@ -385,10 +385,14 @@ next_while:; |
| 117 | + to create the timer once per thread. Since WFMO checks the handles |
| 118 | + in order, we append the timer as last object, otherwise it's preferred |
| 119 | + over actual events on the descriptors. */ |
| 120 | +- HANDLE &wait_timer = _my_tls.locals.cw_timer; |
| 121 | ++ HANDLE local_timer = NULL; |
| 122 | ++ HANDLE &wait_timer = |
| 123 | ++ _my_tls.locals.cw_timer_inuse ? local_timer : _my_tls.locals.cw_timer; |
| 124 | + if (us > 0LL) |
| 125 | + { |
| 126 | + NTSTATUS status; |
| 127 | ++ if (!_my_tls.locals.cw_timer_inuse) |
| 128 | ++ _my_tls.locals.cw_timer_inuse = true; |
| 129 | + if (!wait_timer) |
| 130 | + { |
| 131 | + status = NtCreateTimer (&wait_timer, TIMER_ALL_ACCESS, NULL, |
| 132 | +@@ -431,6 +435,10 @@ next_while:; |
| 133 | + { |
| 134 | + BOOLEAN current_state; |
| 135 | + NtCancelTimer (wait_timer, ¤t_state); |
| 136 | ++ if (local_timer) |
| 137 | ++ NtClose (local_timer); |
| 138 | ++ else |
| 139 | ++ _my_tls.locals.cw_timer_inuse = false; |
| 140 | + } |
| 141 | + |
| 142 | + wait_states res; |
| 143 | +-- |
| 144 | +2.47.1.windows.2 |
| 145 | + |
0 commit comments