February 2011 - Triton-commits - mailman3.cels.anl.gov

Triton Repository branch, master, updated. 80aba4cea32ab45d6f11c561522e2b40cf5703cf
by noreply＠mcs.anl.gov 25 Feb '11

25 Feb '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Triton Repository". The branch, master has been updated via 80aba4cea32ab45d6f11c561522e2b40cf5703cf (commit) from 32d930776fced4110dc88849d53cf89ad6cce7be (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 80aba4cea32ab45d6f11c561522e2b40cf5703cf Author: slang <slang(a)mcs.anl.gov> Date: Fri Feb 25 16:58:13 2011 -0600 changes to build on OS X ----------------------------------------------------------------------- Summary of changes: code/configure.ac | 28 ++++++++++++++++++---------- code/src/common/triton-debug.c | 6 ++++++ code/src/kv/test/nb-barrier.c | 2 +- code/src/kv/test/stats.c | 3 ++- code/src/kv/test/test-common.c | 27 ++++++++++++++++++++++++--- 5 files changed, 51 insertions(+), 15 deletions(-) Diff of changes: diff --git a/code/configure.ac b/code/configure.ac index 1dc53b6..de297ba 100644 --- a/code/configure.ac +++ b/code/configure.ac @@ -180,19 +180,27 @@ AC_ARG_ENABLE(coverage, ) AC_SUBST(ENABLE_COVERAGE) -AC_CHECK_HEADERS(sys/epoll.h) -AC_MSG_CHECKING(for epoll functions) -AC_TRY_LINK([#include <sys/epoll.h>], [ - int fd; - fd = epoll_create(1); - close(fd); +AC_MSG_CHECKING(if initstate_r() exists) +AC_TRY_COMPILE([#include <stdlib.h>], [ + struct random_data rnd; + initstate_r(0, NULL, 0, &rnd); ], - AC_MSG_RESULT(yes), - [ -dnl AC_MSG_ERROR(EPOLL: epoll required by aesop resource manager) - ] +[ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_RANDOM_DATA, 1, [Define if struct random_data is defined and initstate_r exists]) +], + AC_MSG_RESULT(no) ) +AC_MSG_CHECKING(for __progname_full) +AC_TRY_LINK( + [#include <stdio.h>], + [extern char * __progname_full; + printf(NULL, "%s", __progname_full);], + [AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_PROGNAME_FULL, 1, Define if __progname_full global variable exists)], + [AC_MSG_RESULT(no)]) + dnl a mechanism to turn off threads in the client library AC_MSG_CHECKING([for client library thread safety support]) AC_ARG_ENABLE(thread-safety, diff --git a/code/src/common/triton-debug.c b/code/src/common/triton-debug.c index 766c3b7..b834cf2 100644 --- a/code/src/common/triton-debug.c +++ b/code/src/common/triton-debug.c @@ -16,8 +16,10 @@ uint32_t triton_debug_enabled_all = 0; uint32_t triton_debug_enabled_none = 1; TRITON_BITARRAY_VARDEF(triton_debug_enabled_minor, TRITON_DEBUG_MAXSIZE); +#ifdef HAVE_PROGNAME_FULL /* TODO: configure test for this; probably glibc specific */ extern char* __progname_full; +#endif static FILE *triton_debug_fp = NULL; static char *triton_debug_enabled_str = NULL; @@ -358,7 +360,11 @@ static triton_ret_t triton_debug_setfile(const char *file) i++; break; case 'e': +#ifdef HAVE_PROGNAME_FULL j += sprintf(&target[j], "%s", __progname_full); +#else + j += sprintf(&target[j], "unknown-program"); +#endif i++; break; case 'h': diff --git a/code/src/kv/test/nb-barrier.c b/code/src/kv/test/nb-barrier.c index 12180f5..a77aec8 100644 --- a/code/src/kv/test/nb-barrier.c +++ b/code/src/kv/test/nb-barrier.c @@ -1,7 +1,7 @@ #include "nb-barrier.h" #include <mpi.h> #include <assert.h> -#include <malloc.h> +#include <stdlib.h> struct nb_barrier { diff --git a/code/src/kv/test/stats.c b/code/src/kv/test/stats.c index 3076649..f750bfa 100644 --- a/code/src/kv/test/stats.c +++ b/code/src/kv/test/stats.c @@ -1,6 +1,7 @@ #include "stats.h" -#include <malloc.h> +#include <stdlib.h> +#include <stdio.h> #include <string.h> #include <float.h> diff --git a/code/src/kv/test/test-common.c b/code/src/kv/test/test-common.c index 5c970f1..a77b787 100644 --- a/code/src/kv/test/test-common.c +++ b/code/src/kv/test/test-common.c @@ -30,17 +30,29 @@ triton_ret_t generateKV (size_t id, size_t seed, void * key, size_t maxkey, *keysize = written; + size_t i; char rnddata[256]; memset (&rnddata[0], 0, sizeof(rnddata)); + char * ptr = (char *) data; + + /* we should probably use openssl rand interfaces where initstate_r + * doesn't exist (Darwin) + */ +#ifdef HAVE_RANDOM_DATA struct random_data rnd; memset (&rnd, 0, sizeof(rnd)); - size_t i; initstate_r (seed, &rnddata[0], sizeof(rnddata), &rnd); - char * ptr = (char *) data; +#else + initstate(seed, &rnddata[0], sizeof(rnddata)); +#endif for (i=0; i<datasize; ++i) { uint32_t val; +#ifdef HAVE_RANDOM_DATA random_r (&rnd, &val); +#else + val = random(); +#endif *ptr++ = val & 0xff; } return TRITON_SUCCESS; @@ -56,15 +68,24 @@ bool validateKV (const void * key, size_t keysize, const void * data, char rnddata[256]; memset (&rnddata[0], 0, sizeof(rnddata)); + size_t i; +#ifdef HAVE_RANDOM_DATA struct random_data rnd; memset (&rnd, 0, sizeof(rnd)); - size_t i; initstate_r (seed, &rnddata[0], sizeof(rnddata), &rnd); +#else + initstate(seed, &rnddata[0], sizeof(rnddata)); +#endif + const char * ptr = (const char *) data; for (i=0; i<datasize; ++i) { uint32_t val; +#ifdef HAVE_RANDOM_DATA random_r (&rnd, &val); +#else + val = random(); +#endif if (*ptr++ != (val && 0xff)) return false; hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. 32d930776fced4110dc88849d53cf89ad6cce7be
by noreply＠mcs.anl.gov 25 Feb '11

