moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-11-16 14:35:03 -05:00
Code Issues Releases Wiki Activity

tests/server/util.[ch]: add exit event to stop waiting on Windows

Browse Source 
This commit adds a global exit event to the test servers that
Windows-specific wait routines can use to get triggered if the
program was signaled to be terminated, eg. select_ws in sockfilt.c

The exit event will be managed by the signal handling code and is
set to not reset automatically to support multiple wait routines.

Reviewed-by: Jay Satiro
Closes #5260
This commit is contained in:
Marc Hoersken 2020-04-18 21:51:19 +02:00
parent 551577f357
commit 7dc8a981fa
No known key found for this signature in database
GPG Key ID: 61E03CBED7BC859E
2 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tests/server/util.c
View File

@ -580,6 +580,11 @@ volatile int got_exit_signal = 0;
/* if next is set indicates the first signal handled in exit_signal_handler */ /* if next is set indicates the first signal handled in exit_signal_handler */
volatile int exit_signal = 0; volatile int exit_signal = 0;
#ifdef WIN32
/* event which if set indicates that the program should finish */
HANDLE exit_event = NULL;
#endif
/* signal handler that will be triggered to indicate that the program /* signal handler that will be triggered to indicate that the program
* should finish its execution in a controlled manner as soon as possible. * should finish its execution in a controlled manner as soon as possible.
* The first time this is called it will set got_exit_signal to one and * The first time this is called it will set got_exit_signal to one and
@ -592,6 +597,10 @@ static RETSIGTYPE exit_signal_handler(int signum)
if(got_exit_signal == 0) { if(got_exit_signal == 0) {
got_exit_signal = 1; got_exit_signal = 1;
exit_signal = signum; exit_signal = signum;
#ifdef WIN32
if(exit_event)
(void)SetEvent(exit_event);
#endif
} }
(void)signal(signum, exit_signal_handler); (void)signal(signum, exit_signal_handler);
errno = old_errno; errno = old_errno;
@ -712,6 +721,12 @@ static DWORD WINAPI main_window_loop(LPVOID lpParameter)
void install_signal_handlers(bool keep_sigalrm) void install_signal_handlers(bool keep_sigalrm)
{ {
#ifdef WIN32
/* setup windows exit event before any signal can trigger */
exit_event = CreateEvent(NULL, TRUE, FALSE, NULL);
if(!exit_event)
logmsg("cannot create exit event");
#endif
#ifdef SIGHUP #ifdef SIGHUP
/* ignore SIGHUP signal */ /* ignore SIGHUP signal */
old_sighup_handler = signal(SIGHUP, SIG_IGN); old_sighup_handler = signal(SIGHUP, SIG_IGN);
@ -812,6 +827,10 @@ void restore_signal_handlers(bool keep_sigalrm)
} }
} }
} }
if(exit_event) {
if(CloseHandle(exit_event)) {
exit_event = NULL;
}
} }
#endif #endif
} }

5
tests/server/util.h
View File

@ -70,6 +70,11 @@ extern volatile int got_exit_signal;
/* global variable which if set indicates the first signal handled */ /* global variable which if set indicates the first signal handled */
extern volatile int exit_signal; extern volatile int exit_signal;
#ifdef WIN32
/* global event which if set indicates that the program should finish */
extern HANDLE exit_event;
#endif
void install_signal_handlers(bool keep_sigalrm); void install_signal_handlers(bool keep_sigalrm);
void restore_signal_handlers(bool keep_sigalrm); void restore_signal_handlers(bool keep_sigalrm);