summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
f127354)
As a further preparation for employing the standard paraslash scheduler
within para_gui, this simple patch introduces signal_pre_select()
and renames handle_signal() to signal_post_select().
The signal related part of do_select() is moved to these two functions
so that do_select() is reduced to the bare minimum: one call to each
of the two new functions.
/*
* React to various signal-related events
*/
/*
* React to various signal-related events
*/
-static void handle_signal(int sig)
+static void signal_post_select(fd_set *rfds)
+ int ret = para_next_signal(rfds);
+ if (ret <= 0)
+ return;
+ switch (ret) {
case SIGTERM:
die(EXIT_FAILURE, "only the good die young (caught SIGTERM)\n");
return;
case SIGTERM:
die(EXIT_FAILURE, "only the good die young (caught SIGTERM)\n");
return;
+static void signal_pre_select(fd_set *rfds, int *max_fileno)
+{
+ para_fd_set(signal_pipe, rfds, max_fileno);
+}
+
/*
* This is the core select loop. Besides the (internal) signal
* pipe, the following other fds are checked according to the mode:
/*
* This is the core select loop. Besides the (internal) signal
* pipe, the following other fds are checked according to the mode:
FD_ZERO(&rfds);
max_fileno = 0;
status_pre_select(&rfds, &max_fileno, &tv);
FD_ZERO(&rfds);
max_fileno = 0;
status_pre_select(&rfds, &max_fileno, &tv);
- /* signal pipe */
- para_fd_set(signal_pipe, &rfds, &max_fileno);
+ signal_pre_select(&rfds, &max_fileno);
command_pre_select(mode, &rfds, &max_fileno);
input_pre_select(mode, &rfds, &max_fileno);
ret = para_select(max_fileno + 1, &rfds, NULL, &tv);
if (ret <= 0)
goto check_return; /* skip fd checks */
command_pre_select(mode, &rfds, &max_fileno);
input_pre_select(mode, &rfds, &max_fileno);
ret = para_select(max_fileno + 1, &rfds, NULL, &tv);
if (ret <= 0)
goto check_return; /* skip fd checks */
- /* signals */
- ret = para_next_signal(&rfds);
- if (ret > 0)
- handle_signal(ret);
+ signal_post_select(&rfds);
/* read command pipe if ready */
ret = command_post_select(mode, &rfds);
if (ret < 0)
/* read command pipe if ready */
ret = command_post_select(mode, &rfds);
if (ret < 0)