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

Avoid calling exit() during event_base_new*()

Browse Source 
Previously, each of the three make-an-event-base functions would exit
under different, weird circumstances, but return NULL on others.
  - All three would exit on OOM sometimes.
  - event_base_new() and event_init() would die	if all backends	were
    disabled.
  - None of them would die if the socketpair() call failed.

Now, only event_init() exits on failure, and it exits on every kind of
failure.  event_base_new() and event_base_new_with_config() never do.

svn:r1472
This commit is contained in:
Nick Mathewson 2009-10-27 06:47:25 +00:00
parent a2a7d1d123
commit 904b5721cb
3 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -35,6 +35,7 @@ Changes in 2.0.3-alpha:
o Add an API to replace all fatal calls to exit() with a user-provided panic function. o Add an API to replace all fatal calls to exit() with a user-provided panic function.
o Replace all assert() calls with a variant that is aware of the user-provided logging and panic functions. o Replace all assert() calls with a variant that is aware of the user-provided logging and panic functions.
o Add a return value to event_assign so that it can fail rather than asserting when the user gives it bad input. event_set still dies on bad input. o Add a return value to event_assign so that it can fail rather than asserting when the user gives it bad input. event_set still dies on bad input.
o The event_base_new() and event_base_new_with_config() functions now never call exit() on failure. For backward "compatibility", event_init() still does, but more consistently.
Changes in 2.0.2-alpha: Changes in 2.0.2-alpha:

33
event.c
View File

@ -189,10 +189,12 @@ gettime(struct event_base *base, struct timeval *tp)
struct event_base * struct event_base *
event_init(void) event_init(void)
{ {
struct event_base *base = event_base_new(); struct event_base *base = event_base_new_with_config(NULL);
if (base != NULL) if (base == NULL)
current_base = base; event_errx(1, "%s: Unable to construct event_base", __func__);
current_base = base;
return (base); return (base);
} }
@ -200,7 +202,13 @@ event_init(void)
struct event_base * struct event_base *
event_base_new(void) event_base_new(void)
{ {
return (event_base_new_with_config(NULL)); struct event_base *base = NULL;
struct event_config *cfg = event_config_new();
if (cfg) {
base = event_base_new_with_config(cfg);
event_config_free(cfg);
}
return base;
} }
static int static int
@ -263,8 +271,10 @@ event_base_new_with_config(struct event_config *cfg)
struct event_base *base; struct event_base *base;
int should_check_environment; int should_check_environment;
if ((base = mm_calloc(1, sizeof(struct event_base))) == NULL) if ((base = mm_calloc(1, sizeof(struct event_base))) == NULL) {
event_err(1, "%s: calloc", __func__); event_warn("%s: calloc", __func__);
return NULL;
}
detect_monotonic(); detect_monotonic();
gettime(base, &base->event_tv); gettime(base, &base->event_tv);
@ -308,13 +318,10 @@ event_base_new_with_config(struct event_config *cfg)
} }
if (base->evbase == NULL) { if (base->evbase == NULL) {
if (cfg == NULL) event_warnx("%s: no event mechanism available",
event_errx(1, "%s: no event mechanism available", __func__);
__func__); event_base_free(base);
else { return NULL;
event_base_free(base);
return NULL;
}
} }
if (getenv("EVENT_SHOW_METHOD")) if (getenv("EVENT_SHOW_METHOD"))

2
test/regress.c
View File

@ -1789,7 +1789,7 @@ struct testcase_t main_testcases[] = {
/* Some converted-over tests */ /* Some converted-over tests */
{ "methods", test_methods, TT_FORK, NULL, NULL }, { "methods", test_methods, TT_FORK, NULL, NULL },
{ "version", test_version, 0, NULL, NULL }, { "version", test_version, 0, NULL, NULL },
{ "base_features", test_base_features, TT_FORK, NULL, NULL }, BASIC(base_features, TT_FORK|TT_NO_LOGS),
{ "base_environ", test_base_environ, TT_FORK, NULL, NULL }, { "base_environ", test_base_environ, TT_FORK, NULL, NULL },
BASIC(event_base_new, TT_FORK|TT_NEED_SOCKETPAIR), BASIC(event_base_new, TT_FORK|TT_NEED_SOCKETPAIR),