libverto-commits September 2011

libverto-commits@lists.fedorahosted.org

1 participants
16 discussions

[libverto] [core] remove leading _ from symbol names
by Nathaniel McCallum 26 Sep '11

26 Sep '11

commit 20708d4811481830730cdc9f1d64ef9c7b8783e8 Author: Nathaniel McCallum <npmccallum(a)redhat.com> Date: Mon Sep 26 10:20:33 2011 -0400 [core] remove leading _ from symbol names src/verto.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) --- diff --git a/src/verto.c b/src/verto.c index c7074f5..34d453c 100644 --- a/src/verto.c +++ b/src/verto.c @@ -183,7 +183,7 @@ struct _verto_ev { const verto_module *defmodule; static int -_vasprintf(char **strp, const char *fmt, va_list ap) { +int_vasprintf(char **strp, const char *fmt, va_list ap) { va_list apc; int size = 0; @@ -198,12 +198,12 @@ _vasprintf(char **strp, const char *fmt, va_list ap) { } static int -_asprintf(char **strp, const char *fmt, ...) { +int_asprintf(char **strp, const char *fmt, ...) { va_list ap; int size = 0; va_start(ap, fmt); - size = _vasprintf(strp, fmt, ap); + size = int_vasprintf(strp, fmt, ap); va_end(ap); return size; } @@ -277,7 +277,7 @@ do_load_dir(const char *dirname, const char *prefix, const char *suffix, if (flen < slen || strcmp(ent->d_name + flen - slen, suffix)) continue; - if (_asprintf(&tmp, "%s/%s", dirname, ent->d_name) < 0) + if (int_asprintf(&tmp, "%s/%s", dirname, ent->d_name) < 0) continue; success = do_load_file(tmp, reqsym, reqtypes, dll, module); @@ -331,7 +331,7 @@ load_module(const char *impl, verto_ev_type reqtypes, pdlmtype *dll, if (!success) { /* Try to do a load by the name */ tmp = NULL; - if (_asprintf(&tmp, "%s%s%s", prefix, impl, suffix) > 0) { + if (int_asprintf(&tmp, "%s%s%s", prefix, impl, suffix) > 0) { success = do_load_file(tmp, 0, reqtypes, dll, module); free(tmp); }

1 0

[libverto] [pkgconfig] use the newer .private construct to represent proper dependencies
by Nathaniel McCallum 26 Sep '11

26 Sep '11

commit e28eaac312513d0f7fd4e899eaa9259d90bfccd0 Author: Nathaniel McCallum <npmccallum(a)redhat.com> Date: Mon Sep 26 10:16:12 2011 -0400 [pkgconfig] use the newer .private construct to represent proper dependencies libverto-glib.pc.in | 1 + libverto-libev.pc.in | 1 + libverto-libevent.pc.in | 1 + libverto-tevent.pc.in | 1 + libverto.pc.in | 3 ++- 5 files changed, 6 insertions(+), 1 deletions(-) --- diff --git a/libverto-glib.pc.in b/libverto-glib.pc.in index 191a5dd..e7424e9 100644 --- a/libverto-glib.pc.in +++ b/libverto-glib.pc.in @@ -8,3 +8,4 @@ Description: Event loop abstraction interface (glib module) Version: @VERSION@ Libs: -L${libdir} -lverto-glib Cflags: -I${includedir} +Requires.private: libverto diff --git a/libverto-libev.pc.in b/libverto-libev.pc.in index e568dfa..e6eebbe 100644 --- a/libverto-libev.pc.in +++ b/libverto-libev.pc.in @@ -8,3 +8,4 @@ Description: Event loop abstraction interface (libev module) Version: @VERSION@ Libs: -L${libdir} -lverto-libev Cflags: -I${includedir} +Requires.private: libverto diff --git a/libverto-libevent.pc.in b/libverto-libevent.pc.in index d1f2eee..de1c63a 100644 --- a/libverto-libevent.pc.in +++ b/libverto-libevent.pc.in @@ -8,3 +8,4 @@ Description: Event loop abstraction interface (libevent module) Version: @VERSION@ Libs: -L${libdir} -lverto-libevent Cflags: -I${includedir} +Requires.private: libverto diff --git a/libverto-tevent.pc.in b/libverto-tevent.pc.in index 2e2de29..95e5d8a 100644 --- a/libverto-tevent.pc.in +++ b/libverto-tevent.pc.in @@ -8,3 +8,4 @@ Description: Event loop abstraction interface (tevent module) Version: @VERSION@ Libs: -L${libdir} -lverto-tevent Cflags: -I${includedir} +Requires.private: libverto diff --git a/libverto.pc.in b/libverto.pc.in index 7d9a532..03c9599 100644 --- a/libverto.pc.in +++ b/libverto.pc.in @@ -6,5 +6,6 @@ exec_prefix=@exec_prefix@ Name: libverto Description: Event loop abstraction interface Version: @VERSION@ -Libs: -L${libdir} -lverto @LIBS@ +Libs: -L${libdir} -lverto Cflags: -I${includedir} +Libs.private: @LIBS@

1 0

[libverto] increase the timeouts on all the tests since we are all PASS these days
by Nathaniel McCallum 19 Sep '11

19 Sep '11

commit 49c5a44b3e30e4f84febdc8166c589cdb9603b7f Author: Nathaniel McCallum <npmccallum(a)redhat.com> Date: Mon Sep 19 18:28:43 2011 -0400 increase the timeouts on all the tests since we are all PASS these days tests/child.c | 2 +- tests/idle.c | 2 +- tests/signal.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) --- diff --git a/tests/child.c b/tests/child.c index ffd34f3..d442cbd 100644 --- a/tests/child.c +++ b/tests/child.c @@ -84,7 +84,7 @@ 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_add_timeout(ctx, VERTO_EV_FLAG_NONE, exit_cb, 100)); + assert(verto_add_timeout(ctx, VERTO_EV_FLAG_NONE, exit_cb, 1000)); ev = verto_add_child(ctx, VERTO_EV_FLAG_NONE, cb, pid); assert(ev); verto_set_private(ev, NULL, onfree); diff --git a/tests/idle.c b/tests/idle.c index 4984dad..f6b43b8 100644 --- a/tests/idle.c +++ b/tests/idle.c @@ -81,6 +81,6 @@ do_test(verto_ctx *ctx) } assert(verto_add_idle(ctx, VERTO_EV_FLAG_PERSIST, cb)); - assert(verto_add_timeout(ctx, VERTO_EV_FLAG_NONE, exit_cb, 100)); + assert(verto_add_timeout(ctx, VERTO_EV_FLAG_NONE, exit_cb, 1000)); return 0; } diff --git a/tests/signal.c b/tests/signal.c index f103ee7..5a62ad1 100644 --- a/tests/signal.c +++ b/tests/signal.c @@ -89,7 +89,7 @@ do_test(verto_ctx *ctx) exit(0); } - ev = verto_add_timeout(ctx, VERTO_EV_FLAG_NONE, exit_cb, 100); + ev = verto_add_timeout(ctx, VERTO_EV_FLAG_NONE, exit_cb, 1000); assert(ev); verto_set_private(ev, (void *) (uintptr_t) pid, NULL); return 0;

1 0

[libverto] make libverto work on MacOSX (and other UNIXes that do not use .so)
by Nathaniel McCallum 19 Sep '11

19 Sep '11

commit a1a67d377f32d2b453cb396ac616d16102e1749c Author: Nathaniel McCallum <npmccallum(a)redhat.com> Date: Mon Sep 19 17:53:56 2011 -0400 make libverto work on MacOSX (and other UNIXes that do not use .so) src/verto.c | 13 ++++++++++--- tests/Makefile.am | 2 +- 2 files changed, 11 insertions(+), 4 deletions(-) --- diff --git a/src/verto.c b/src/verto.c index 0f015d8..c7074f5 100644 --- a/src/verto.c +++ b/src/verto.c @@ -44,7 +44,6 @@ #include <verto-module.h> #ifdef WIN32 -#define pdlmsuffix ".dll" #define pdlmtype HMODULE #define pdlopenl(filename) LoadLibraryEx(filename, NULL, \ DONT_RESOLVE_DLL_REFERENCES) @@ -102,7 +101,6 @@ pdladdrmodname(void *addr, char **buf) { return true; } #else -#define pdlmsuffix ".so" #define pdlmtype void * #define pdlopenl(filename) dlopen(filename, RTLD_LAZY | RTLD_LOCAL) #define pdlclose(module) dlclose((pdlmtype) module) @@ -310,12 +308,21 @@ load_module(const char *impl, verto_ev_type reqtypes, pdlmtype *dll, * impl == glib * suffix == .so.0 * Put them all together: /usr/lib/libverto-glib.so.0 */ - suffix = strstr(prefix, pdlmsuffix); + tmp = strdup(prefix); + if (!tmp) { + free(prefix); + return 0; + } + + suffix = basename(tmp); + suffix = strchr(suffix, '.'); if (!suffix || strlen(suffix) < 1 || !(suffix = strdup(suffix))) { free(prefix); + free(tmp); return 0; } strcpy(prefix + strlen(prefix) - strlen(suffix), "-"); + free(tmp); if (impl) { /* Try to do a load by the path */ diff --git a/tests/Makefile.am b/tests/Makefile.am index bcf33c4..d00d429 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -19,4 +19,4 @@ endif check_PROGRAMS = timeout idle child signal read write EXTRA_DIST = test.h abi TESTS = abi $(check_PROGRAMS) -TESTS_ENVIRONMENT = env LIBVERTO=$(abs_top_builddir)/src/.libs/libverto.so* +TESTS_ENVIRONMENT = env LIBVERTO=$(abs_top_builddir)/src/.libs/libverto.a

1 0

[libverto] remove leading _ from symbol names in abi check
by Nathaniel McCallum 19 Sep '11

19 Sep '11

commit b9b2ab2716642655b0f5c1f0b9c2bf69c5c9eb1b Author: Nathaniel McCallum <npmccallum(a)redhat.com> Date: Mon Sep 19 17:03:28 2011 -0400 remove leading _ from symbol names in abi check tests/abi | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) --- diff --git a/tests/abi b/tests/abi index f453d9a..2353dd2 100755 --- a/tests/abi +++ b/tests/abi @@ -11,6 +11,6 @@ else exit 1 fi -HASH=`nm -g $LIBVERTO | awk '/^[0-9a-fA-F]+ T / { print $NF; }' | sort -u | $HASHCMD | cut -d' ' -f1` +HASH=`nm -g $LIBVERTO | awk '/^[0-9a-fA-F]+ T / { print $NF; }' | sed 's|^_||' | sort -u | $HASHCMD | cut -d' ' -f1` echo "Hash: $HASH" test $HASH = a1eb6c877f28cf3eb19e3cf5ac804b10

1 0

[libverto] update abi check for verto_reinitialize()
by Nathaniel McCallum 19 Sep '11

19 Sep '11

commit b65a7c13bc3154ba3b45259a1902956f293d328f Author: Nathaniel McCallum <npmccallum(a)redhat.com> Date: Mon Sep 19 17:00:12 2011 -0400 update abi check for verto_reinitialize() tests/abi | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) --- diff --git a/tests/abi b/tests/abi index 8f75e1c..f453d9a 100755 --- a/tests/abi +++ b/tests/abi @@ -13,4 +13,4 @@ fi HASH=`nm -g $LIBVERTO | awk '/^[0-9a-fA-F]+ T / { print $NF; }' | sort -u | $HASHCMD | cut -d' ' -f1` echo "Hash: $HASH" -test $HASH = 4a2773985d96632229f07a0674818efd +test $HASH = a1eb6c877f28cf3eb19e3cf5ac804b10

1 0

[libverto] two verto_reinitialize() fixes from ghudson; thanks!
by Nathaniel McCallum 14 Sep '11

14 Sep '11

commit 5ed7359fddb8a01849f064afaa8dfbe5dbba8c3f Author: Nathaniel McCallum <npmccallum(a)redhat.com> Date: Wed Sep 14 12:04:25 2011 -0400 two verto_reinitialize() fixes from ghudson; thanks! src/verto.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) --- diff --git a/src/verto.c b/src/verto.c index 98cc303..0f015d8 100644 --- a/src/verto.c +++ b/src/verto.c @@ -561,7 +561,7 @@ verto_reinitialize(verto_ctx *ctx) /* Delete all events, but keep around the forkable ev structs */ for (tmp = ctx->events; tmp; tmp = next) { - next = ctx->events->next; + next = tmp->next; if (tmp->flags & VERTO_EV_FLAG_REINITIABLE) ctx->funcs.ctx_del(ctx->modpriv, tmp, tmp->modpriv); @@ -575,7 +575,7 @@ verto_reinitialize(verto_ctx *ctx) /* 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); + tmp->modpriv = ctx->funcs.ctx_add(ctx->modpriv, tmp, &tmp->actual); assert(tmp->modpriv); } }

1 0

[libverto] add @LIBS@ to libverto.pc.in
by Nathaniel McCallum 09 Sep '11

09 Sep '11

commit 7e7cc208e93ca218a93a18048c3c990b9901d8bd Author: Nathaniel McCallum <npmccallum(a)redhat.com> Date: Fri Sep 9 14:33:13 2011 -0400 add @LIBS@ to libverto.pc.in libverto.pc.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) --- diff --git a/libverto.pc.in b/libverto.pc.in index baae740..7d9a532 100644 --- a/libverto.pc.in +++ b/libverto.pc.in @@ -6,5 +6,5 @@ exec_prefix=@exec_prefix@ Name: libverto Description: Event loop abstraction interface Version: @VERSION@ -Libs: -L${libdir} -lverto +Libs: -L${libdir} -lverto @LIBS@ Cflags: -I${includedir}

1 0

[libverto] add exec_prefix to all .pc files
by Nathaniel McCallum 09 Sep '11

09 Sep '11

commit cbee087d046a73d32c860c17e7513ae1c86bf7ca Author: Nathaniel McCallum <npmccallum(a)redhat.com> Date: Fri Sep 9 14:31:16 2011 -0400 add exec_prefix to all .pc files libverto-glib.pc.in | 1 + libverto-libev.pc.in | 1 + libverto-libevent.pc.in | 1 + libverto-tevent.pc.in | 1 + libverto.pc.in | 1 + 5 files changed, 5 insertions(+), 0 deletions(-) --- diff --git a/libverto-glib.pc.in b/libverto-glib.pc.in index 2a75ce3..191a5dd 100644 --- a/libverto-glib.pc.in +++ b/libverto-glib.pc.in @@ -1,6 +1,7 @@ prefix=@prefix@ libdir=@libdir@ includedir=@includedir@ +exec_prefix=@exec_prefix@ Name: libverto-glib Description: Event loop abstraction interface (glib module) diff --git a/libverto-libev.pc.in b/libverto-libev.pc.in index f793bd7..e568dfa 100644 --- a/libverto-libev.pc.in +++ b/libverto-libev.pc.in @@ -1,6 +1,7 @@ prefix=@prefix@ libdir=@libdir@ includedir=@includedir@ +exec_prefix=@exec_prefix@ Name: libverto-libev Description: Event loop abstraction interface (libev module) diff --git a/libverto-libevent.pc.in b/libverto-libevent.pc.in index 20f69c0..d1f2eee 100644 --- a/libverto-libevent.pc.in +++ b/libverto-libevent.pc.in @@ -1,6 +1,7 @@ prefix=@prefix@ libdir=@libdir@ includedir=@includedir@ +exec_prefix=@exec_prefix@ Name: libverto-libevent Description: Event loop abstraction interface (libevent module) diff --git a/libverto-tevent.pc.in b/libverto-tevent.pc.in index 8714bfb..2e2de29 100644 --- a/libverto-tevent.pc.in +++ b/libverto-tevent.pc.in @@ -1,6 +1,7 @@ prefix=@prefix@ libdir=@libdir@ includedir=@includedir@ +exec_prefix=@exec_prefix@ Name: libverto-tevent Description: Event loop abstraction interface (tevent module) diff --git a/libverto.pc.in b/libverto.pc.in index 1006092..baae740 100644 --- a/libverto.pc.in +++ b/libverto.pc.in @@ -1,6 +1,7 @@ prefix=@prefix@ libdir=@libdir@ includedir=@includedir@ +exec_prefix=@exec_prefix@ Name: libverto Description: Event loop abstraction interface

1 0

[libverto] add missing break statements in libev_ctx_del; thanks ghudson!
by Nathaniel McCallum 09 Sep '11

09 Sep '11

commit 6602fe9af3f359b81b77164f93bdf35c84a1c021 Author: Nathaniel McCallum <npmccallum(a)redhat.com> Date: Fri Sep 9 14:23:01 2011 -0400 add missing break statements in libev_ctx_del; thanks ghudson! src/verto-libev.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) --- diff --git a/src/verto-libev.c b/src/verto-libev.c index 95ca152..48538a3 100644 --- a/src/verto-libev.c +++ b/src/verto-libev.c @@ -118,14 +118,19 @@ libev_ctx_del(void *ctx, const verto_ev *ev, void *evpriv) switch (verto_get_type(ev)) { case VERTO_EV_TYPE_IO: ev_io_stop(ctx, evpriv); + break; case VERTO_EV_TYPE_TIMEOUT: ev_timer_stop(ctx, evpriv); + break; case VERTO_EV_TYPE_IDLE: ev_idle_stop(ctx, evpriv); + break; case VERTO_EV_TYPE_SIGNAL: ev_signal_stop(ctx, evpriv); + break; case VERTO_EV_TYPE_CHILD: ev_child_stop(ctx, evpriv); + break; default: break; }

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

libverto-commits September 2011