libverto-commits November 2011

libverto-commits@lists.fedorahosted.org

1 participants
32 discussions

[libverto] [core] add verto_get_ctx()
by Nathaniel McCallum 18 Nov '11

18 Nov '11

commit 4dfa92e76bbbe515c7a29b9265187c466b65dfe9 Author: Nathaniel McCallum <npmccallum(a)redhat.com> Date: Fri Nov 18 16:59:29 2011 -0500 [core] add verto_get_ctx() src/verto.c | 6 ++++++ src/verto.h | 11 +++++++++++ tests/abi | 2 +- 3 files changed, 18 insertions(+), 1 deletions(-) --- diff --git a/src/verto.c b/src/verto.c index d84d8cb..5b0a2a2 100644 --- a/src/verto.c +++ b/src/verto.c @@ -763,6 +763,12 @@ verto_get_proc_status(const verto_ev *ev) return ev->option.child.status; } +verto_ctx * +verto_get_ctx(const verto_ev *ev) +{ + return ev->ctx; +} + void verto_del(verto_ev *ev) { diff --git a/src/verto.h b/src/verto.h index 91fa720..b1f2896 100644 --- a/src/verto.h +++ b/src/verto.h @@ -492,6 +492,17 @@ verto_proc_status verto_get_proc_status(const verto_ev *ev); /** + * Gets the verto_ctx associated with a verto_ev. + * + * This is a borrowed reference, don't attempt to free it! + * + * @param ev The verto_ev to retrieve the verto_ctx from. + * @return The verto_ctx. + */ +verto_ctx * +verto_get_ctx(const verto_ev *ev); + +/** * Removes an event from from the event context and frees it. * * The event and its contents cannot be used after this call. diff --git a/tests/abi b/tests/abi index 20464cd..9ed0c4c 100755 --- a/tests/abi +++ b/tests/abi @@ -13,4 +13,4 @@ fi HASH=`nm -g $LIBVERTO | awk '/^[0-9a-fA-F]+ T verto_/ { print $NF; }' | sed 's|^_||' | sort -u | $HASHCMD | cut -d' ' -f1` echo "Hash: $HASH" -test $HASH = 04d2af279a5cf456a37cdd4aece75ff0 +test $HASH = 6a60a3d64f1bd131ce1b81d002b17921

1 0

[libverto] [core] add verto_get_fd_state() and verto_set_fd_state(); enable backends to report fd state
by Nathaniel McCallum 17 Nov '11

17 Nov '11

commit 4c3523d2138ddcaabb2cd80058ce0259d17735e1 Author: Nathaniel McCallum <npmccallum(a)redhat.com> Date: Thu Nov 17 14:03:34 2011 -0500 [core] add verto_get_fd_state() and verto_set_fd_state(); enable backends to report fd state src/verto-glib.c | 10 ++++++++++ src/verto-libev.c | 12 +++++++++++- src/verto-libevent.c | 12 ++++++++++++ src/verto-module.h | 15 +++++++++++++++ src/verto-tevent.c | 40 ++++++++++++++++++++++++++++++---------- src/verto.c | 38 +++++++++++++++++++++++++++++++++++--- src/verto.h | 13 ++++++++++++- tests/abi | 2 +- tests/read.c | 3 +++ tests/write.c | 3 +++ 10 files changed, 132 insertions(+), 16 deletions(-) --- diff --git a/src/verto-glib.c b/src/verto-glib.c index ac00314..c78e01b 100644 --- a/src/verto-glib.c +++ b/src/verto-glib.c @@ -142,6 +142,16 @@ glib_callback(gpointer data) static gboolean glib_callback_io(GIOChannel *source, GIOCondition condition, gpointer data) { + verto_ev_flag state = VERTO_EV_FLAG_NONE; + + if (condition & (G_IO_IN | G_IO_PRI)) + state |= VERTO_EV_FLAG_IO_READ; + if (condition & G_IO_OUT) + state |= VERTO_EV_FLAG_IO_WRITE; + if (condition & (G_IO_ERR | G_IO_HUP | G_IO_NVAL)) + state |= VERTO_EV_FLAG_IO_ERROR; + + verto_set_fd_state(data, state); return glib_callback(data); } diff --git a/src/verto-libev.c b/src/verto-libev.c index 4e6e816..deb021e 100644 --- a/src/verto-libev.c +++ b/src/verto-libev.c @@ -78,9 +78,19 @@ libev_ctx_reinitialize(verto_mod_ctx *ctx) static void libev_callback(EV_P_ ev_watcher *w, int revents) { - if (verto_get_type(w->data) == VERTO_EV_TYPE_CHILD) + verto_ev_flag state = VERTO_EV_FLAG_NONE; + + if (verto_get_type(w->data)== VERTO_EV_TYPE_CHILD) verto_set_proc_status(w->data, ((ev_child*) w)->rstatus); + if (revents & EV_READ) + state |= VERTO_EV_FLAG_IO_READ; + if (revents & EV_WRITE) + state |= VERTO_EV_FLAG_IO_WRITE; + if (revents & EV_ERROR) + state |= VERTO_EV_FLAG_IO_ERROR; + + verto_set_fd_state(w->data, state); verto_fire(w->data); } diff --git a/src/verto-libevent.c b/src/verto-libevent.c index 80fb00d..031ea00 100644 --- a/src/verto-libevent.c +++ b/src/verto-libevent.c @@ -92,6 +92,18 @@ libevent_ctx_reinitialize(verto_mod_ctx *ctx) static void libevent_callback(evutil_socket_t socket, short type, void *data) { + verto_ev_flag state = VERTO_EV_FLAG_NONE; + + if (type & EV_READ) + state |= VERTO_EV_FLAG_IO_READ; + if (type & EV_WRITE) + state |= VERTO_EV_FLAG_IO_WRITE; +#ifdef EV_ERROR + if (type & EV_ERROR) + state |= VERTO_EV_FLAG_IO_ERROR; +#endif + + verto_set_fd_state(data, state); verto_fire(data); } diff --git a/src/verto-module.h b/src/verto-module.h index b0e7232..630a4bf 100644 --- a/src/verto-module.h +++ b/src/verto-module.h @@ -166,4 +166,19 @@ verto_fire(verto_ev *ev); void verto_set_proc_status(verto_ev *ev, verto_proc_status status); +/** + * Sets the state of the fd which caused this event to fire. + * + * This function does nothing if the verto_ev is not a io type. + * + * Only the flags VERTO_EV_FLAG_IO_(READ|WRITE|ERROR) are supported. All other + * flags are unset. + * + * @see verto_add_io() + * @param ev The verto_ev to set the state in. + * @param state The fd state. + */ +void +verto_set_fd_state(verto_ev *ev, verto_ev_flag state); + #endif /* VERTO_MODULE_H_ */ diff --git a/src/verto-tevent.c b/src/verto-tevent.c index c4c363d..f91b9a4 100644 --- a/src/verto-tevent.c +++ b/src/verto-tevent.c @@ -61,16 +61,36 @@ tevent_ctx_reinitialize(verto_mod_ctx *ctx) tevent_re_initialise(ctx); } -#define definecb(type, ...) \ - static void tevent_ ## type ## _cb(struct tevent_context *c, \ - struct tevent_ ## type *e, \ - __VA_ARGS__, void *data) { \ - verto_fire(data); \ - } +static void +tevent_fd_cb(struct tevent_context *c, struct tevent_fd *e, + uint16_t fl, void *data) +{ + verto_ev_flag state = VERTO_EV_FLAG_NONE; + + if (fl & TEVENT_FD_READ) + state |= VERTO_EV_FLAG_IO_READ; + if (fl & TEVENT_FD_WRITE) + state |= VERTO_EV_FLAG_IO_WRITE; + if (fl & TEVENT_FD_ERROR) + state |= VERTO_EV_FLAG_IO_ERROR; -definecb(fd, uint16_t fl) -definecb(timer, struct timeval ct) -definecb(signal, int signum, int count, void *siginfo) + verto_set_fd_state(data, state); + verto_fire(data); +} + +static void +tevent_timer_cb(struct tevent_context *c, struct tevent_timer *e, + struct timeval ct, void *data) +{ + verto_fire(data); +} + +static void +tevent_signal_cb(struct tevent_context *c, struct tevent_signal *e, + int signum, int count, void *siginfo, void *data) +{ + verto_fire(data); +} static verto_mod_ev * tevent_ctx_add(verto_mod_ctx *ctx, const verto_ev *ev, verto_ev_flag *flags) diff --git a/src/verto.c b/src/verto.c index bf72e9c..d84d8cb 100644 --- a/src/verto.c +++ b/src/verto.c @@ -59,6 +59,11 @@ typedef struct { verto_proc_status status; } verto_child; +typedef struct { + int fd; + verto_ev_flag state; +} verto_io; + struct verto_ev { verto_ev *next; verto_ctx *ctx; @@ -72,7 +77,7 @@ struct verto_ev { size_t depth; int deleted; union { - int fd; + verto_io io; int signal; time_t interval; verto_child child; @@ -625,7 +630,7 @@ verto_add_io(verto_ctx *ctx, verto_ev_flag flags, if (fd < 0 || !(flags & (VERTO_EV_FLAG_IO_READ | VERTO_EV_FLAG_IO_WRITE))) return NULL; - doadd(ev, ev->option.fd = fd, VERTO_EV_TYPE_IO); + doadd(ev, ev->option.io.fd = fd, VERTO_EV_TYPE_IO); return ev; } @@ -719,10 +724,16 @@ int verto_get_fd(const verto_ev *ev) { if (ev && (ev->type == VERTO_EV_TYPE_IO)) - return ev->option.fd; + return ev->option.io.fd; return -1; } +verto_ev_flag +verto_get_fd_state(const verto_ev *ev) +{ + return ev->option.io.state; +} + time_t verto_get_interval(const verto_ev *ev) { @@ -885,6 +896,11 @@ verto_fire(verto_ev *ev) ev->ctx->module->funcs->ctx_del(ev->ctx->ctx, ev, ev->ev); ev->ev = priv; } + + if (ev->type == VERTO_EV_TYPE_IO) + ev->option.io.state = VERTO_EV_FLAG_NONE; + if (ev->type == VERTO_EV_TYPE_CHILD) + ev->option.child.status = 0; } } @@ -894,3 +910,19 @@ verto_set_proc_status(verto_ev *ev, verto_proc_status status) if (ev && ev->type == VERTO_EV_TYPE_CHILD) ev->option.child.status = status; } + +void +verto_set_fd_state(verto_ev *ev, verto_ev_flag state) +{ + /* Filter out only the io flags */ + state = state & (VERTO_EV_FLAG_IO_READ | + VERTO_EV_FLAG_IO_WRITE | + VERTO_EV_FLAG_IO_ERROR); + + /* Don't report read/write if the socket is closed */ + if (state & VERTO_EV_FLAG_IO_ERROR) + state = VERTO_EV_FLAG_IO_ERROR; + + if (ev && ev->type == VERTO_EV_TYPE_IO) + ev->option.io.state = state; +} diff --git a/src/verto.h b/src/verto.h index c659c2e..91fa720 100644 --- a/src/verto.h +++ b/src/verto.h @@ -64,8 +64,9 @@ 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_IO_ERROR = 1 << 7, VERTO_EV_FLAG_REINITIABLE = 1 << 6, - _VERTO_EV_FLAG_MAX = VERTO_EV_FLAG_REINITIABLE + _VERTO_EV_FLAG_MAX = VERTO_EV_FLAG_IO_ERROR } verto_ev_flag; typedef void (verto_callback)(verto_ctx *ctx, verto_ev *ev); @@ -441,6 +442,16 @@ int verto_get_fd(const verto_ev *ev); /** + * Gets the file descriptor state from when the event fires. + * + * @see verto_add_io() + * @param ev The verto_ev to retrieve the fd state from. + * @return The fd state. + */ +verto_ev_flag +verto_get_fd_state(const verto_ev *ev); + +/** * Gets the interval associated with a timeout verto_ev. * * @see verto_add_timeout() diff --git a/tests/abi b/tests/abi index cbbdf26..20464cd 100755 --- a/tests/abi +++ b/tests/abi @@ -13,4 +13,4 @@ fi HASH=`nm -g $LIBVERTO | awk '/^[0-9a-fA-F]+ T verto_/ { print $NF; }' | sed 's|^_||' | sort -u | $HASHCMD | cut -d' ' -f1` echo "Hash: $HASH" -test $HASH = af68235ae7f8f577dc37536ce1534688 +test $HASH = 04d2af279a5cf456a37cdd4aece75ff0 diff --git a/tests/read.c b/tests/read.c index 0d32084..9d0bca5 100644 --- a/tests/read.c +++ b/tests/read.c @@ -63,11 +63,14 @@ cb(verto_ctx *ctx, verto_ev *ev) bytes = read(fd, buff, DATALEN); if (callcount++ == 0) { + assert(verto_get_fd_state(ev) & VERTO_EV_FLAG_IO_READ); assert(bytes == DATALEN); close(fds[1]); fds[1] = -1; } else { + if (!(verto_get_fd_state(ev) & VERTO_EV_FLAG_IO_ERROR)) + printf("WARNING: VERTO_EV_FLAG_IO_ERROR not supported!\n"); assert(bytes != DATALEN); close(fd); fds[0] = -1; diff --git a/tests/write.c b/tests/write.c index 97b00e3..0a2422c 100644 --- a/tests/write.c +++ b/tests/write.c @@ -58,6 +58,8 @@ error_cb(verto_ctx *ctx, verto_ev *ev) /* When we get here, the fd should be closed, so an error should occur */ fd = verto_get_fd(ev); + if (!(verto_get_fd_state(ev) & VERTO_EV_FLAG_IO_ERROR)) + printf("WARNING: VERTO_EV_FLAG_IO_ERROR not supported!\n"); assert(write(fd, DATA, DATALEN) != DATALEN); close(fd); fds[1] = -1; @@ -83,6 +85,7 @@ write_cb(verto_ctx *ctx, verto_ev *ev) int fd = 0; fd = verto_get_fd(ev); + assert(verto_get_fd_state(ev) & VERTO_EV_FLAG_IO_WRITE); assert(write(fd, DATA, DATALEN) == DATALEN); assert(verto_add_io(ctx, VERTO_EV_FLAG_IO_READ, read_cb, fds[0]));

1 0

[libverto] add extern "C" to headers
by Nathaniel McCallum 16 Nov '11

16 Nov '11

commit ac362f5f7cf738d7711282ef45022bdf314b28ba Author: Nathaniel McCallum <npmccallum(a)redhat.com> Date: Wed Nov 16 14:38:03 2011 -0500 add extern "C" to headers src/verto-glib.h | 8 ++++++++ src/verto-libev.h | 8 ++++++++ src/verto-libevent.h | 8 ++++++++ src/verto-tevent.h | 8 ++++++++ src/verto.h | 8 ++++++++ 5 files changed, 40 insertions(+), 0 deletions(-) --- diff --git a/src/verto-glib.h b/src/verto-glib.h index 0ce8000..0a8ec2e 100644 --- a/src/verto-glib.h +++ b/src/verto-glib.h @@ -28,6 +28,11 @@ #include <verto.h> #include <glib.h> +#ifdef __cplusplus +extern "C" +{ +#endif /* __cplusplus */ + verto_ctx * verto_new_glib(void); @@ -43,4 +48,7 @@ verto_default_glib(void); verto_ctx * verto_convert_glib(GMainContext *mc, GMainLoop *ml); +#ifdef __cplusplus +} /* extern "C" */ +#endif /* __cplusplus */ #endif /* VERTO_GLIB_H_ */ diff --git a/src/verto-libev.h b/src/verto-libev.h index 497471f..d7fdea5 100644 --- a/src/verto-libev.h +++ b/src/verto-libev.h @@ -28,6 +28,11 @@ #include <verto.h> #include <ev.h> +#ifdef __cplusplus +extern "C" +{ +#endif /* __cplusplus */ + verto_ctx * verto_new_libev(void); @@ -37,4 +42,7 @@ verto_default_libev(void); verto_ctx * verto_convert_libev(struct ev_loop* loop); +#ifdef __cplusplus +} /* extern "C" */ +#endif /* __cplusplus */ #endif /* VERTO_LIBEV_H_ */ diff --git a/src/verto-libevent.h b/src/verto-libevent.h index e21a6e4..ff87b4d 100644 --- a/src/verto-libevent.h +++ b/src/verto-libevent.h @@ -28,6 +28,11 @@ #include <verto.h> #include <event2/event.h> +#ifdef __cplusplus +extern "C" +{ +#endif /* __cplusplus */ + verto_ctx * verto_new_libevent(void); @@ -37,4 +42,7 @@ verto_default_libevent(void); verto_ctx * verto_convert_libevent(struct event_base *ebase); +#ifdef __cplusplus +} /* extern "C" */ +#endif /* __cplusplus */ #endif /* VERTO_LIBEVENT_H_ */ diff --git a/src/verto-tevent.h b/src/verto-tevent.h index aa61694..36a3041 100644 --- a/src/verto-tevent.h +++ b/src/verto-tevent.h @@ -28,6 +28,11 @@ #include <verto.h> #include <tevent.h> +#ifdef __cplusplus +extern "C" +{ +#endif /* __cplusplus */ + verto_ctx * verto_new_tevent(void); @@ -37,4 +42,7 @@ verto_default_tevent(void); verto_ctx * verto_convert_tevent(struct tevent_context *context); +#ifdef __cplusplus +} /* extern "C" */ +#endif /* __cplusplus */ #endif /* VERTO_TEVENT_H_ */ diff --git a/src/verto.h b/src/verto.h index be6545a..c659c2e 100644 --- a/src/verto.h +++ b/src/verto.h @@ -39,6 +39,11 @@ typedef int verto_proc_status; #define VERTO_SIG_IGN ((verto_callback *) 1) +#ifdef __cplusplus +extern "C" +{ +#endif /* __cplusplus */ + typedef struct verto_ctx verto_ctx; typedef struct verto_ev verto_ev; @@ -499,4 +504,7 @@ verto_del(verto_ev *ev); verto_ev_type verto_get_supported_types(verto_ctx *ctx); +#ifdef __cplusplus +} /* extern "C" */ +#endif /* __cplusplus */ #endif /* VERTO_H_ */

1 0

[libverto] Unexpected: Updated refs/remotes/origin/master
by Nathaniel McCallum 12 Nov '11

12 Nov '11

The ref 'refs/remotes/origin/master' was updated from: 999945ba5ec715fb070b5084146cbbb9934a45f2 To: 066a62fd226c7a504c16572a456de3f4ac960d46 This is unexpected because: 'refs/remotes/origin/master' is a tracking branch and doesn't belong on the server

1 0

[libverto] Unexpected: Updated refs/remotes/origin/HEAD
by Nathaniel McCallum 12 Nov '11

12 Nov '11

The ref 'refs/remotes/origin/HEAD' was updated from: 999945ba5ec715fb070b5084146cbbb9934a45f2 To: 066a62fd226c7a504c16572a456de3f4ac960d46 This is unexpected because: 'refs/remotes/origin/HEAD' is a tracking branch and doesn't belong on the server

1 0

[libverto] Unexpected: Updated refs/remotes/origin/0.2.x
by Nathaniel McCallum 12 Nov '11

12 Nov '11

The ref 'refs/remotes/origin/0.2.x' was updated from: 999945ba5ec715fb070b5084146cbbb9934a45f2 To: 066a62fd226c7a504c16572a456de3f4ac960d46 This is unexpected because: 'refs/remotes/origin/0.2.x' is a tracking branch and doesn't belong on the server

1 0

[libverto] [core] add external allocator support
by Nathaniel McCallum 12 Nov '11

12 Nov '11

commit b0c5051b87881ada7217d5cb73bae7e2b3c78000 Author: Nathaniel McCallum <npmccallum(a)redhat.com> Date: Sat Nov 12 12:09:05 2011 -0500 [core] add external allocator support src/verto.c | 63 ++++++++++++++++++++++++++++++++++------------------------ src/verto.h | 19 +++++++++++++++++ tests/abi | 2 +- 3 files changed, 57 insertions(+), 27 deletions(-) --- diff --git a/src/verto.c b/src/verto.c index af41726..bf72e9c 100644 --- a/src/verto.c +++ b/src/verto.c @@ -22,7 +22,7 @@ * SOFTWARE. */ -#define _GNU_SOURCE /* For dladdr(), asprintf() */ +#define _GNU_SOURCE /* For asprintf() */ #include <stdio.h> #include <stdlib.h> @@ -89,6 +89,9 @@ struct module_record { }; static module_record *loaded_modules; +static void *(*resize_cb)(void *mem, size_t size); +static int resize_cb_hierarchical; + #ifdef HAVE_PTHREAD static pthread_mutex_t loaded_modules_mutex = PTHREAD_MUTEX_INITIALIZER; #define mutex_lock(x) pthread_mutex_lock(x) @@ -98,6 +101,15 @@ static pthread_mutex_t loaded_modules_mutex = PTHREAD_MUTEX_INITIALIZER; #define mutex_unlock(x) #endif +#define vfree(mem) vresize(mem, 0) +static void * +vresize(void *mem, size_t size) +{ + if (!resize_cb) + resize_cb = &realloc; + return (*resize_cb)(mem, size); +} + static int int_vasprintf(char **strp, const char *fmt, va_list ap) { va_list apc; @@ -125,19 +137,6 @@ int_asprintf(char **strp, const char *fmt, ...) { } static char * -int_get_table_name(const char *suffix) -{ - char *tmp; - - tmp = malloc(strlen(suffix) + strlen(__str(VERTO_MODULE_TABLE())) + 1); - if (tmp) { - strcpy(tmp, __str(VERTO_MODULE_TABLE())); - strcat(tmp, suffix); - } - return tmp; -} - -static char * int_get_table_name_from_filename(const char *filename) { char *bn = NULL, *tmp = NULL; @@ -160,7 +159,8 @@ int_get_table_name_from_filename(const char *filename) if (tmp) { if (strchr(tmp+1, '.')) { *strchr(tmp+1, '.') = '\0'; - tmp = int_get_table_name(tmp + 1); + if (int_asprintf(&tmp, "%s%s", __str(VERTO_MODULE_TABLE()), tmp + 1) < 0) + tmp = NULL; } else tmp = NULL; } @@ -225,13 +225,13 @@ do_load_file(const char *filename, int reqsym, verto_ev_type reqtypes, mutex_unlock(&loaded_modules_mutex); /* Create our module record */ - tmp = *record = malloc(sizeof(module_record)); + tmp = *record = vresize(NULL, sizeof(module_record)); if (!tmp) return 0; memset(tmp, 0, sizeof(module_record)); tmp->filename = strdup(filename); if (!tmp->filename) { - free(tmp); + vfree(tmp); return 0; } @@ -239,7 +239,7 @@ do_load_file(const char *filename, int reqsym, verto_ev_type reqtypes, tblname = int_get_table_name_from_filename(filename); if (!tblname) { free(tblname); - free(tmp); + vfree(tmp); return 0; } @@ -252,7 +252,7 @@ do_load_file(const char *filename, int reqsym, verto_ev_type reqtypes, free(error); module_close(tmp->dll); free(tblname); - free(tmp); + vfree(tmp); return 0; } @@ -423,7 +423,7 @@ make_ev(verto_ctx *ctx, verto_callback *callback, if (!ctx || !callback) return NULL; - ev = malloc(sizeof(verto_ev)); + ev = vresize(NULL, sizeof(verto_ev)); if (ev) { memset(ev, 0, sizeof(verto_ev)); ev->ctx = ctx; @@ -502,6 +502,17 @@ verto_set_default(const char *impl, verto_ev_type reqtypes) return load_module(impl, reqtypes, &mr); } +int +verto_set_allocator(void *(*resize)(void *mem, size_t size), + int hierarchical) +{ + if (resize_cb || !resize) + return 0; + resize_cb = resize; + resize_cb_hierarchical = hierarchical; + return 1; +} + void verto_free(verto_ctx *ctx) { @@ -520,7 +531,7 @@ verto_free(verto_ctx *ctx) if (!ctx->deflt || !ctx->module->funcs->ctx_default) ctx->module->funcs->ctx_free(ctx->ctx); - free(ctx); + vfree(ctx); } void @@ -599,7 +610,7 @@ verto_reinitialize(verto_ctx *ctx) ev->actual = ev->flags; \ ev->ev = ctx->module->funcs->ctx_add(ctx->ctx, ev, &ev->actual); \ if (!ev->ev) { \ - free(ev); \ + vfree(ev); \ return NULL; \ } \ push_ev(ctx, ev); \ @@ -760,7 +771,7 @@ verto_del(verto_ev *ev) ev->onfree(ev->ctx, ev); ev->ctx->module->funcs->ctx_del(ev->ctx->ctx, ev, ev->ev); remove_ev(&(ev->ctx->events), ev); - free(ev); + vfree(ev); } verto_ev_type @@ -806,7 +817,7 @@ verto_convert_module(const verto_module *module, int deflt, verto_mod_ctx *mctx) goto error; } - ctx = malloc(sizeof(verto_ctx)); + ctx = vresize(NULL, sizeof(verto_ctx)); if (!ctx) goto error; memset(ctx, 0, sizeof(verto_ctx)); @@ -836,9 +847,9 @@ verto_convert_module(const verto_module *module, int deflt, verto_mod_ctx *mctx) } mutex_unlock(&loaded_modules_mutex); - *tmp = malloc(sizeof(module_record)); + *tmp = vresize(NULL, sizeof(module_record)); if (!*tmp) { - free(ctx); + vfree(ctx); goto error; } diff --git a/src/verto.h b/src/verto.h index 23d9a20..be6545a 100644 --- a/src/verto.h +++ b/src/verto.h @@ -171,6 +171,25 @@ int verto_set_default(const char *impl, verto_ev_type reqtypes); /** + * Sets the allocator to use for verto_ctx and verto_ev objects. + * + * If you plan to set the allocator, you MUST call this function before any + * other verto_*() calls. + * + * @see verto_new() + * @see verto_default() + * @see verto_add_io() + * @see verto_add_timeout() + * @see verto_add_idle() + * @see verto_add_signal() + * @see verto_add_child() + * @param resize The allocator to use (behaves like realloc()) + * @param hierarchical Zero if the allocator is not hierarchical + */ +int +verto_set_allocator(void *(*resize)(void *mem, size_t size), int hierarchical); + +/** * Frees a verto_ctx. * * When called on a default verto_ctx, the reference will be freed but the diff --git a/tests/abi b/tests/abi index 09574c6..cbbdf26 100755 --- a/tests/abi +++ b/tests/abi @@ -13,4 +13,4 @@ fi HASH=`nm -g $LIBVERTO | awk '/^[0-9a-fA-F]+ T verto_/ { print $NF; }' | sed 's|^_||' | sort -u | $HASHCMD | cut -d' ' -f1` echo "Hash: $HASH" -test $HASH = a5bbbef2655e2c8114cae9d932f692cc +test $HASH = af68235ae7f8f577dc37536ce1534688

1 0

[libverto] Created tag 0.2.2
by Nathaniel McCallum 11 Nov '11

11 Nov '11

The lightweight tag '0.2.2' was created pointing to: 999945b... [core] bump version number for release

1 0

[libverto] Unexpected: Updated refs/remotes/origin/master
by Nathaniel McCallum 11 Nov '11

11 Nov '11

The ref 'refs/remotes/origin/master' was updated from: 066a62fd226c7a504c16572a456de3f4ac960d46 To: 51484249e2b4fbceee9826c4793a23ca950134b6 This is unexpected because: 'refs/remotes/origin/master' is a tracking branch and doesn't belong on the server

1 0

[libverto] Unexpected: Updated refs/remotes/origin/HEAD
by Nathaniel McCallum 11 Nov '11

11 Nov '11

The ref 'refs/remotes/origin/HEAD' was updated from: 066a62fd226c7a504c16572a456de3f4ac960d46 To: 51484249e2b4fbceee9826c4793a23ca950134b6 This is unexpected because: 'refs/remotes/origin/HEAD' is a tracking branch and doesn't belong on the server

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

libverto-commits November 2011