projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
NEWS.stable: log cherry-pick [06c2675]->[1138b90] stdlib: support non-GCC __attribute__
[gnulib.git]
/
lib
/
fatal-signal.c
diff --git
a/lib/fatal-signal.c
b/lib/fatal-signal.c
index
eca46db
..
aca9027
100644
(file)
--- a/
lib/fatal-signal.c
+++ b/
lib/fatal-signal.c
@@
-1,5
+1,5
@@
/* Emergency actions in case of a fatal signal.
/* Emergency actions in case of a fatal signal.
- Copyright (C) 2003-2004, 2006-20
08
Free Software Foundation, Inc.
+ Copyright (C) 2003-2004, 2006-20
11
Free Software Foundation, Inc.
Written by Bruno Haible <bruno@clisp.org>, 2003.
This program is free software: you can redistribute it and/or modify
Written by Bruno Haible <bruno@clisp.org>, 2003.
This program is free software: you can redistribute it and/or modify
@@
-91,13
+91,13
@@
init_fatal_signals (void)
size_t i;
for (i = 0; i < num_fatal_signals; i++)
size_t i;
for (i = 0; i < num_fatal_signals; i++)
- {
- struct sigaction action;
+
{
+
struct sigaction action;
- if (sigaction (fatal_signals[i], NULL, &action) >= 0
- && get_handler (&action) == SIG_IGN)
- fatal_signals[i] = -1;
- }
+
if (sigaction (fatal_signals[i], NULL, &action) >= 0
+
&& get_handler (&action) == SIG_IGN)
+
fatal_signals[i] = -1;
+
}
fatal_signals_initialized = true;
}
fatal_signals_initialized = true;
}
@@
-125,19
+125,25
@@
static sig_atomic_t volatile actions_count = 0;
static size_t actions_allocated = SIZEOF (static_actions);
static size_t actions_allocated = SIZEOF (static_actions);
+/* The saved signal handlers.
+ Size 32 would not be sufficient: On HP-UX, SIGXCPU = 33, SIGXFSZ = 34. */
+static struct sigaction saved_sigactions[64];
+
+
/* Uninstall the handlers. */
static inline void
uninstall_handlers ()
{
size_t i;
/* Uninstall the handlers. */
static inline void
uninstall_handlers ()
{
size_t i;
- struct sigaction action;
- action.sa_handler = SIG_DFL;
- action.sa_flags = 0;
- sigemptyset (&action.sa_mask);
for (i = 0; i < num_fatal_signals; i++)
if (fatal_signals[i] >= 0)
for (i = 0; i < num_fatal_signals; i++)
if (fatal_signals[i] >= 0)
- sigaction (fatal_signals[i], &action, NULL);
+ {
+ int sig = fatal_signals[i];
+ if (saved_sigactions[sig].sa_handler == SIG_IGN)
+ saved_sigactions[sig].sa_handler = SIG_DFL;
+ sigaction (sig, &saved_sigactions[sig], NULL);
+ }
}
}
@@
-151,7
+157,7
@@
fatal_signal_handler (int sig)
action_t action;
size_t n = actions_count;
if (n == 0)
action_t action;
size_t n = actions_count;
if (n == 0)
- break;
+
break;
n--;
actions_count = n;
action = actions[n].action;
n--;
actions_count = n;
action = actions[n].action;
@@
-160,9
+166,10
@@
fatal_signal_handler (int sig)
}
/* Now execute the signal's default action.
}
/* Now execute the signal's default action.
- If any cleanup action blocks the signal that triggered the cleanup, the
- re-raised signal is delivered when this handler returns; otherwise it
- is delivered already during raise(). */
+ If the signal being delivered was blocked, the re-raised signal would be
+ delivered when this handler returns. But the way we install this handler,
+ no signal is blocked, and the re-raised signal is delivered already
+ during raise(). */
uninstall_handlers ();
raise (sig);
}
uninstall_handlers ();
raise (sig);
}
@@
-176,13
+183,20
@@
install_handlers ()
struct sigaction action;
action.sa_handler = &fatal_signal_handler;
struct sigaction action;
action.sa_handler = &fatal_signal_handler;
- /* One-shot handling - if we fault while handling a fault, the
- cleanup actions are intentionally cut short. */
- action.sa_flags = SA_NODEFER | SA_RESETHAND;
+ /* If we get a fatal signal while executing fatal_signal_handler, enter
+ fatal_signal_handler recursively, since it is reentrant. Hence no
+ SA_RESETHAND. */
+ action.sa_flags = SA_NODEFER;
sigemptyset (&action.sa_mask);
for (i = 0; i < num_fatal_signals; i++)
if (fatal_signals[i] >= 0)
sigemptyset (&action.sa_mask);
for (i = 0; i < num_fatal_signals; i++)
if (fatal_signals[i] >= 0)
- sigaction (fatal_signals[i], &action, NULL);
+ {
+ int sig = fatal_signals[i];
+
+ if (!(sig < sizeof (saved_sigactions) / sizeof (saved_sigactions[0])))
+ abort ();
+ sigaction (sig, &action, &saved_sigactions[sig]);
+ }
}
}
@@
-202,25
+216,25
@@
at_fatal_signal (action_t action)
if (actions_count == actions_allocated)
{
/* Extend the actions array. Note that we cannot use xrealloc(),
if (actions_count == actions_allocated)
{
/* Extend the actions array. Note that we cannot use xrealloc(),
- because then the cleanup() function could access an already
- deallocated array. */
+
because then the cleanup() function could access an already
+
deallocated array. */
actions_entry_t *old_actions = actions;
size_t old_actions_allocated = actions_allocated;
size_t new_actions_allocated = 2 * actions_allocated;
actions_entry_t *new_actions =
actions_entry_t *old_actions = actions;
size_t old_actions_allocated = actions_allocated;
size_t new_actions_allocated = 2 * actions_allocated;
actions_entry_t *new_actions =
- XNMALLOC (new_actions_allocated, actions_entry_t);
+
XNMALLOC (new_actions_allocated, actions_entry_t);
size_t k;
/* Don't use memcpy() here, because memcpy takes non-volatile arguments
size_t k;
/* Don't use memcpy() here, because memcpy takes non-volatile arguments
- and is therefore not guaranteed to complete all memory stores before
- the next statement. */
+
and is therefore not guaranteed to complete all memory stores before
+
the next statement. */
for (k = 0; k < old_actions_allocated; k++)
for (k = 0; k < old_actions_allocated; k++)
- new_actions[k] = old_actions[k];
+
new_actions[k] = old_actions[k];
actions = new_actions;
actions_allocated = new_actions_allocated;
/* Now we can free the old actions array. */
if (old_actions != static_actions)
actions = new_actions;
actions_allocated = new_actions_allocated;
/* Now we can free the old actions array. */
if (old_actions != static_actions)
- free (old_actions);
+
free (old_actions);
}
/* The two uses of 'volatile' in the types above (and ISO C 99 section
5.1.2.3.(5)) ensure that we increment the actions_count only after
}
/* The two uses of 'volatile' in the types above (and ISO C 99 section
5.1.2.3.(5)) ensure that we increment the actions_count only after
@@
-248,8
+262,8
@@
init_fatal_signal_set ()
sigemptyset (&fatal_signal_set);
for (i = 0; i < num_fatal_signals; i++)
sigemptyset (&fatal_signal_set);
for (i = 0; i < num_fatal_signals; i++)
- if (fatal_signals[i] >= 0)
- sigaddset (&fatal_signal_set, fatal_signals[i]);
+
if (fatal_signals[i] >= 0)
+
sigaddset (&fatal_signal_set, fatal_signals[i]);
fatal_signal_set_initialized = true;
}
fatal_signal_set_initialized = true;
}