25 Feb '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Triton Repository". The branch, master has been updated via 32d930776fced4110dc88849d53cf89ad6cce7be (commit) from 6c92329e6d3440d7e78f76a5c611cff1d86e4be9 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 32d930776fced4110dc88849d53cf89ad6cce7be Author: slang <slang(a)mcs.anl.gov> Date: Fri Feb 25 13:47:09 2011 -0600 minor fixes for OS X ----------------------------------------------------------------------- Summary of changes: code/Makefile.in | 17 +++++++++-------- code/configure.ac | 4 +++- code/src/common/resources/timer/timer.c | 4 ++++ 3 files changed, 16 insertions(+), 9 deletions(-) Diff of changes: diff --git a/code/Makefile.in b/code/Makefile.in index 88cd116..c11a215 100644 --- a/code/Makefile.in +++ b/code/Makefile.in @@ -284,6 +284,7 @@ modname = $(MODNAME_$(call canonname,$(1))) \ # use TCC variable so that we can keep CC as the system compiler TCC = $(if $(MPICC), $(MPICC), $(CC)) +CPPCC = $(CC) modcc = $(if $(MODCC_$(1)), \ $(MODCC_$(1)),$(TCC)) @@ -467,7 +468,7 @@ DOCHTML=$(patsubst %.doc,%.html,$(DOCSRC)) $(TESTOBJS_DEPENDS) $(LIBOBJS_DEPENDS) $(TESTLIBOBJS_DEPENDS): %.d: %.c $(Q) " DEP $@" - $(E)$(TCC) -MT $(patsubst %.d,%.o,$@) -MM -MG -MF $@ $< $(LIBCFLAGS) $(CFLAGS) $(CWARNS) $(call MODCFLAGS,$*) + $(E)$(CPPCC) -MT $(patsubst %.d,%.o,$@) -MM -MG -MF $@ $< $(LIBCFLAGS) $(CFLAGS) $(CWARNS) $(call MODCFLAGS,$*) $(TEST): %: %.o $(LIBRARIES) $(TEST_LIBRARIES) $(Q) " LD $@" @@ -504,7 +505,7 @@ $(LIBOBJS) $(TESTOBJS): %.o: %.d $(GENLIBOBJS_DEPENDS): %.d: %.c $(Q) " DEP $@" - $(E)$(TCC) -MT $(patsubst %.d,%.o,$@) -MM -MG -MF $@ $(builddir)/$< $(LIBCFLAGS) $(CFLAGS) $(CWARNS) $(call MODCFLAGS,$*) + $(E)$(CPPCC) -MT $(patsubst %.d,%.o,$@) -MM -MG -MF $@ $(builddir)/$< $(LIBCFLAGS) $(CFLAGS) $(CWARNS) $(call MODCFLAGS,$*) $(GENLIBOBJS): %.o: %.d $(Q) " CC $@" @@ -572,7 +573,7 @@ lib/libtriton-test.dylib: $(AETESTLIBOBJS) $(REMOTE_TESTLIBOBJS) $(REMOTE_TESTLI $(AEOBJS_DEPENDS): %.d: %.ae $(Q) " DEP $@" - $(E)$(TCC) -x c -MT $(patsubst %.d,%.ae.i,$@) -MM -MG -MF $@ $< $(LIBCFLAGS) $(CFLAGS) $(CWARNS) $(call MODCFLAGS_AE,$*) + $(E)$(CPPCC) -x c -MT $(patsubst %.d,%.ae.i,$@) -MM -MG -MF $@ $< $(LIBCFLAGS) $(CFLAGS) $(CWARNS) $(call MODCFLAGS_AE,$*) $(AEOBJS): %.o: $(HSBIN) %.d %.ae.s $(Q) " CC $* (.ae.s -> .o)" @@ -624,7 +625,7 @@ endif $(AESOP_TRHDR_DEPENDS): %.hae.d: %.hae $(Q) " DEP $@" - $(E)$(TCC) -x c -MT $(patsubst %.hae.d,%.hae.i,$@) -MM -MG -MF $@ $< $(LIBCFLAGS) $(CFLAGS) $(CWARNS) $(call MODCFLAGS_AE,$*) + $(E)$(CPPCC) -x c -MT $(patsubst %.hae.d,%.hae.i,$@) -MM -MG -MF $@ $< $(LIBCFLAGS) $(CFLAGS) $(CWARNS) $(call MODCFLAGS_AE,$*) %.hae.i: %.hae.d $(E)$(call MCC_AE,$*) -I$(srcdir)/include/ -x c -E -o $*.hae.i \ @@ -639,7 +640,7 @@ $(AESOP_TRHDR): %.h: %.hae.i $(HSBIN) $(REMOTE_TRHDR_DEPENDS): %.haer.d: %.haer $(Q) " DEP $@" - $(E)$(TCC) -x c -MT $(patsubst %.haer.d,%.haer.i,$@) -MM -MG -MF $@ $< $(LIBCFLAGS) $(CFLAGS) $(CWARNS) $(call MODCFLAGS_AE,$*) + $(E)$(CPPCC) -x c -MT $(patsubst %.haer.d,%.haer.i,$@) -MM -MG -MF $@ $< $(LIBCFLAGS) $(CFLAGS) $(CWARNS) $(call MODCFLAGS_AE,$*) %.haer.i: %.haer.d $(E)$(call MCC_AE,$*) -I$(srcdir)/include/ -x c -E -o $*.haer.i \ @@ -661,7 +662,7 @@ $(REMOTE_TRHDR): %.h: %.haer.r $(HSBIN) $(REMOTE_OBJS_DEPENDS): %.d: %.aer $(Q) " DEP $@" - $(E)$(TCC) -x c -MT $(patsubst %.d,%.aer.i,$@) -MM -MG -MF $@ $< $(LIBCFLAGS) $(CFLAGS) $(CWARNS) $(call MODCFLAGS_AE,$*) + $(E)$(CPPCC) -x c -MT $(patsubst %.d,%.aer.i,$@) -MM -MG -MF $@ $< $(LIBCFLAGS) $(CFLAGS) $(CWARNS) $(call MODCFLAGS_AE,$*) $(REMOTE_OBJS): %.o: $(HSBIN) %.d %.aer.r.s $(Q) " CC $* (.aer.r.s -> .o)" @@ -723,7 +724,7 @@ endif $(REMOTE_LIB_MODOBJS_DEPENDS): %_module.d: %_module.ae $(Q) " DEP $@" - $(E)$(TCC) -x c -MT $(patsubst %.d,%.ae.i,$@) -MM -MG -MF $@ $< $(LIBCFLAGS) $(CFLAGS) $(CWARNS) $(call MODCFLAGS_AE,$*) + $(E)$(CPPCC) -x c -MT $(patsubst %.d,%.ae.i,$@) -MM -MG -MF $@ $< $(LIBCFLAGS) $(CFLAGS) $(CWARNS) $(call MODCFLAGS_AE,$*) $(REMOTE_LIB_MODSRC_DEPENDS): %_module.ae.d: $(Q) " DEP $@" @@ -733,7 +734,7 @@ $(REMOTE_LIB_MODSRC_DEPENDS): %_module.ae.d: $(REMOTE_TESTLIB_MODOBJS_DEPENDS): %_module.d: %_module.ae $(Q) " DEP $@" - $(E)$(TCC) -x c -MT $(patsubst %.d,%.ae.i,$@) -MM -MG -MF $@ $< $(LIBCFLAGS) $(CFLAGS) $(CWARNS) $(call MODCFLAGS_AE,$*) + $(E)$(CPPCC) -x c -MT $(patsubst %.d,%.ae.i,$@) -MM -MG -MF $@ $< $(LIBCFLAGS) $(CFLAGS) $(CWARNS) $(call MODCFLAGS_AE,$*) $(REMOTE_TESTLIB_MODSRC_DEPENDS): %_module.ae.d: $(Q) " DEP $@" diff --git a/code/configure.ac b/code/configure.ac index 977789b..1dc53b6 100644 --- a/code/configure.ac +++ b/code/configure.ac @@ -188,7 +188,9 @@ AC_TRY_LINK([#include <sys/epoll.h>], [ close(fd); ], AC_MSG_RESULT(yes), - AC_MSG_ERROR(EPOLL: epoll required by aesop resource manager) + [ +dnl AC_MSG_ERROR(EPOLL: epoll required by aesop resource manager) + ] ) dnl a mechanism to turn off threads in the client library diff --git a/code/src/common/resources/timer/timer.c b/code/src/common/resources/timer/timer.c index 1aa3dee..b8ec744 100644 --- a/code/src/common/resources/timer/timer.c +++ b/code/src/common/resources/timer/timer.c @@ -55,7 +55,9 @@ ae_define_post(triton_ret_t, triton_timer, int millisecs) struct ae_op *op; struct ae_op *iter, *safe, *holder; struct timer_op *timer_op_iter; +#ifndef __AESOP_LIBEV struct itimerspec tspec; +#endif op = ae_opcache_get(timer_opcache); ae_op_fill(op); @@ -150,8 +152,10 @@ static triton_ret_t triton_timer_cancel(ae_context_t triton_ctx, ae_op_id_t op_i * that no longer exists) , or does aesop do that for us? */ +#ifndef __AESOP_LIBEV struct itimerspec tspec; struct itimerspec old_tspec; +#endif int cache_id, resource_id; struct ae_op *op; struct timer_op *top; hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. 6c92329e6d3440d7e78f76a5c611cff1d86e4be9
by noreply＠mcs.anl.gov 25 Feb '11

