libverto-commits September 2011

libverto-commits@lists.fedorahosted.org

1 participants
16 discussions

[libverto] add -Wdeclaration-after-statement and fix the warnings it generates
by Nathaniel McCallum 09 Sep '11

09 Sep '11

commit 8343d975097059073c2ea688f8aa7f7e7df01fc8 Author: Nathaniel McCallum <npmccallum(a)redhat.com> Date: Fri Sep 9 13:35:12 2011 -0400 add -Wdeclaration-after-statement and fix the warnings it generates src/Makefile.am | 10 +++++----- src/verto-glib.c | 2 +- src/verto.c | 45 +++++++++++++++++++++++++++++++-------------- 3 files changed, 37 insertions(+), 20 deletions(-) --- diff --git a/src/Makefile.am b/src/Makefile.am index 3a37fa7..0877ef8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,10 +1,10 @@ AM_LDFLAGS = -export-symbols-regex '^verto_' +AM_CFLAGS = -Wall -Wdeclaration-after-statement include_HEADERS = verto.h verto-module.h lib_LTLIBRARIES = libverto.la libverto_la_SOURCES = verto.c verto.h -libverto_la_CFLAGS = $(AM_CFLAGS) -Wall libverto_la_LDFLAGS = $(AM_LDFLAGS) $(dl_LIBS) # glib @@ -12,7 +12,7 @@ if WITH_GLIB lib_LTLIBRARIES += libverto-glib.la include_HEADERS += verto-glib.h libverto_glib_la_SOURCES = verto-glib.c -libverto_glib_la_CFLAGS = $(AM_CFLAGS) @glib_CFLAGS@ -Wall +libverto_glib_la_CFLAGS = $(AM_CFLAGS) @glib_CFLAGS@ libverto_glib_la_LDFLAGS = $(AM_LDFLAGS) @glib_LIBS@ libverto_glib_la_LIBADD = libverto.la endif @@ -22,7 +22,7 @@ if WITH_LIBEV lib_LTLIBRARIES += libverto-libev.la include_HEADERS += verto-libev.h libverto_libev_la_SOURCES = verto-libev.c -libverto_libev_la_CFLAGS = $(AM_CFLAGS) @libev_CFLAGS@ -Wall +libverto_libev_la_CFLAGS = $(AM_CFLAGS) @libev_CFLAGS@ libverto_libev_la_LDFLAGS = $(AM_LDFLAGS) @libev_LIBS@ libverto_libev_la_LIBADD = libverto.la endif @@ -32,7 +32,7 @@ if WITH_LIBEVENT lib_LTLIBRARIES += libverto-libevent.la include_HEADERS += verto-libevent.h libverto_libevent_la_SOURCES = verto-libevent.c -libverto_libevent_la_CFLAGS = $(AM_CFLAGS) @libevent_CFLAGS@ -Wall +libverto_libevent_la_CFLAGS = $(AM_CFLAGS) @libevent_CFLAGS@ libverto_libevent_la_LDFLAGS = $(AM_LDFLAGS) @libevent_LIBS@ libverto_libevent_la_LIBADD = libverto.la endif @@ -42,7 +42,7 @@ if WITH_TEVENT lib_LTLIBRARIES += libverto-tevent.la include_HEADERS += verto-tevent.h libverto_tevent_la_SOURCES = verto-tevent.c -libverto_tevent_la_CFLAGS = $(AM_CFLAGS) @tevent_CFLAGS@ -Wall +libverto_tevent_la_CFLAGS = $(AM_CFLAGS) @tevent_CFLAGS@ libverto_tevent_la_LDFLAGS = $(AM_LDFLAGS) @tevent_LIBS@ libverto_tevent_la_LIBADD = libverto.la endif diff --git a/src/verto-glib.c b/src/verto-glib.c index 2a00c44..d061c79 100644 --- a/src/verto-glib.c +++ b/src/verto-glib.c @@ -150,6 +150,7 @@ static void * glib_ctx_add(void *ctx, const verto_ev *ev, verto_ev_flag *flags) { glib_ev *gev = NULL; + GIOCondition cond = 0; verto_ev_type type = verto_get_type(ev); gev = g_new0(glib_ev, 1); @@ -167,7 +168,6 @@ glib_ctx_add(void *ctx, const verto_ev *ev, verto_ev_flag *flags) goto error; g_io_channel_set_close_on_unref(gev->chan, FALSE); - GIOCondition cond = 0; if (*flags & VERTO_EV_FLAG_IO_READ) cond |= G_IO_IN | G_IO_PRI | G_IO_ERR | G_IO_HUP | G_IO_NVAL; if (*flags & VERTO_EV_FLAG_IO_WRITE) diff --git a/src/verto.c b/src/verto.c index 82cafcf..98cc303 100644 --- a/src/verto.c +++ b/src/verto.c @@ -255,15 +255,22 @@ do_load_dir(const char *dirname, const char *prefix, const char *suffix, int reqsym, verto_ev_type reqtypes, pdlmtype *dll, const verto_module **module) { + DIR *dir; + struct dirent *ent = NULL; + *module = NULL; - DIR *dir = opendir(dirname); + dir = opendir(dirname); if (!dir) return 0; - struct dirent *ent = NULL; + while ((ent = readdir(dir))) { - size_t flen = strlen(ent->d_name); - size_t slen = strlen(suffix); + char *tmp = NULL; + int success; + size_t flen, slen; + + flen = strlen(ent->d_name); + slen = strlen(suffix); if (!strcmp(".", ent->d_name) || !strcmp("..", ent->d_name)) continue; @@ -272,11 +279,10 @@ do_load_dir(const char *dirname, const char *prefix, const char *suffix, if (flen < slen || strcmp(ent->d_name + flen - slen, suffix)) continue; - char *tmp = NULL; if (_asprintf(&tmp, "%s/%s", dirname, ent->d_name) < 0) continue; - int success = do_load_file(tmp, reqsym, reqtypes, dll, module); + success = do_load_file(tmp, reqsym, reqtypes, dll, module); free(tmp); if (success) break; @@ -395,10 +401,12 @@ make_ev(verto_ctx *ctx, verto_callback *callback, static void push_ev(verto_ctx *ctx, verto_ev *ev) { + verto_ev *tmp; + if (!ctx || !ev) return; - verto_ev *tmp = ctx->events; + tmp = ctx->events; ctx->events = ev; ctx->events->next = tmp; } @@ -572,8 +580,8 @@ verto_reinitialize(verto_ctx *ctx) } } -#define doadd(set, type) \ - verto_ev *ev = make_ev(ctx, callback, type, flags); \ +#define doadd(ev, set, type) \ + ev = make_ev(ctx, callback, type, flags); \ if (ev) { \ set; \ ev->actual = ev->flags; \ @@ -590,29 +598,36 @@ verto_ev * verto_add_io(verto_ctx *ctx, verto_ev_flag flags, verto_callback *callback, int fd) { + verto_ev *ev; + if (fd < 0 || !(flags & (VERTO_EV_FLAG_IO_READ | VERTO_EV_FLAG_IO_WRITE))) return NULL; - doadd(ev->option.fd = fd, VERTO_EV_TYPE_IO); + + doadd(ev, ev->option.fd = fd, VERTO_EV_TYPE_IO); } verto_ev * verto_add_timeout(verto_ctx *ctx, verto_ev_flag flags, verto_callback *callback, time_t interval) { - doadd(ev->option.interval = interval, VERTO_EV_TYPE_TIMEOUT); + verto_ev *ev; + doadd(ev, ev->option.interval = interval, VERTO_EV_TYPE_TIMEOUT); } verto_ev * verto_add_idle(verto_ctx *ctx, verto_ev_flag flags, verto_callback *callback) { - doadd(, VERTO_EV_TYPE_IDLE); + verto_ev *ev; + doadd(ev,, VERTO_EV_TYPE_IDLE); } verto_ev * verto_add_signal(verto_ctx *ctx, verto_ev_flag flags, verto_callback *callback, int signal) { + verto_ev *ev; + if (signal < 0) return NULL; #ifndef WIN32 @@ -624,13 +639,15 @@ verto_add_signal(verto_ctx *ctx, verto_ev_flag flags, if (!(flags & VERTO_EV_FLAG_PERSIST)) return NULL; } - doadd(ev->option.signal = signal, VERTO_EV_TYPE_SIGNAL); + doadd(ev, ev->option.signal = signal, VERTO_EV_TYPE_SIGNAL); } verto_ev * verto_add_child(verto_ctx *ctx, verto_ev_flag flags, verto_callback *callback, verto_proc proc) { + verto_ev *ev; + if (flags & VERTO_EV_FLAG_PERSIST) /* persist makes no sense */ return NULL; #ifdef WIN32 @@ -639,7 +656,7 @@ verto_add_child(verto_ctx *ctx, verto_ev_flag flags, if (proc < 1) #endif return NULL; - doadd(ev->option.child.proc = proc, VERTO_EV_TYPE_CHILD); + doadd(ev, ev->option.child.proc = proc, VERTO_EV_TYPE_CHILD); } void

