libverto-commits June 2011

libverto-commits@lists.fedorahosted.org

1 participants
66 discussions

[libverto] [glib] use better priority mapping
by Nathaniel McCallum 20 Jun '11

20 Jun '11

commit be26797e8b8f07594f8d9833074c941efd0dcf8f Author: Nathaniel McCallum <npmccallum(a)redhat.com> Date: Mon Jun 20 16:39:55 2011 -0400 [glib] use better priority mapping src/verto-glib.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) --- diff --git a/src/verto-glib.c b/src/verto-glib.c index b9b819a..f6046a2 100644 --- a/src/verto-glib.c +++ b/src/verto-glib.c @@ -28,7 +28,11 @@ #include <verto-module.h> /* DEFAULT, LOW, MEDIUM, HIGH */ -static gint priority_map[4] = {50, 100, 50, 0}; +static gint priority_map[4] = { + G_PRIORITY_DEFAULT, + G_PRIORITY_LOW, + G_PRIORITY_DEFAULT_IDLE, + G_PRIORITY_HIGH }; struct glibEvCtx { GMainContext *context;

1 0

[libverto] [libev] set the pid status if it is a child event
by Nathaniel McCallum 20 Jun '11

20 Jun '11

commit 1ca40dc785ca7acf4c1452143fbd818c5f939a2e Author: Nathaniel McCallum <npmccallum(a)redhat.com> Date: Mon Jun 20 16:39:37 2011 -0400 [libev] set the pid status if it is a child event src/verto-libev.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) --- diff --git a/src/verto-libev.c b/src/verto-libev.c index 5fc84e6..fd2aced 100644 --- a/src/verto-libev.c +++ b/src/verto-libev.c @@ -69,6 +69,9 @@ libev_ctx_break(void *ctx) static void libev_callback(EV_P_ ev_watcher *w, int revents) { + if (verto_get_type(w->data) == VERTO_EV_TYPE_CHILD) + verto_set_pid_status(w->data, ((ev_child*) w)->rstatus); + verto_call(w->data); switch (verto_get_type(w->data)) {

1 0

[libverto] add the ability to set the pid status in the vertoEv
by Nathaniel McCallum 20 Jun '11

20 Jun '11

commit d7a103c28f456980fae2fffa458c6d1caca90c96 Author: Nathaniel McCallum <npmccallum(a)redhat.com> Date: Mon Jun 20 16:35:46 2011 -0400 add the ability to set the pid status in the vertoEv src/verto-module.h | 12 ++++++++++++ src/verto.c | 24 +++++++++++++++++++++--- src/verto.h | 10 ++++++++++ 3 files changed, 43 insertions(+), 3 deletions(-) --- diff --git a/src/verto-module.h b/src/verto-module.h index 8ae534f..8b5a334 100644 --- a/src/verto-module.h +++ b/src/verto-module.h @@ -115,6 +115,18 @@ struct vertoEvCtx * verto_convert_funcs(const struct vertoEvCtxFuncs *funcs, void *ctx_private); /** + * Sets the status of the pid which caused this event to fire. + * + * This function does nothing if the vertoEv is not a child type. + * + * @see verto_add_child() + * @param ev The vertoEv to set the status in. + * @param status The pid status. + */ +void +verto_set_pid_status(struct vertoEv *ev, int status); + +/** * Gets the module private stored in this vertoEv. * * This function is only used for module writers to store a context in the diff --git a/src/verto.c b/src/verto.c index 01203db..437f331 100644 --- a/src/verto.c +++ b/src/verto.c @@ -47,6 +47,11 @@ struct vertoEvCtx { struct vertoEvCtxFuncs funcs; }; +struct vertoChild { + pid_t pid; + int status; +}; + struct vertoEv { struct vertoEvCtx *ctx; enum vertoEvType type; @@ -58,7 +63,7 @@ struct vertoEv { int fd; int signal; time_t interval; - pid_t pid; + struct vertoChild child; } option; }; @@ -356,7 +361,7 @@ verto_add_child(struct vertoEvCtx *ctx, enum vertoEvPriority priority, { if (pid < 1) return NULL; - doadd(ev->option.pid = pid, VERTO_EV_TYPE_CHILD); + doadd(ev->option.child.pid = pid, VERTO_EV_TYPE_CHILD); } void @@ -410,10 +415,16 @@ verto_get_signal(const struct vertoEv *ev) pid_t verto_get_pid(const struct vertoEv *ev) { if (ev && ev->type == VERTO_EV_TYPE_CHILD) - return ev->option.pid; + return ev->option.child.pid; return 0; } +int +verto_get_pid_status(const struct vertoEv *ev) +{ + return ev->option.child.status; +} + void verto_del(struct vertoEv *ev) { @@ -481,6 +492,13 @@ verto_convert_funcs(const struct vertoEvCtxFuncs *funcs, void *ctx_private) return ctx; } +void +verto_set_pid_status(struct vertoEv *ev, int status) +{ + if (ev && ev->type == VERTO_EV_TYPE_CHILD) + ev->option.child.status = status; +} + void * verto_get_module_private(const struct vertoEv *ev) { diff --git a/src/verto.h b/src/verto.h index 56b1c93..358b1d0 100644 --- a/src/verto.h +++ b/src/verto.h @@ -378,6 +378,16 @@ pid_t verto_get_pid(const struct vertoEv *ev); /** + * Gets the status of the pid which caused this event to fire. + * + * @see verto_add_child() + * @param ev The vertoEv to retrieve the status from. + * @return The pid status. + */ +int +verto_get_pid_status(const struct vertoEv *ev); + +/** * Removes an event from from the event context and frees it. * * The event and its contents cannot be used after this call.

1 0

[libverto] [tests/timeout]: make it faster
by Nathaniel McCallum 20 Jun '11

20 Jun '11

commit ebbefb60ca5a3132f199d5764cc6d684bf0bf83e Author: Nathaniel McCallum <npmccallum(a)redhat.com> Date: Mon Jun 20 16:30:11 2011 -0400 [tests/timeout]: make it faster tests/timeout.c | 28 +++++++++++++++++++--------- 1 files changed, 19 insertions(+), 9 deletions(-) --- diff --git a/tests/timeout.c b/tests/timeout.c index c0fb2ae..af10524 100644 --- a/tests/timeout.c +++ b/tests/timeout.c @@ -22,10 +22,14 @@ * SOFTWARE. */ +#include <sys/time.h> + #include "test.h" -static time_t starttime; -static time_t endtime; +#define M2U(m) ((m) * 1000) + +static struct timeval starttime; +static struct timeval endtime; void exit_cb(struct vertoEvCtx *ctx, struct vertoEv *ev) @@ -36,12 +40,18 @@ exit_cb(struct vertoEvCtx *ctx, struct vertoEv *ev) void cb(struct vertoEvCtx *ctx, struct vertoEv *ev) { - if (endtime == 0) { - endtime = time(NULL); - retval = endtime - starttime < 1 || endtime - starttime > 2; + long long diff; + + if (starttime.tv_sec == endtime.tv_sec && starttime.tv_usec == endtime.tv_usec) { + gettimeofday(&endtime, NULL); + + diff = (endtime.tv_sec - starttime.tv_sec) * M2U(1000) + + endtime.tv_usec - starttime.tv_usec; + + retval = diff < M2U(50) || diff > M2U(100); if (retval != 0) printf("ERROR: Timeout is out-of-bounds!\n"); - verto_add_timeout(ctx, VERTO_EV_PRIORITY_DEFAULT, exit_cb, NULL, 1100); + verto_add_timeout(ctx, VERTO_EV_PRIORITY_DEFAULT, exit_cb, NULL, 100); return; } @@ -53,9 +63,9 @@ cb(struct vertoEvCtx *ctx, struct vertoEv *ev) int do_test(struct vertoEvCtx *ctx) { - starttime = time(NULL); - endtime = 0; + gettimeofday(&starttime, NULL); + endtime = starttime; - assert(verto_add_timeout(ctx, VERTO_EV_PRIORITY_DEFAULT, cb, NULL, 1000)); + assert(verto_add_timeout(ctx, VERTO_EV_PRIORITY_DEFAULT, cb, NULL, 50)); return 0; }

1 0

[libverto] tevent: fix copy/paste error; fix timeout offset
by Nathaniel McCallum 20 Jun '11

20 Jun '11

commit 179bf84d8afdb7adf539b5eb0b2b2a7f928d1d24 Author: Nathaniel McCallum <npmccallum(a)redhat.com> Date: Mon Jun 20 12:07:54 2011 -0400 tevent: fix copy/paste error; fix timeout offset src/verto-tevent.c | 55 ++++++++++++++++++++++++++------------------------- 1 files changed, 28 insertions(+), 27 deletions(-) --- diff --git a/src/verto-tevent.c b/src/verto-tevent.c index 8c36fa0..a15d184 100644 --- a/src/verto-tevent.c +++ b/src/verto-tevent.c @@ -29,8 +29,8 @@ #include <verto-tevent.h> #include <verto-module.h> -#define tctx(priv) ((struct teventEvCtx *) priv)->ctx -#define texit(priv) ((struct teventEvCtx *) priv)->exit +#define tctx(p) ((struct teventEvCtx *) p)->ctx +#define texit(p) ((struct teventEvCtx *) p)->exit static struct teventEvCtx *defctx; @@ -72,7 +72,7 @@ static void tevent_ctx_run(void *priv) { while (!texit(priv)) - tevent_loop_once(priv); + tevent_loop_once(tctx(priv)); texit(priv) = false; } @@ -102,33 +102,34 @@ definecb(signal, int signum, int count, void *siginfo) static int tevent_ctx_add(void *ctx, struct vertoEv *ev) { - struct timeval tv; void *priv = NULL; + time_t interval; + struct timeval tv; + + interval = verto_get_interval(ev); + tv = tevent_timeval_current_ofs(interval / 1000, interval % 1000 * 1000); switch (verto_get_type(ev)) { - case VERTO_EV_TYPE_READ: - priv = tevent_add_fd(tctx(priv), tctx(priv), verto_get_fd(ev), - TEVENT_FD_READ, tevent_fd_cb, ev); - break; - case VERTO_EV_TYPE_WRITE: - priv = tevent_add_fd(tctx(priv), tctx(priv), verto_get_fd(ev), - TEVENT_FD_WRITE, tevent_fd_cb, ev); - break; - case VERTO_EV_TYPE_TIMEOUT: - tv.tv_sec = verto_get_interval(ev) / 1000; - tv.tv_usec = verto_get_interval(ev) % 1000 * 1000; - priv = tevent_add_timer(tctx(priv), tctx(priv), tv, - tevent_timer_cb, ev); - break; - case VERTO_EV_TYPE_SIGNAL: - priv = tevent_add_signal(tctx(priv), tctx(priv), - verto_get_signal(ev), 0, - tevent_signal_cb, ev); - break; - case VERTO_EV_TYPE_IDLE: - case VERTO_EV_TYPE_CHILD: - default: - return -1; /* Not supported */ + case VERTO_EV_TYPE_READ: + priv = tevent_add_fd(tctx(ctx), tctx(ctx), verto_get_fd(ev), + TEVENT_FD_READ, tevent_fd_cb, ev); + break; + case VERTO_EV_TYPE_WRITE: + priv = tevent_add_fd(tctx(ctx), tctx(ctx), verto_get_fd(ev), + TEVENT_FD_WRITE, tevent_fd_cb, ev); + break; + case VERTO_EV_TYPE_TIMEOUT: + priv = tevent_add_timer(tctx(ctx), tctx(ctx), tv, + tevent_timer_cb, ev); + break; + case VERTO_EV_TYPE_SIGNAL: + priv = tevent_add_signal(tctx(ctx), tctx(ctx), verto_get_signal(ev), + 0, tevent_signal_cb, ev); + break; + case VERTO_EV_TYPE_IDLE: + case VERTO_EV_TYPE_CHILD: + default: + return -1; /* Not supported */ } if (!priv)

1 0

[libverto] call free before the module is unloaded
by Nathaniel McCallum 20 Jun '11

20 Jun '11

commit e83eddf90c29543e9aebc26eabebb666e606592b Author: Nathaniel McCallum <npmccallum(a)redhat.com> Date: Mon Jun 20 11:31:20 2011 -0400 call free before the module is unloaded src/verto.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) --- diff --git a/src/verto.c b/src/verto.c index 7d27f83..01203db 100644 --- a/src/verto.c +++ b/src/verto.c @@ -242,9 +242,9 @@ verto_free(struct vertoEvCtx *ctx) { if (!ctx) return; + ctx->funcs.ctx_free(ctx->modpriv); if (ctx->dll) dlclose(ctx->dll); - ctx->funcs.ctx_free(ctx->modpriv); free(ctx); }

1 0

[libverto] only load the module directly if the name has a path separator in it
by Nathaniel McCallum 20 Jun '11

20 Jun '11

commit efda9a712d6a7b9e20990fb316c6f8af2631a3d0 Author: Nathaniel McCallum <npmccallum(a)redhat.com> Date: Mon Jun 20 11:31:01 2011 -0400 only load the module directly if the name has a path separator in it src/verto.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) --- diff --git a/src/verto.c b/src/verto.c index c762251..7d27f83 100644 --- a/src/verto.c +++ b/src/verto.c @@ -154,7 +154,8 @@ load_module(const char *impl, void **dll, struct vertoModule **module) if (impl) { /* Try to do a load by the path */ - success = do_load_file(impl, false, dll, module); + if (strchr(impl, '/')) + success = do_load_file(impl, false, dll, module); if (!success) { /* Try to do a load by the name */ tmp = NULL;

1 0

[libverto] fix missing pointer dereference and an aliasing issue
by Nathaniel McCallum 20 Jun '11

20 Jun '11

commit dbc578cd7786dbc95fdc44ec5ab32bfd2e922ca9 Author: Nathaniel McCallum <npmccallum(a)redhat.com> Date: Mon Jun 20 11:30:29 2011 -0400 fix missing pointer dereference and an aliasing issue src/verto.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) --- diff --git a/src/verto.c b/src/verto.c index f404749..c762251 100644 --- a/src/verto.c +++ b/src/verto.c @@ -66,23 +66,21 @@ static inline bool do_load_file(const char *filename, bool reqsym, void **dll, struct vertoModule **module) { - struct vertoModule *mod = *module; - *dll = dlopen(filename, RTLD_LAZY | RTLD_LOCAL); if (!dll) { - /* printf("%s -- %s\n", filename.c_str(), dlerror()); */ + /* printf("%s -- %s\n", filename, dlerror()); */ return false; } - mod = (struct vertoModule*) dlsym(dll, __str(_VERTO_MODULE_TABLE)); - if (!mod || mod->vers != _VERTO_MODULE_VERSION || !mod->new_ctx - || !mod->def_ctx) + *module = (struct vertoModule*) dlsym(*dll, __str(_VERTO_MODULE_TABLE)); + if (!*module || (*module)->vers != _VERTO_MODULE_VERSION + || !(*module)->new_ctx || !(*module)->def_ctx) goto error; /* Check to make sure that we have our required symbol if reqsym == true */ - if (mod->symb && reqsym) { + if ((*module)->symb && reqsym) { void *tmp = dlopen(NULL, 0); - if (!tmp || !dlsym(tmp, mod->symb)) { + if (!tmp || !dlsym(tmp, (*module)->symb)) { if (tmp) dlclose(tmp); goto error;

1 0

[libverto] libevent: make events not persist
by Nathaniel McCallum 20 Jun '11

20 Jun '11

commit cf924b8d71716a9b9be3544a17f64e9ecbe78232 Author: Nathaniel McCallum <npmccallum(a)redhat.com> Date: Mon Jun 20 11:28:20 2011 -0400 libevent: make events not persist src/verto-libevent.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) --- diff --git a/src/verto-libevent.c b/src/verto-libevent.c index 089c6e7..8e97a77 100644 --- a/src/verto-libevent.c +++ b/src/verto-libevent.c @@ -85,19 +85,19 @@ libevent_ctx_add(void *ctx, struct vertoEv *ev) switch (verto_get_type(ev)) { case VERTO_EV_TYPE_READ: - priv = event_new(ctx, verto_get_fd(ev), EV_READ | EV_PERSIST, libevent_callback, ev); + priv = event_new(ctx, verto_get_fd(ev), EV_READ, libevent_callback, ev); break; case VERTO_EV_TYPE_WRITE: - priv = event_new(ctx, verto_get_fd(ev), EV_WRITE | EV_PERSIST, libevent_callback, ev); + priv = event_new(ctx, verto_get_fd(ev), EV_WRITE, libevent_callback, ev); break; case VERTO_EV_TYPE_TIMEOUT: timeout = &tv; tv.tv_sec = verto_get_interval(ev) / 1000; tv.tv_usec = verto_get_interval(ev) % 1000 * 1000; - priv = event_new(ctx, -1, EV_TIMEOUT | EV_PERSIST, libevent_callback, ev); + priv = event_new(ctx, -1, EV_TIMEOUT, libevent_callback, ev); break; case VERTO_EV_TYPE_SIGNAL: - priv = event_new(ctx, verto_get_signal(ev), EV_SIGNAL | EV_PERSIST, libevent_callback, ev); + priv = event_new(ctx, verto_get_signal(ev), EV_SIGNAL, libevent_callback, ev); break; case VERTO_EV_TYPE_IDLE: case VERTO_EV_TYPE_CHILD:

1 0

[libverto] libev: make events not persist
by Nathaniel McCallum 20 Jun '11

20 Jun '11

commit ea3f1206eccb8ffff13ebb42c3c78159c0703258 Author: Nathaniel McCallum <npmccallum(a)redhat.com> Date: Mon Jun 20 11:27:00 2011 -0400 libev: make events not persist src/verto-libev.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) --- diff --git a/src/verto-libev.c b/src/verto-libev.c index 11ea7e3..5fc84e6 100644 --- a/src/verto-libev.c +++ b/src/verto-libev.c @@ -70,6 +70,22 @@ static void libev_callback(EV_P_ ev_watcher *w, int revents) { verto_call(w->data); + + switch (verto_get_type(w->data)) { + case VERTO_EV_TYPE_READ: + case VERTO_EV_TYPE_WRITE: + ev_io_stop(loop, (ev_io*) w); + case VERTO_EV_TYPE_TIMEOUT: + ev_timer_stop(loop, (ev_timer*) w); + case VERTO_EV_TYPE_IDLE: + ev_idle_stop(loop, (ev_idle*) w); + case VERTO_EV_TYPE_SIGNAL: + ev_signal_stop(loop, (ev_signal*) w); + case VERTO_EV_TYPE_CHILD: + ev_child_stop(loop, (ev_child*) w); + default: + break; + } } #define setuptype(type, priv, ...) \

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

libverto-commits June 2011