25 Feb '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Triton Repository". The branch, master has been updated via 6c92329e6d3440d7e78f76a5c611cff1d86e4be9 (commit) via 218340118657b2c8d477a28198405a712d7e51b9 (commit) from 074f9e76d35a042e476ece68bcb0487b6eb1bad0 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 6c92329e6d3440d7e78f76a5c611cff1d86e4be9 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Fri Feb 25 14:12:05 2011 -0500 turn off warnings for libev object build commit 218340118657b2c8d477a28198405a712d7e51b9 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Fri Feb 25 14:09:47 2011 -0500 new libev based timer resource ----------------------------------------------------------------------- Summary of changes: code/src/aesop/resource.c | 9 +++++ code/src/aesop/resource.h | 6 +++ code/src/common/libev/module.mk.in | 5 ++- code/src/common/resources/timer/timer.c | 58 ++++++++++++++++++++++++++++-- 4 files changed, 73 insertions(+), 5 deletions(-) Diff of changes: diff --git a/code/src/aesop/resource.c b/code/src/aesop/resource.c index 2b2c2d2..85a17b2 100644 --- a/code/src/aesop/resource.c +++ b/code/src/aesop/resource.c @@ -863,6 +863,15 @@ triton_ret_t ae_error_wrap_stack(struct ae_ctl *ctl, triton_ret_t parent) return ret; } +#ifdef __AESOP_LIBEV +struct ev_loop * ae_resource_get_eloop(ae_context_t context) +{ + if(!context) + return(eloop); + else + return(context->eloop); +} +#endif /* diff --git a/code/src/aesop/resource.h b/code/src/aesop/resource.h index 39f3ebf..49a3c73 100644 --- a/code/src/aesop/resource.h +++ b/code/src/aesop/resource.h @@ -60,6 +60,12 @@ struct ae_resource triton_ret_t ae_resource_register(struct ae_resource *resource, int *newid); void ae_resource_unregister(int resource_id); void ae_resource_request_poll(ae_context_t context, int resource_id); +#ifdef __AESOP_LIBEV +/* this function is used by resources that want access to the event loop + * used by aesop for this context + */ +struct ev_loop * ae_resource_get_eloop(ae_context_t context); +#endif /* Contexts are created to allow separation of polling for different logical * groups of operations. Don't use this function. Instead, use the associated diff --git a/code/src/common/libev/module.mk.in b/code/src/common/libev/module.mk.in index bd24ccf..0fa8213 100644 --- a/code/src/common/libev/module.mk.in +++ b/code/src/common/libev/module.mk.in @@ -8,4 +8,7 @@ LIBSRC += $(DIR)/ev.c \ # Tell libev to use our config.h instead of its own. # This is in the top level makefile now so that it catches the dependency # generation step as well. -# MODCFLAGS_$(DIR) = -DEV_CONFIG_H=\"triton-config.h\" +# MODCFLAGS_$(DIR) = -DEV_CONFIG_H=\"triton-config.h\" -w + +# turn off warnings for libev compile +MODCFLAGS_$(DIR) = -w diff --git a/code/src/common/resources/timer/timer.c b/code/src/common/resources/timer/timer.c index 18fb1e2..1aa3dee 100644 --- a/code/src/common/resources/timer/timer.c +++ b/code/src/common/resources/timer/timer.c @@ -11,23 +11,30 @@ #include "src/aesop/opcache.h" #include "src/common/resources/timer/timer.h" #include "src/common/triton-init.h" +#ifdef __AESOP_LIBEV +#include "src/common/libev/ev.h" +#endif /* NOTES: * * This resource uses the POSIX timer interface to implement an aesop timer * resource. The aesop callbacks are driven directly from the timer * notfication function. - * - * TODO: optional support for libev */ #define TIMER_DEFAULT_SIZE 1024 static ae_opcache_t timer_opcache; static int triton_timer_resource_id; +#ifdef __AESOP_LIBEV +static ev_timer timer_watcher; +static struct ev_loop* timer_loop = NULL; +static void timer_cb(EV_P_ ev_timer *w, int revents); +#else static timer_t timer_id; static struct sigevent evp; static void timer_notify(union sigval sv); +#endif struct timer_op { @@ -93,12 +100,20 @@ ae_define_post(triton_ret_t, triton_timer, int millisecs) if(holder == op) { /* new head of queue; arm a new timer or modify the existing one */ +#ifdef __AESOP_LIBEV + if(timer_loop) + ev_timer_stop(timer_loop, &timer_watcher); + ev_timer_set(&timer_watcher, (((ev_tstamp)millisecs)/1000.0), 0); + timer_loop = ae_resource_get_eloop(op->ctx); + ev_timer_start(timer_loop, &timer_watcher); +#else memset(&tspec, 0, sizeof(tspec)); tspec.it_value.tv_sec = (int)(millisecs/1000); tspec.it_value.tv_nsec = (millisecs % 1000) * 1e6; ret = timer_settime(timer_id, 0, &tspec, NULL); /* TODO: error handling (cancel all remaining timers?) */ assert(ret == 0); +#endif } *__ae_op_id = top->op_id; @@ -167,15 +182,24 @@ static triton_ret_t triton_timer_cancel(ae_context_t triton_ctx, ae_op_id_t op_i * strictly necessary and reset itself. */ - /* move to a special queue of cancelled timers */ assert(ae_ops_exists(&timer_oplist, &op->link)); ae_ops_del(op); +#if 0 + /* TODO: note: ideally we would like to just go ahead and trigger the + * callback directly here instead of queueing and requesting a poll, but + * right now that causes a race condition of some sort in aesop. + */ + triton_mutex_unlock(&timer_mutex); + ae_opcache_complete_op(timer_opcache, op, triton_ret_t, TRITON_ERR_CANCELED); +#else + /* move to a special queue of cancelled timers */ ctx = op->ctx; ae_ops_enqueue(op, &cancel_oplist); /* request a poll for aesop to harvest the cancelled timer */ ae_resource_request_poll(ctx, triton_timer_resource_id); triton_mutex_unlock(&timer_mutex); +#endif return TRITON_SUCCESS; } @@ -199,6 +223,9 @@ triton_ret_t triton_timer_init(void) triton_ret_t tret; int ret; +#ifdef __AESOP_LIBEV + ev_init(&timer_watcher, timer_cb); +#else memset(&evp, 0, sizeof(evp)); evp.sigev_notify = SIGEV_THREAD; evp.sigev_value.sival_ptr = NULL; @@ -210,6 +237,7 @@ triton_ret_t triton_timer_init(void) triton_err(triton_log_default, "Error: failed to create timer."); return(TRITON_ERR_NOMEM); } +#endif ae_ops_init(&timer_oplist); ae_ops_init(&cancel_oplist); @@ -227,12 +255,21 @@ void triton_timer_finalize(void) { ae_resource_unregister(triton_timer_resource_id); +#ifdef __AESOP_LIBEV + if(timer_loop) + ev_timer_stop(timer_loop, &timer_watcher); +#else timer_delete(timer_id); +#endif ae_opcache_destroy(timer_opcache); } +#ifdef __AESOP_LIBEV +static void timer_cb(EV_P_ ev_timer *w, int revents) +#else static void timer_notify(union sigval sv) +#endif { struct ae_op *gop; struct timer_op *top; @@ -240,8 +277,12 @@ static void timer_notify(union sigval sv) struct timeval diff; int did_something = 0; ae_context_t ctx; - struct itimerspec tspec; int ret; +#ifdef __AESOP_LIBEV + ev_tstamp tstamp; +#else + struct itimerspec tspec; +#endif triton_mutex_lock(&timer_mutex); @@ -286,12 +327,21 @@ static void timer_notify(union sigval sv) diff.tv_usec = 1; } +#ifdef __AESOP_LIBEV + tstamp = (ev_tstamp)diff.tv_sec + (ev_tstamp)diff.tv_usec / 1000000.0; + if(timer_loop) + ev_timer_stop(timer_loop, &timer_watcher); + ev_timer_set(&timer_watcher, tstamp, 0); + timer_loop = ae_resource_get_eloop(gop->ctx); + ev_timer_start(timer_loop, &timer_watcher); +#else memset(&tspec, 0, sizeof(tspec)); tspec.it_value.tv_sec = diff.tv_sec; tspec.it_value.tv_nsec = diff.tv_usec * 1e3; ret = timer_settime(timer_id, 0, &tspec, NULL); /* TODO: error handling (cancel all remaining timers?) */ assert(ret == 0); +#endif } triton_mutex_unlock(&timer_mutex); hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. 074f9e76d35a042e476ece68bcb0487b6eb1bad0
by noreply＠mcs.anl.gov 25 Feb '11

