GitHub/libevent
1
0
Fork 0
mirror of https://github.com/libevent/libevent.git synced 2025-01-31 09:12:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

from trunk: debug cleanups in signal.c; from Christopher Layne

Browse Source 
svn:r528
This commit is contained in:
Niels Provos 2007-11-13 17:38:39 +00:00
parent 57fe6ed265
commit 40cd2ce3bb
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -1,5 +1,6 @@
Changes in current version:
o free minheap on event_base_free(); from Christopher Layne
o debug cleanups in signal.c; from Christopher Layne
Changes in 1.4.0-beta:
o allow \r or \n individually to separate HTTP headers instead of the standard "\r\n"; from Charles Kerr.

8
signal.c
View File

@ -141,7 +141,7 @@ evsignal_add(struct event *ev)
* a dynamic array is used to keep footprint on the low side.
*/
if (evsignal >= sig->sh_old_max) {
event_debug(("%s: evsignal > sh_old_max, resizing array",
event_debug(("%s: evsignal (%d) >= sh_old_max (%d), resizing",
__func__, evsignal, sig->sh_old_max));
sig->sh_old_max = evsignal + 1;
p = realloc(sig->sh_old, sig->sh_old_max * sizeof *sig->sh_old);
@ -159,21 +159,20 @@ evsignal_add(struct event *ev)
return (-1);
}
/* save previous handler and setup new handler */
event_debug(("%s: %p: changing signal handler", __func__, ev));
#ifdef HAVE_SIGACTION
/* setup new handler */
memset(&sa, 0, sizeof(sa));
sa.sa_handler = evsignal_handler;
sa.sa_flags |= SA_RESTART;
sigfillset(&sa.sa_mask);
/* save previous handler setup */
if (sigaction(evsignal, &sa, sig->sh_old[evsignal]) == -1) {
event_warn("sigaction");
free(sig->sh_old[evsignal]);
return (-1);
}
#else
/* save previous handler setup */
if ((sh = signal(evsignal, evsignal_handler)) == SIG_ERR) {
event_warn("signal");
free(sig->sh_old[evsignal]);
@ -207,6 +206,7 @@ evsignal_del(struct event *ev)
evsignal = EVENT_SIGNAL(ev);
/* restore previous handler */
event_debug(("%s: %p: restoring signal handler", __func__, ev));
sh = sig->sh_old[evsignal];
sig->sh_old[evsignal] = NULL;
#ifdef HAVE_SIGACTION