cuberite/libevent
1
0
Fork 0
mirror of https://github.com/cuberite/libevent.git synced 2025-09-08 11:53:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

provide maintainer mode in automake; put event_gotsig back into global

Browse Source 
state; return proper error code


svn:r131
This commit is contained in:
Niels Provos 2005-02-22 15:47:53 +00:00
parent 42b9795867
commit 905ee67d00
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.in
View File

@ -2,7 +2,7 @@ dnl configure.in for libevent
dnl Dug Song <dugsong@monkey.org>
AC_INIT(event.c)
AM_INIT_AUTOMAKE(libevent,1.0)
AM_INIT_AUTOMAKE(libevent,1.0b)
AM_CONFIG_HEADER(config.h)
AM_MAINTAINER_MODE

3
event-internal.h
View File

@ -37,9 +37,6 @@ struct event_base {
int event_count; /* counts number of total events */
int event_count_active; /* counts number of active events */
/* Handle signals - This is a deprecated interface */
int (*event_sigcb)(void); /* Signal callback when gotsig is set */
int event_gotsig; /* Set in signal handler */
int event_gotterm; /* Set to terminate loop */
/* active event management */

19
event.c
View File

@ -115,6 +115,10 @@ struct event_list signalqueue;
struct event_base *current_base = NULL;
/* Handle signals - This is a deprecated interface */
int (*event_sigcb)(void); /* Signal callback when gotsig is set */
int event_gotsig; /* Set in signal handler */
/* Prototypes */
static void event_queue_insert(struct event_base *, struct event *, int);
static void event_queue_remove(struct event_base *, struct event *, int);
@ -153,8 +157,8 @@ event_init(void)
if ((current_base = calloc(1, sizeof(struct event_base))) == NULL)
err(1, "%s: calloc");
current_base->event_sigcb = NULL;
current_base->event_gotsig = 0;
event_sigcb = NULL;
event_gotsig = 0;
gettimeofday(&current_base->event_tv, NULL);
#if defined(USE_LOG) && defined(USE_DEBUG)
@ -328,10 +332,11 @@ event_base_loop(struct event_base *base, int flags)
break;
}
while (base->event_gotsig) {
base->event_gotsig = 0;
if (base->event_sigcb) {
res = (*base->event_sigcb)();
/* You cannot use this interface for multi-threaded apps */
while (event_gotsig) {
event_gotsig = 0;
if (event_sigcb) {
res = (*event_sigcb)();
if (res == -1) {
errno = EINTR;
return (-1);
@ -600,7 +605,7 @@ event_del(struct event *ev)
/* An event without a base has not been added */
if (ev->ev_base == NULL)
return;
return (-1);
base = ev->ev_base;
evsel = base->evsel;