1 0

[libverto] fix some style issues: wrapping and void usage
by Nathaniel McCallum 09 Sep '11

09 Sep '11

commit f6dda6fd28994dc602423a3af4a9226c476782e7 Author: Nathaniel McCallum <npmccallum(a)redhat.com> Date: Fri Sep 9 13:10:22 2011 -0400 fix some style issues: wrapping and void usage src/verto-glib.c | 4 ++-- src/verto-glib.h | 10 +++++++--- src/verto-libev.c | 4 ++-- src/verto-libev.h | 11 ++++++++--- src/verto-libevent.c | 4 ++-- src/verto-libevent.h | 11 ++++++++--- src/verto-tevent.c | 4 ++-- src/verto-tevent.h | 11 ++++++++--- src/verto.c | 6 ++++-- 9 files changed, 43 insertions(+), 22 deletions(-) --- diff --git a/src/verto-glib.c b/src/verto-glib.c index 7c8e0aa..2a00c44 100644 --- a/src/verto-glib.c +++ b/src/verto-glib.c @@ -252,12 +252,12 @@ glib_ctx_del(void *lp, const verto_ev *ev, void *evpriv) VERTO_MODULE(glib, g_main_context_default, VERTO_GLIB_SUPPORTED_TYPES); verto_ctx * -verto_new_glib() { +verto_new_glib(void) { return verto_convert_glib(g_main_context_new(), NULL); } verto_ctx * -verto_default_glib() { +verto_default_glib(void) { return verto_convert_glib(g_main_context_default(), NULL); } diff --git a/src/verto-glib.h b/src/verto-glib.h index a05a921..0ce8000 100644 --- a/src/verto-glib.h +++ b/src/verto-glib.h @@ -28,8 +28,11 @@ #include <verto.h> #include <glib.h> -verto_ctx *verto_new_glib(); -verto_ctx *verto_default_glib(); +verto_ctx * +verto_new_glib(void); + +verto_ctx * +verto_default_glib(void); /** * mc == NULL, ml == NULL -- Use the default main loop @@ -37,6 +40,7 @@ verto_ctx *verto_default_glib(); * If mc is specified, a reference is stolen unless mc is the default loop. * A reference is always stolen for ml. */ -verto_ctx *verto_convert_glib(GMainContext *mc, GMainLoop *ml); +verto_ctx * +verto_convert_glib(GMainContext *mc, GMainLoop *ml); #endif /* VERTO_GLIB_H_ */ diff --git a/src/verto-libev.c b/src/verto-libev.c index dfa14e6..95ca152 100644 --- a/src/verto-libev.c +++ b/src/verto-libev.c @@ -141,13 +141,13 @@ VERTO_MODULE(libev, ev_loop_new, VERTO_EV_TYPE_CHILD); verto_ctx * -verto_new_libev() +verto_new_libev(void) { return verto_convert_libev(ev_loop_new(EVFLAG_AUTO)); } verto_ctx * -verto_default_libev() +verto_default_libev(void) { return verto_convert_libev(ev_default_loop(EVFLAG_AUTO)); } diff --git a/src/verto-libev.h b/src/verto-libev.h index fecae6a..497471f 100644 --- a/src/verto-libev.h +++ b/src/verto-libev.h @@ -28,8 +28,13 @@ #include <verto.h> #include <ev.h> -verto_ctx *verto_new_libev(); -verto_ctx *verto_default_libev(); -verto_ctx *verto_convert_libev(struct ev_loop* loop); +verto_ctx * +verto_new_libev(void); + +verto_ctx * +verto_default_libev(void); + +verto_ctx * +verto_convert_libev(struct ev_loop* loop); #endif /* VERTO_LIBEV_H_ */ diff --git a/src/verto-libevent.c b/src/verto-libevent.c index 0b3144e..6619c31 100644 --- a/src/verto-libevent.c +++ b/src/verto-libevent.c @@ -138,13 +138,13 @@ VERTO_MODULE(libevent, event_base_init, VERTO_EV_TYPE_SIGNAL); verto_ctx * -verto_new_libevent() +verto_new_libevent(void) { return verto_convert_libevent(event_base_new()); } verto_ctx * -verto_default_libevent() +verto_default_libevent(void) { if (!event_global_current_base_) event_global_current_base_ = event_init(); diff --git a/src/verto-libevent.h b/src/verto-libevent.h index 8793b75..e21a6e4 100644 --- a/src/verto-libevent.h +++ b/src/verto-libevent.h @@ -28,8 +28,13 @@ #include <verto.h> #include <event2/event.h> -verto_ctx *verto_new_libevent(); -verto_ctx *verto_default_libevent(); -verto_ctx *verto_convert_libevent(struct event_base *ebase); +verto_ctx * +verto_new_libevent(void); + +verto_ctx * +verto_default_libevent(void); + +verto_ctx * +verto_convert_libevent(struct event_base *ebase); #endif /* VERTO_LIBEVENT_H_ */ diff --git a/src/verto-tevent.c b/src/verto-tevent.c index 3678429..b18e71a 100644 --- a/src/verto-tevent.c +++ b/src/verto-tevent.c @@ -132,13 +132,13 @@ VERTO_MODULE(tevent, g_main_context_default, VERTO_EV_TYPE_SIGNAL); verto_ctx * -verto_new_tevent() +verto_new_tevent(void) { return verto_convert_tevent(tevent_context_init(NULL)); } verto_ctx * -verto_default_tevent() +verto_default_tevent(void) { if (!defctx) defctx = tevent_context_init(NULL); diff --git a/src/verto-tevent.h b/src/verto-tevent.h index 1afecc7..aa61694 100644 --- a/src/verto-tevent.h +++ b/src/verto-tevent.h @@ -28,8 +28,13 @@ #include <verto.h> #include <tevent.h> -verto_ctx *verto_new_tevent(); -verto_ctx *verto_default_tevent(); -verto_ctx *verto_convert_tevent(struct tevent_context *context); +verto_ctx * +verto_new_tevent(void); + +verto_ctx * +verto_default_tevent(void); + +verto_ctx * +verto_convert_tevent(struct tevent_context *context); #endif /* VERTO_TEVENT_H_ */ diff --git a/src/verto.c b/src/verto.c index 11f40b8..82cafcf 100644 --- a/src/verto.c +++ b/src/verto.c @@ -46,7 +46,8 @@ #ifdef WIN32 #define pdlmsuffix ".dll" #define pdlmtype HMODULE -#define pdlopenl(filename) LoadLibraryEx(filename, NULL, DONT_RESOLVE_DLL_REFERENCES) +#define pdlopenl(filename) LoadLibraryEx(filename, NULL, \ + DONT_RESOLVE_DLL_REFERENCES) #define pdlclose(module) FreeLibrary((pdlmtype) module) #define pdlsym(mod, sym) ((void *) GetProcAddress(mod, sym)) @@ -57,7 +58,8 @@ pdlreopen(const char *filename, pdlmtype module) return LoadLibrary(filename); } -static char *pdlerror() { +static char * +pdlerror(void) { char *amsg; LPTSTR msg;

1 0

[libverto] rename verto_forked() to verto_reinitialize()
by Nathaniel McCallum 09 Sep '11

09 Sep '11

commit e6500b2ccc0f40f76a845f72228bbe3dc6311a7c Author: Nathaniel McCallum <npmccallum(a)redhat.com> Date: Fri Sep 9 12:55:08 2011 -0400 rename verto_forked() to verto_reinitialize() src/verto-glib.c | 2 +- src/verto-libev.c | 2 +- src/verto-libevent.c | 2 +- src/verto-module.h | 4 ++-- src/verto-tevent.c | 2 +- src/verto.c | 6 +++--- src/verto.h | 15 +++++++-------- 7 files changed, 16 insertions(+), 17 deletions(-) --- diff --git a/src/verto-glib.c b/src/verto-glib.c index 3ae7673..7c8e0aa 100644 --- a/src/verto-glib.c +++ b/src/verto-glib.c @@ -120,7 +120,7 @@ glib_ctx_break(void *lp) } static void -glib_ctx_forked(void *lp) +glib_ctx_reinitialize(void *lp) { } diff --git a/src/verto-libev.c b/src/verto-libev.c index 6311dd5..dfa14e6 100644 --- a/src/verto-libev.c +++ b/src/verto-libev.c @@ -55,7 +55,7 @@ libev_ctx_break(void *ctx) } static void -libev_ctx_forked(void *ctx) +libev_ctx_reinitialize(void *ctx) { ev_loop_fork(ctx); } diff --git a/src/verto-libevent.c b/src/verto-libevent.c index 8cc6d64..0b3144e 100644 --- a/src/verto-libevent.c +++ b/src/verto-libevent.c @@ -62,7 +62,7 @@ libevent_ctx_break(void *priv) } static void -libevent_ctx_forked(void *priv) +libevent_ctx_reinitialize(void *priv) { event_reinit(priv); } diff --git a/src/verto-module.h b/src/verto-module.h index d23ed4f..05a920f 100644 --- a/src/verto-module.h +++ b/src/verto-module.h @@ -37,7 +37,7 @@ name ## _ctx_run, \ name ## _ctx_run_once, \ name ## _ctx_break, \ - name ## _ctx_forked, \ + name ## _ctx_reinitialize, \ name ## _ctx_add, \ name ## _ctx_del \ }; \ @@ -66,7 +66,7 @@ typedef struct { void (*ctx_run)(void *ctx); void (*ctx_run_once)(void *ctx); void (*ctx_break)(void *ctx); - void (*ctx_forked)(void *ctx); + void (*ctx_reinitialize)(void *ctx); void *(*ctx_add)(void *ctx, const verto_ev *ev, verto_ev_flag *flags); void (*ctx_del)(void *ctx, const verto_ev *ev, void *evpriv); } verto_ctx_funcs; diff --git a/src/verto-tevent.c b/src/verto-tevent.c index 406bf5b..3678429 100644 --- a/src/verto-tevent.c +++ b/src/verto-tevent.c @@ -71,7 +71,7 @@ tevent_ctx_break(void *priv) } static void -tevent_ctx_forked(void *priv) +tevent_ctx_reinitialize(void *priv) { tevent_re_initialise(priv); } diff --git a/src/verto.c b/src/verto.c index c266fe9..11f40b8 100644 --- a/src/verto.c +++ b/src/verto.c @@ -543,7 +543,7 @@ verto_break(verto_ctx *ctx) } void -verto_forked(verto_ctx *ctx) +verto_reinitialize(verto_ctx *ctx) { verto_ev *tmp, *next; if (!ctx) @@ -553,14 +553,14 @@ verto_forked(verto_ctx *ctx) for (tmp = ctx->events; tmp; tmp = next) { next = ctx->events->next; - if (tmp->flags & VERTO_EV_FLAG_FORKABLE) + if (tmp->flags & VERTO_EV_FLAG_REINITIABLE) ctx->funcs.ctx_del(ctx->modpriv, tmp, tmp->modpriv); else verto_del(tmp); } /* Reinit the loop */ - ctx->funcs.ctx_forked(ctx->modpriv); + ctx->funcs.ctx_reinitialize(ctx->modpriv); /* Recreate events that were marked forkable */ for (tmp = ctx->events; tmp; tmp = tmp->next) { diff --git a/src/verto.h b/src/verto.h index e48d7e1..d7ab479 100644 --- a/src/verto.h +++ b/src/verto.h @@ -59,8 +59,8 @@ typedef enum { VERTO_EV_FLAG_PRIORITY_HIGH = 1 << 3, VERTO_EV_FLAG_IO_READ = 1 << 4, VERTO_EV_FLAG_IO_WRITE = 1 << 5, - VERTO_EV_FLAG_FORKABLE = 1 << 6, - _VERTO_EV_FLAG_MAX = VERTO_EV_FLAG_FORKABLE + VERTO_EV_FLAG_REINITIABLE = 1 << 6, + _VERTO_EV_FLAG_MAX = VERTO_EV_FLAG_REINITIABLE } verto_ev_flag; typedef void (verto_callback)(verto_ctx *ctx, verto_ev *ev); @@ -211,19 +211,18 @@ void verto_break(verto_ctx *ctx); /** - * Re-initializes the verto_ctx after a fork. + * Re-initializes the verto_ctx. * - * You MUST call this in the child process after the fork. - * - * NOTE: This function deletes all current events. Those events which have the - * VERTO_EV_FLAG_FORKABLE flag will be deleted internally and recreated. + * This function deletes all events, except those which have set the + * VERTO_EV_FLAG_REINITIABLE flag. If you fork(), you MUST call this in the + * child process after the fork! * * @see verto_new() * @see verto_default() * @param ctx The verto_ctx to re-initialize. */ void -verto_forked(verto_ctx *ctx); +verto_reinitialize(verto_ctx *ctx); /** * Adds a callback executed when a file descriptor is ready to be read/written.