25 Feb '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Triton Repository". The branch, master has been updated via 074f9e76d35a042e476ece68bcb0487b6eb1bad0 (commit) from e5d0a0d2cb2f2d148913b41b63906c03d1371b16 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 074f9e76d35a042e476ece68bcb0487b6eb1bad0 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Fri Feb 25 11:59:27 2011 -0500 rework timer resource to only use one posix timer ----------------------------------------------------------------------- Summary of changes: code/src/common/resources/timer/timer.c | 236 +++++++++++++++++------------- 1 files changed, 134 insertions(+), 102 deletions(-) Diff of changes: diff --git a/code/src/common/resources/timer/timer.c b/code/src/common/resources/timer/timer.c index aefba7a..18fb1e2 100644 --- a/code/src/common/resources/timer/timer.c +++ b/code/src/common/resources/timer/timer.c @@ -18,29 +18,20 @@ * resource. The aesop callbacks are driven directly from the timer * notfication function. * - * This design seems to work ok, but for future reference: an - * alternative design would be to put the timer ops in a sorted queue and - * then have the posix timer notification functions simply trigger - * ae_resource_request_poll() so that the poll function can scan the timer - * queue. That would eliminate race conditions because superfluous timer - * notifications would simply trigger harmless additional poll calls. - * - * It would also be better to simply set one timer at a time (for the - * earliest timer that needs to be triggered). - * - * Also, if we continue to use libev, we could use its timer functionality - * instead of the posix timers. + * TODO: optional support for libev */ #define TIMER_DEFAULT_SIZE 1024 static ae_opcache_t timer_opcache; - static int triton_timer_resource_id; +static timer_t timer_id; +static struct sigevent evp; +static void timer_notify(union sigval sv); struct timer_op { - timer_t timer_id; + struct timeval timer; ae_op_id_t op_id; struct ae_op op; triton_ret_t tret; @@ -49,15 +40,15 @@ static triton_mutex_t timer_mutex = TRITON_MUTEX_INITIALIZER; static ae_ops_t timer_oplist; static ae_ops_t cancel_oplist; -static void timer_notify(union sigval sv); - ae_define_post(triton_ret_t, triton_timer, int millisecs) { + struct timeval adjust, now; int ret; - struct itimerspec tspec; - struct sigevent evp; struct timer_op *top; struct ae_op *op; + struct ae_op *iter, *safe, *holder; + struct timer_op *timer_op_iter; + struct itimerspec tspec; op = ae_opcache_get(timer_opcache); ae_op_fill(op); @@ -66,40 +57,54 @@ ae_define_post(triton_ret_t, triton_timer, int millisecs) top->op_id = ae_id_gen(triton_timer_resource_id, (uint64_t)(op->cache_id)); top->tret = TRITON_SUCCESS; - memset(&tspec, 0, sizeof(tspec)); - tspec.it_value.tv_sec = (int)(millisecs/1000); - tspec.it_value.tv_nsec = (millisecs % 1000) * 1e6; + adjust.tv_sec = (int)(millisecs / 1e3); + adjust.tv_usec = (millisecs % 1000) * 1e3; + gettimeofday(&now, NULL); + timeradd(&adjust, &now, &(top->timer)); - memset(&evp, 0, sizeof(evp)); - evp.sigev_notify = SIGEV_THREAD; - evp.sigev_value.sival_ptr = op; - evp.sigev_notify_function = timer_notify; + triton_mutex_lock(&timer_mutex); + //holder = ae_ops_peek(&timer_oplist); + holder = NULL; + /* NOTE: we search the timer list from the back, on the assumption that + * the newest timers added are most likely to be the furthest away from + * completion. We will often see the same millisecs value over and + * over. + */ + ae_ops_for_each_reverse(iter, safe, &timer_oplist) + { + timer_op_iter = ae_op_entry(iter, struct timer_op, op); + if(timercmp(&(top->timer), &(timer_op_iter->timer), >)) + { + break; + } + holder = iter; + } + if(holder) + { + ae_ops_insert_before(op, holder, &timer_oplist); + } + else + { + ae_ops_enqueue(op, &timer_oplist); + } - ret = timer_create(CLOCK_REALTIME, &evp, &top->timer_id); - if(ret != 0) + /* Did this end up at the head of the queue? */ + holder = ae_ops_peek(&timer_oplist); + if(holder == op) { - fprintf(stderr, "errno: %d\n", errno); - triton_err(triton_log_default, "Error: failed to create timer."); - return(TRITON_ERR_NOMEM); + /* new head of queue; arm a new timer or modify the existing one */ + memset(&tspec, 0, sizeof(tspec)); + tspec.it_value.tv_sec = (int)(millisecs/1000); + tspec.it_value.tv_nsec = (millisecs % 1000) * 1e6; + ret = timer_settime(timer_id, 0, &tspec, NULL); + /* TODO: error handling (cancel all remaining timers?) */ + assert(ret == 0); } *__ae_op_id = top->op_id; - triton_mutex_lock(&timer_mutex); - ae_ops_enqueue(op, &timer_oplist); triton_mutex_unlock(&timer_mutex); - ret = timer_settime(top->timer_id, 0, &tspec, NULL); - if(ret != 0) - { - timer_delete(top->timer_id); - triton_mutex_lock(&timer_mutex); - ae_ops_del(op); - ae_opcache_put(timer_opcache, op); - triton_mutex_unlock(&timer_mutex); - return(TRITON_ERR_INVAL); - } - return TRITON_SUCCESS; } @@ -107,9 +112,7 @@ static triton_ret_t triton_timer_poll(ae_context_t context) { struct ae_op *op; struct timer_op *top; -#if 0 - /* nothing to do here; this resource is purely thread driven */ -#else + /* harvest any timers that have been cancelled */ triton_mutex_lock(&timer_mutex); while((op = ae_ops_dequeue(&cancel_oplist))) @@ -118,13 +121,11 @@ static triton_ret_t triton_timer_poll(ae_context_t context) top = ae_op_entry(op, struct timer_op, op); assert(top->tret == TRITON_ERR_CANCELED); - - timer_delete(top->timer_id); ae_opcache_complete_op(timer_opcache, op, triton_ret_t, top->tret); triton_mutex_lock(&timer_mutex); } triton_mutex_unlock(&timer_mutex); -#endif + return TRITON_SUCCESS; } @@ -161,42 +162,18 @@ static triton_ret_t triton_timer_cancel(ae_context_t triton_ctx, ae_op_id_t op_i top = ae_op_entry(op, struct timer_op, op); top->tret = TRITON_ERR_CANCELED; - /* NOTE: although we hold a mutex lock here, the timer could still have - * completed and fired the callback function (which is now waiting on - * the mutex). We can detect that scenario by checking the output - * argument of timer_settime(). - * + /* NOTE: don't bother modifying the posix timer when we cancel + * something. In the worst case it will fire one time more than is + * strictly necessary and reset itself. */ - /* disarm timer */ - memset(&tspec, 0, sizeof(tspec)); - timer_settime(top->timer_id, 0, &tspec, &old_tspec); - if(old_tspec.it_value.tv_sec != 0 || old_tspec.it_value.tv_nsec != 0) - { -#if 0 - /* timer had not fired yet; re-arm it for 1 nsec in the future so - * that the normal completion function executes and propigates the - * ERR_CANCELED return code - */ - tspec.it_value.tv_sec = 0; - tspec.it_value.tv_nsec = 1; - timer_settime(top->timer_id, 0, &tspec, NULL); -#else - /* move to a special queue of cancelled timers */ - assert(ae_ops_exists(&timer_oplist, &op->link)); - ae_ops_del(op); - ctx = op->ctx; - ae_ops_enqueue(op, &cancel_oplist); - /* request a poll for aesop to harvest the cancelled timer */ - ae_resource_request_poll(ctx, triton_timer_resource_id); -#endif - } - else - { - /* Timer already fired, but has not yet acquired the timer_mutex. - * We can let it complete naturally from here. - */ - } + /* move to a special queue of cancelled timers */ + assert(ae_ops_exists(&timer_oplist, &op->link)); + ae_ops_del(op); + ctx = op->ctx; + ae_ops_enqueue(op, &cancel_oplist); + /* request a poll for aesop to harvest the cancelled timer */ + ae_resource_request_poll(ctx, triton_timer_resource_id); triton_mutex_unlock(&timer_mutex); @@ -219,15 +196,28 @@ __attribute__((constructor)) void triton_timer_init_register(void) triton_ret_t triton_timer_init(void) { - triton_ret_t ret; + triton_ret_t tret; + int ret; + memset(&evp, 0, sizeof(evp)); + evp.sigev_notify = SIGEV_THREAD; + evp.sigev_value.sival_ptr = NULL; + evp.sigev_notify_function = timer_notify; + + ret = timer_create(CLOCK_REALTIME, &evp, &timer_id); + if(ret < 0) + { + triton_err(triton_log_default, "Error: failed to create timer."); + return(TRITON_ERR_NOMEM); + } + ae_ops_init(&timer_oplist); ae_ops_init(&cancel_oplist); - ret = AE_OPCACHE_INIT(struct timer_op, op, TIMER_DEFAULT_SIZE, &timer_opcache); - if(ret != TRITON_SUCCESS) + tret = AE_OPCACHE_INIT(struct timer_op, op, TIMER_DEFAULT_SIZE, &timer_opcache); + if(tret != TRITON_SUCCESS) { - return ret; + return tret; } return ae_resource_register(&triton_timer_resource, &triton_timer_resource_id); @@ -237,32 +227,74 @@ void triton_timer_finalize(void) { ae_resource_unregister(triton_timer_resource_id); + timer_delete(timer_id); + ae_opcache_destroy(timer_opcache); } static void timer_notify(union sigval sv) { - struct ae_op *op; + struct ae_op *gop; struct timer_op *top; + struct timeval now; + struct timeval diff; + int did_something = 0; ae_context_t ctx; + struct itimerspec tspec; + int ret; + + triton_mutex_lock(&timer_mutex); - op = sv.sival_ptr; - top = ae_op_entry(op, struct timer_op, op); + gop = ae_ops_peek(&timer_oplist); + top = ae_op_entry(gop, struct timer_op, op); - triton_mutex_lock(&timer_mutex); - assert(ae_ops_exists(&timer_oplist, &op->link)); - ae_ops_del(op); - triton_mutex_unlock(&timer_mutex); + gettimeofday(&now, NULL); - ctx = op->ctx; - timer_delete(top->timer_id); - ae_opcache_complete_op(timer_opcache, op, triton_ret_t, top->tret); + /* complete the timers that have hit (t < now) */ + while(top && timercmp(&(top->timer), &now, <)) + { + /* this timer has hit, so we pop and call callback */ + gop = ae_ops_dequeue(&timer_oplist); + top = ae_op_entry(gop, struct timer_op, op); + triton_mutex_unlock(&timer_mutex); - /* request poll; not because ae_poll() needs to drive any work, but - * simply because we want it to break out if any callers are blocking on - * it - */ - ae_resource_request_poll(ctx, triton_timer_resource_id); + ctx = gop->ctx; + ae_opcache_complete_op(timer_opcache, gop, triton_ret_t, TRITON_SUCCESS); + /* request poll; not because ae_poll() needs to drive any work, but + * simply because we want it to break out if any callers are blocking on + * it + */ + ae_resource_request_poll(ctx, triton_timer_resource_id); + + /* setup for next iteration */ + triton_mutex_lock(&timer_mutex); + gop = ae_ops_peek(&timer_oplist); + top = ae_op_entry(gop, struct timer_op, op); + } + + /* is there anything left in the queue? If so, arm the timer again */ + gop = ae_ops_peek(&timer_oplist); + top = ae_op_entry(gop, struct timer_op, op); + if(top) + { + gettimeofday(&now, NULL); + timersub(&top->timer, &now, &diff); + if(diff.tv_sec < 0 || diff.tv_usec < 0) + { + /* whoops, we already need to harvest this one */ + diff.tv_sec = 0; + diff.tv_usec = 1; + } + + memset(&tspec, 0, sizeof(tspec)); + tspec.it_value.tv_sec = diff.tv_sec; + tspec.it_value.tv_nsec = diff.tv_usec * 1e3; + ret = timer_settime(timer_id, 0, &tspec, NULL); + /* TODO: error handling (cancel all remaining timers?) */ + assert(ret == 0); + } + + triton_mutex_unlock(&timer_mutex); return; } hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. e5d0a0d2cb2f2d148913b41b63906c03d1371b16
by noreply＠mcs.anl.gov 25 Feb '11

25 Feb '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Triton Repository". The branch, master has been updated via e5d0a0d2cb2f2d148913b41b63906c03d1371b16 (commit) via ed617387ef804d6b328cff26e84e660b443fd0b7 (commit) from fca9dc4c99b652fc4c6060afdde414b077a4bab4 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit e5d0a0d2cb2f2d148913b41b63906c03d1371b16 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Fri Feb 25 10:39:19 2011 -0500 utility functions for backwards queue search commit ed617387ef804d6b328cff26e84e660b443fd0b7 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Fri Feb 25 10:38:30 2011 -0500 bugfix: delete completed timers properly ----------------------------------------------------------------------- Summary of changes: code/src/aesop/op.h | 1 + code/src/common/resources/timer/timer.c | 7 +++++++ code/src/common/triton-list.h | 15 +++++++++++++++ 3 files changed, 23 insertions(+), 0 deletions(-) Diff of changes: diff --git a/code/src/aesop/op.h b/code/src/aesop/op.h index 8f17660..888f346 100644 --- a/code/src/aesop/op.h +++ b/code/src/aesop/op.h @@ -78,6 +78,7 @@ static inline ae_op_t *ae_ops_peek(ae_ops_t *queue) } #define ae_ops_for_each(_pos, _safe, _ops) triton_list_for_each_entry(_pos, _safe, _ops, struct ae_op, link) +#define ae_ops_for_each_reverse(_pos, _safe, _ops) triton_list_for_each_entry_reverse(_pos, _safe, _ops, struct ae_op, link) #define ae_ops_exists(_ops, _op) triton_list_exists(_ops, _op) #define ae_ops_count(_ops) triton_list_count(_ops) #define ae_ops_find(_ops, _compare, _ptr) triton_list_find(_ops, _compare, _ptr) diff --git a/code/src/common/resources/timer/timer.c b/code/src/common/resources/timer/timer.c index 00467c9..aefba7a 100644 --- a/code/src/common/resources/timer/timer.c +++ b/code/src/common/resources/timer/timer.c @@ -78,6 +78,7 @@ ae_define_post(triton_ret_t, triton_timer, int millisecs) ret = timer_create(CLOCK_REALTIME, &evp, &top->timer_id); if(ret != 0) { + fprintf(stderr, "errno: %d\n", errno); triton_err(triton_log_default, "Error: failed to create timer."); return(TRITON_ERR_NOMEM); } @@ -92,6 +93,10 @@ ae_define_post(triton_ret_t, triton_timer, int millisecs) if(ret != 0) { timer_delete(top->timer_id); + triton_mutex_lock(&timer_mutex); + ae_ops_del(op); + ae_opcache_put(timer_opcache, op); + triton_mutex_unlock(&timer_mutex); return(TRITON_ERR_INVAL); } @@ -114,6 +119,7 @@ static triton_ret_t triton_timer_poll(ae_context_t context) top = ae_op_entry(op, struct timer_op, op); assert(top->tret == TRITON_ERR_CANCELED); + timer_delete(top->timer_id); ae_opcache_complete_op(timer_opcache, op, triton_ret_t, top->tret); triton_mutex_lock(&timer_mutex); } @@ -249,6 +255,7 @@ static void timer_notify(union sigval sv) triton_mutex_unlock(&timer_mutex); ctx = op->ctx; + timer_delete(top->timer_id); ae_opcache_complete_op(timer_opcache, op, triton_ret_t, top->tret); /* request poll; not because ae_poll() needs to drive any work, but diff --git a/code/src/common/triton-list.h b/code/src/common/triton-list.h index 45060e9..650744e 100644 --- a/code/src/common/triton-list.h +++ b/code/src/common/triton-list.h @@ -115,6 +115,21 @@ static inline uint64_t triton_list_count(triton_list_t *list) __pos != (triton_list_tolink(__list)); \ __pos = __scratch, __scratch = (__pos)->next) +/** + * triton_list_for_each_entry_reverse - + * iterate over list of given type safe against removal of list entry + * running from back to front of list + * @pos: the type * to use as a loop counter. + * @head: the head for your list. + * @member: the name of the list_struct within the struct. + */ +#define triton_list_for_each_entry_reverse(__pos, __scratch, __list, __type, __member) \ + for (__pos = triton_list_get_entry((triton_list_tolink(__list))->prev, __type, __member), \ + __scratch = triton_list_get_entry((triton_list_tolink(__list))->prev->prev, __type, __member); \ + (__pos) && (&(__pos)->__member != (triton_list_tolink(__list))); \ + __pos = __scratch, \ + __scratch = triton_list_get_entry((__pos)->__member.prev, __type, __member)) + /** * triton_list_for_each_entry - hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. fca9dc4c99b652fc4c6060afdde414b077a4bab4
by noreply＠mcs.anl.gov 24 Feb '11

24 Feb '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Triton Repository". The branch, master has been updated via fca9dc4c99b652fc4c6060afdde414b077a4bab4 (commit) from f3122c10fac32e58c48ef9544a3c61f1bdc00016 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit fca9dc4c99b652fc4c6060afdde414b077a4bab4 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Thu Feb 24 21:47:43 2011 -0500 another hint leak fix ----------------------------------------------------------------------- Summary of changes: code/src/aesop/ae-blocking-parser.h | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) Diff of changes: diff --git a/code/src/aesop/ae-blocking-parser.h b/code/src/aesop/ae-blocking-parser.h index b2aed03..d038548 100644 --- a/code/src/aesop/ae-blocking-parser.h +++ b/code/src/aesop/ae-blocking-parser.h @@ -180,13 +180,6 @@ } \ ae_ctl_init(&ctl->gen, #__ctl_type ":" #__pbranch_id, NULL, parent_ctl->gen.context, 1, parent_ctl); \ ctl->parent = parent_ctl; \ - ctl->gen.hints = malloc(sizeof(*ctl->gen.hints)); \ - if(ctl->gen.hints == NULL) \ - { \ - triton_err(triton_log_default, "INVALID STATE: %s:%d: memory allocation for hints structure failed!\n", #__fname, __location); \ - assert(ctl->gen.hints != NULL); \ - goto __ae_##__pbranch_id##_end; \ - } \ ae_hints_dup(parent_ctl->gen.hints, &ctl->gen.hints); \ ctl->params = parent_ctl->params; \ memcpy(&ctl->__pwait_ctl.private, &parent_ctl->__pwait_ctl.private, sizeof(ctl->__pwait_ctl.private)); \ hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. f3122c10fac32e58c48ef9544a3c61f1bdc00016
by noreply＠mcs.anl.gov 24 Feb '11

24 Feb '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Triton Repository". The branch, master has been updated via f3122c10fac32e58c48ef9544a3c61f1bdc00016 (commit) from f6ba13d5b9c07beee9a33ae5b39c13cc42118383 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit f3122c10fac32e58c48ef9544a3c61f1bdc00016 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Thu Feb 24 17:41:07 2011 -0500 update noop-bench to new hint model ----------------------------------------------------------------------- Summary of changes: code/src/net/mpi/test/noop-bench.ae | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) Diff of changes: diff --git a/code/src/net/mpi/test/noop-bench.ae b/code/src/net/mpi/test/noop-bench.ae index 188df77..b91c725 100644 --- a/code/src/net/mpi/test/noop-bench.ae +++ b/code/src/net/mpi/test/noop-bench.ae @@ -36,7 +36,6 @@ __blocking void do_remote_server(void) /* run service engine to process requests */ assert(AER_DEFAULT_CTX); aer_service_engine_start(AER_DEFAULT_CTX); - fprintf(stderr, "BOOM\n"); return; } @@ -130,6 +129,7 @@ int main(int argc, char *argv[]) int provided; int server_rank = 0; int nprocs; + ae_hints_t hints; triton_addr_t server_addr; @@ -194,12 +194,14 @@ int main(int argc, char *argv[]) /* server */ /* TODO: what resources do I really need here? */ ae_context_create(&mpi_resource_ctx, "mpi", "sched", "timer"); - ret = ae_post_blocking(do_remote_server, cb, NULL, NULL, mpi_resource_ctx, &op_id); + ae_hints_init(&hints); + ret = ae_post_blocking(do_remote_server, cb, NULL, &hints, mpi_resource_ctx, &op_id); while(!done) { ae_poll(mpi_resource_ctx, 0); } + ae_hints_destroy(&hints); } else { @@ -218,8 +220,9 @@ int main(int argc, char *argv[]) printf("# starting noop test.\n"); } + ae_hints_init(&hints); test_start = MPI_Wtime(); - ret = ae_post_blocking(do_remote_noop, cb, NULL, NULL, mpi_resource_ctx, &op_id); + ret = ae_post_blocking(do_remote_noop, cb, NULL, &hints, mpi_resource_ctx, &op_id); while(!done) { @@ -227,6 +230,7 @@ int main(int argc, char *argv[]) } test_end = MPI_Wtime(); noop_elapsed = test_end - test_start; + ae_hints_destroy(&hints); sleep(2); } @@ -246,12 +250,14 @@ int main(int argc, char *argv[]) nclients, nobjects, nconcurrent, noop_min_elapsed_time, noop_elapsed_time, (double)nobjects*(double)(nclients)/noop_elapsed_time); done = 0; - ret = ae_post_blocking(do_remote_shutdown, cb, NULL, NULL, mpi_resource_ctx, &op_id); + ae_hints_init(&hints); + ret = ae_post_blocking(do_remote_shutdown, cb, NULL, &hints, mpi_resource_ctx, &op_id); while(!done) { ae_poll(mpi_resource_ctx, 0); } + ae_hints_destroy(&hints); } } hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. f6ba13d5b9c07beee9a33ae5b39c13cc42118383
by noreply＠mcs.anl.gov 24 Feb '11

24 Feb '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Triton Repository". The branch, master has been updated via f6ba13d5b9c07beee9a33ae5b39c13cc42118383 (commit) from 101a6d1f851d461ca54c17ab2fbe310425820ca2 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit f6ba13d5b9c07beee9a33ae5b39c13cc42118383 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Thu Feb 24 16:05:20 2011 -0500 fix a race condition in sched resource ----------------------------------------------------------------------- Summary of changes: code/src/common/resources/scheduling/sched.c | 31 +++++++++++++------------ 1 files changed, 16 insertions(+), 15 deletions(-) Diff of changes: diff --git a/code/src/common/resources/scheduling/sched.c b/code/src/common/resources/scheduling/sched.c index 478439c..5ebaeb2 100644 --- a/code/src/common/resources/scheduling/sched.c +++ b/code/src/common/resources/scheduling/sched.c @@ -143,6 +143,7 @@ static triton_ret_t triton_sched_poll(ae_context_t context) { struct ae_op *op; struct triton_sched_id_s *result; + int internal; triton_mutex_lock(&sched_done_mutex); while(ae_ops_count(&sched_done_queue) > 0) @@ -156,23 +157,23 @@ static triton_ret_t triton_sched_poll(ae_context_t context) result = ae_op_entry(op, struct triton_sched_id_s, op); triton_mutex_lock(result->mutex); - /* save callback and user pointer so that we can release the op - * safely before triggering the callback - */ - callback = op->callback; - user_ptr = op->user_ptr; + internal = result->internal; ret = result->state == TRITON_SCHED_STATE_CANCELED ? TRITON_ERR_CANCELED : TRITON_SUCCESS; - - /* must call callback before operation is freed (handed back to opcache) */ - callback(user_ptr, ret); - if(result->internal) - { - ae_opcache_put(sched_opcache, op); - } - else - { + if(internal) + { + ae_opcache_complete_op(sched_opcache, op, triton_ret_t, ret); + } + else + { + callback = op->callback; + user_ptr = op->user_ptr; + /* NOTE: the callback in this case might free the control + * structure that holds the op, so we can't touch it any more + * after calling the callback. + */ ae_op_clear(op); - } + callback(user_ptr, ret); + } triton_mutex_lock(&sched_done_mutex); } hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. 101a6d1f851d461ca54c17ab2fbe310425820ca2
by noreply＠mcs.anl.gov 24 Feb '11

24 Feb '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Triton Repository". The branch, master has been updated via 101a6d1f851d461ca54c17ab2fbe310425820ca2 (commit) from 859df51fa6f05a24435cb1d309799ca83f0f1b97 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 101a6d1f851d461ca54c17ab2fbe310425820ca2 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Thu Feb 24 15:48:54 2011 -0500 fix vosd bug if retry_count hint isn't set ----------------------------------------------------------------------- Summary of changes: code/src/versioned-osd/prototype/versioned-osd.ae | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) Diff of changes: diff --git a/code/src/versioned-osd/prototype/versioned-osd.ae b/code/src/versioned-osd/prototype/versioned-osd.ae index 0ba97dc..0a53c9f 100644 --- a/code/src/versioned-osd/prototype/versioned-osd.ae +++ b/code/src/versioned-osd/prototype/versioned-osd.ae @@ -237,13 +237,23 @@ static __blocking triton_ret_t check_niid(DB_TXN* txn, uint128_t oid, uint64_t n DBT key, value; int retry_count; + /* TODO: rethink what hint we use to control this, and what the default + * should be + */ tret = aesop_hints_get("triton.remote.retry_count", sizeof(retry_count), &retry_count); - if(tret != TRITON_SUCCESS) + if(tret == TRITON_ERR_HINT_MISSING_TYPE) + { + /* disable niid checks if the caller hasn't set a retry hint */ + retry_count = 0; + triton_error_destroy(tret); + } + else if(tret != TRITON_SUCCESS) { triton_log_error(triton_log_default, tret, "aesop_hints_get()"); return(tret); } + if(retry_count == 0) { /* not a retry, so don't bother checking niid */ hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. 859df51fa6f05a24435cb1d309799ca83f0f1b97
by noreply＠mcs.anl.gov 24 Feb '11

24 Feb '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Triton Repository". The branch, master has been updated via 859df51fa6f05a24435cb1d309799ca83f0f1b97 (commit) from bff3678f9360c7f7732d85f835e83607d7ab7644 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 859df51fa6f05a24435cb1d309799ca83f0f1b97 Author: slang <slang(a)mcs.anl.gov> Date: Thu Feb 24 13:34:20 2011 -0600 fix segfault caused by hint changes ----------------------------------------------------------------------- Summary of changes: .../versioned-osd/prototype/tests/vosd-autotune.ae | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) Diff of changes: diff --git a/code/src/versioned-osd/prototype/tests/vosd-autotune.ae b/code/src/versioned-osd/prototype/tests/vosd-autotune.ae index 2a257a5..57a1bc5 100644 --- a/code/src/versioned-osd/prototype/tests/vosd-autotune.ae +++ b/code/src/versioned-osd/prototype/tests/vosd-autotune.ae @@ -42,6 +42,7 @@ static void usage(void) int main(int argc, char *argv[]) { ae_context_t ctx; + ae_hints_t hints; ae_op_id_t op_id; int pc = 0; int ret; @@ -65,13 +66,15 @@ int main(int argc, char *argv[]) ae_context_create(&ctx, "bdb", "file", "sched", "timer"); + ae_hints_init(&hints); done = 0; - ae_post_blocking(do_vosd_test, done_callback, NULL, NULL, ctx, &op_id); + ae_post_blocking(do_vosd_test, done_callback, NULL, &hints, ctx, &op_id); while(done == 0) { pc++; ae_poll(ctx, 10000); } + ae_hints_destroy(&hints); triton_finalize(); ae_context_destroy(ctx); hooks/post-receive -- Triton Repository

1 0