1 0

[libverto] add verto_forked() api and the FORKABLE flag
by Nathaniel McCallum 09 Sep '11

09 Sep '11

commit 93d36b01975df0d0e2ddddaf4224bb95fa3c21cb Author: Nathaniel McCallum <npmccallum(a)redhat.com> Date: Fri Sep 9 11:45:49 2011 -0400 add verto_forked() api and the FORKABLE flag src/verto-glib.c | 6 ++++++ src/verto-libev.c | 6 ++++++ src/verto-libevent.c | 6 ++++++ src/verto-module.h | 2 ++ src/verto-tevent.c | 6 ++++++ src/verto.c | 28 ++++++++++++++++++++++++++++ src/verto.h | 18 +++++++++++++++++- 7 files changed, 71 insertions(+), 1 deletions(-) --- diff --git a/src/verto-glib.c b/src/verto-glib.c index 9f77964..3ae7673 100644 --- a/src/verto-glib.c +++ b/src/verto-glib.c @@ -119,6 +119,12 @@ glib_ctx_break(void *lp) g_source_unref(src); } +static void +glib_ctx_forked(void *lp) +{ + +} + static gboolean glib_callback(gpointer data) { diff --git a/src/verto-libev.c b/src/verto-libev.c index 64693ae..6311dd5 100644 --- a/src/verto-libev.c +++ b/src/verto-libev.c @@ -55,6 +55,12 @@ libev_ctx_break(void *ctx) } static void +libev_ctx_forked(void *ctx) +{ + ev_loop_fork(ctx); +} + +static void libev_callback(EV_P_ ev_watcher *w, int revents) { if (verto_get_type(w->data) == VERTO_EV_TYPE_CHILD) diff --git a/src/verto-libevent.c b/src/verto-libevent.c index 179f060..8cc6d64 100644 --- a/src/verto-libevent.c +++ b/src/verto-libevent.c @@ -62,6 +62,12 @@ libevent_ctx_break(void *priv) } static void +libevent_ctx_forked(void *priv) +{ + event_reinit(priv); +} + +static void libevent_callback(evutil_socket_t socket, short type, void *data) { verto_fire(data); diff --git a/src/verto-module.h b/src/verto-module.h index 89d6e56..d23ed4f 100644 --- a/src/verto-module.h +++ b/src/verto-module.h @@ -37,6 +37,7 @@ name ## _ctx_run, \ name ## _ctx_run_once, \ name ## _ctx_break, \ + name ## _ctx_forked, \ name ## _ctx_add, \ name ## _ctx_del \ }; \ @@ -65,6 +66,7 @@ typedef struct { void (*ctx_run)(void *ctx); void (*ctx_run_once)(void *ctx); void (*ctx_break)(void *ctx); + void (*ctx_forked)(void *ctx); void *(*ctx_add)(void *ctx, const verto_ev *ev, verto_ev_flag *flags); void (*ctx_del)(void *ctx, const verto_ev *ev, void *evpriv); } verto_ctx_funcs; diff --git a/src/verto-tevent.c b/src/verto-tevent.c index 751c5c9..406bf5b 100644 --- a/src/verto-tevent.c +++ b/src/verto-tevent.c @@ -70,6 +70,12 @@ tevent_ctx_break(void *priv) texit(priv) = 1; } +static void +tevent_ctx_forked(void *priv) +{ + tevent_re_initialise(priv); +} + #define definecb(type, ...) \ static void tevent_ ## type ## _cb(struct tevent_context *c, \ struct tevent_ ## type *e, \ diff --git a/src/verto.c b/src/verto.c index 5a74542..c266fe9 100644 --- a/src/verto.c +++ b/src/verto.c @@ -542,6 +542,34 @@ verto_break(verto_ctx *ctx) ctx->funcs.ctx_break(ctx->modpriv); } +void +verto_forked(verto_ctx *ctx) +{ + verto_ev *tmp, *next; + if (!ctx) + return; + + /* Delete all events, but keep around the forkable ev structs */ + for (tmp = ctx->events; tmp; tmp = next) { + next = ctx->events->next; + + if (tmp->flags & VERTO_EV_FLAG_FORKABLE) + ctx->funcs.ctx_del(ctx->modpriv, tmp, tmp->modpriv); + else + verto_del(tmp); + } + + /* Reinit the loop */ + ctx->funcs.ctx_forked(ctx->modpriv); + + /* Recreate events that were marked forkable */ + for (tmp = ctx->events; tmp; tmp = tmp->next) { + tmp->actual = tmp->flags; + tmp->modpriv = ctx->funcs.ctx_add(ctx, tmp, &tmp->actual); + assert(tmp->modpriv); + } +} + #define doadd(set, type) \ verto_ev *ev = make_ev(ctx, callback, type, flags); \ if (ev) { \ diff --git a/src/verto.h b/src/verto.h index 302424a..e48d7e1 100644 --- a/src/verto.h +++ b/src/verto.h @@ -59,7 +59,8 @@ typedef enum { VERTO_EV_FLAG_PRIORITY_HIGH = 1 << 3, VERTO_EV_FLAG_IO_READ = 1 << 4, VERTO_EV_FLAG_IO_WRITE = 1 << 5, - _VERTO_EV_FLAG_MAX = VERTO_EV_FLAG_IO_WRITE + VERTO_EV_FLAG_FORKABLE = 1 << 6, + _VERTO_EV_FLAG_MAX = VERTO_EV_FLAG_FORKABLE } verto_ev_flag; typedef void (verto_callback)(verto_ctx *ctx, verto_ev *ev); @@ -210,6 +211,21 @@ void verto_break(verto_ctx *ctx); /** + * Re-initializes the verto_ctx after a fork. + * + * You MUST call this in the child process after the fork. + * + * NOTE: This function deletes all current events. Those events which have the + * VERTO_EV_FLAG_FORKABLE flag will be deleted internally and recreated. + * + * @see verto_new() + * @see verto_default() + * @param ctx The verto_ctx to re-initialize. + */ +void +verto_forked(verto_ctx *ctx); + +/** * Adds a callback executed when a file descriptor is ready to be read/written. * * All verto_ev events are automatically freed when their parent verto_ctx is

1 0

[libverto] [core] change verto_set_private() to return void
by Nathaniel McCallum 09 Sep '11

09 Sep '11

commit 2b92ab9c1e326b1dc72f16df175c9b7f74ec35e7 Author: Nathaniel McCallum <npmccallum(a)redhat.com> Date: Mon Aug 22 13:36:55 2011 -0400 [core] change verto_set_private() to return void src/verto.c | 5 ++--- src/verto.h | 3 +-- tests/child.c | 6 ++++-- tests/idle.c | 5 +++-- tests/signal.c | 7 ++++--- 5 files changed, 14 insertions(+), 12 deletions(-) --- diff --git a/src/verto.c b/src/verto.c index 426d289..5a74542 100644 --- a/src/verto.c +++ b/src/verto.c @@ -612,16 +612,15 @@ verto_add_child(verto_ctx *ctx, verto_ev_flag flags, doadd(ev->option.child.proc = proc, VERTO_EV_TYPE_CHILD); } -int +void verto_set_private(verto_ev *ev, void *priv, verto_callback *free) { if (!ev) - return 0; + return; if (ev->onfree && free) ev->onfree(ev->ctx, ev); ev->priv = priv; ev->onfree = free; - return 1; } void * diff --git a/src/verto.h b/src/verto.h index 452638d..302424a 100644 --- a/src/verto.h +++ b/src/verto.h @@ -345,9 +345,8 @@ verto_add_child(verto_ctx *ctx, verto_ev_flag flags, * @param ev The verto_ev * @param priv The private value to store * @param free The callback used to free the data or NULL - * @return 1 on success or 0 on failure */ -int +void verto_set_private(verto_ev *ev, void *priv, verto_callback *free); /** diff --git a/tests/child.c b/tests/child.c index 7c4038c..ffd34f3 100644 --- a/tests/child.c +++ b/tests/child.c @@ -64,6 +64,7 @@ int do_test(verto_ctx *ctx) { pid_t pid; + verto_ev *ev; exitstatus = 0; freed = 0; @@ -83,9 +84,10 @@ do_test(verto_ctx *ctx) /* Persist makes no sense for children events */ assert(!verto_add_child(ctx, VERTO_EV_FLAG_PERSIST, cb, pid)); - assert(verto_set_private(verto_add_child(ctx, VERTO_EV_FLAG_NONE, - cb, pid), NULL, onfree)); assert(verto_add_timeout(ctx, VERTO_EV_FLAG_NONE, exit_cb, 100)); + ev = verto_add_child(ctx, VERTO_EV_FLAG_NONE, cb, pid); + assert(ev); + verto_set_private(ev, NULL, onfree); return 0; } diff --git a/tests/idle.c b/tests/idle.c index 00af6af..4984dad 100644 --- a/tests/idle.c +++ b/tests/idle.c @@ -62,8 +62,9 @@ void cb(verto_ctx *ctx, verto_ev *ev) { if (++callcount == 2) { - assert(verto_set_private(verto_add_idle(ctx, VERTO_EV_FLAG_NONE, cb), - NULL, onfree)); + verto_ev *newev = verto_add_idle(ctx, VERTO_EV_FLAG_NONE, cb); + verto_set_private(newev, NULL, onfree); + assert(newev); verto_del(ev); } } diff --git a/tests/signal.c b/tests/signal.c index 770f3b2..f103ee7 100644 --- a/tests/signal.c +++ b/tests/signal.c @@ -61,6 +61,7 @@ cb(verto_ctx *ctx, verto_ev *ev) int do_test(verto_ctx *ctx) { + verto_ev *ev; pid_t pid = 0; count = 0; @@ -88,8 +89,8 @@ do_test(verto_ctx *ctx) exit(0); } - assert(verto_set_private(verto_add_timeout(ctx, VERTO_EV_FLAG_NONE, - exit_cb, 100), - (void *) (uintptr_t) pid, NULL)); + ev = verto_add_timeout(ctx, VERTO_EV_FLAG_NONE, exit_cb, 100); + assert(ev); + verto_set_private(ev, (void *) (uintptr_t) pid, NULL); return 0; }

1 0

[libverto] [core] make _vasprintf() handle -1 return value from vnsprintf() correctly
by Nathaniel McCallum 09 Sep '11

09 Sep '11

commit 6f4d9d85aed64c88bc294135c02e2875ea647fb7 Author: Nathaniel McCallum <npmccallum(a)redhat.com> Date: Mon Aug 22 12:50:57 2011 -0400 [core] make _vasprintf() handle -1 return value from vnsprintf() correctly src/verto.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) --- diff --git a/src/verto.c b/src/verto.c index f59e8ba..426d289 100644 --- a/src/verto.c +++ b/src/verto.c @@ -191,8 +191,7 @@ _vasprintf(char **strp, const char *fmt, va_list ap) { size = vsnprintf(NULL, 0, fmt, apc); va_end(apc); - *strp = malloc(size + 1); - if (!size) + if (size <= 0 || !(*strp = malloc(size + 1))) return -1; return vsnprintf(*strp, size + 1, fmt, ap);

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

libverto-commits September 2011