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

Triton Repository branch, master, updated. 26767f0e0e80d5181647adad302a2dc50a22d8da
by noreply＠mcs.anl.gov 31 Aug '11

31 Aug '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 26767f0e0e80d5181647adad302a2dc50a22d8da (commit) via 908a70ec031e79e0285315b2b8a9baffd0b32d07 (commit) via 42077bbdcbb7ab12836f82683c9b50b42eaf7342 (commit) from bdf98d9a497449999067fb1b7d7a74b88001676a (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 26767f0e0e80d5181647adad302a2dc50a22d8da Author: Dries Kimpe <dkimpe(a)mcs.anl.gov> Date: Wed Aug 31 13:39:05 2011 -0500 Hint optimization: don't allocate unless we need to NOTE: This is temporary for testing - there might be a race when calling aesop_hint_put concurrently for the same context (but not sure that that is possible). commit 908a70ec031e79e0285315b2b8a9baffd0b32d07 Author: Dries Kimpe <dkimpe(a)mcs.anl.gov> Date: Wed Aug 31 13:38:44 2011 -0500 Use atomics for opcache commit 42077bbdcbb7ab12836f82683c9b50b42eaf7342 Author: Dries Kimpe <dkimpe(a)mcs.anl.gov> Date: Wed Aug 31 13:15:15 2011 -0500 Add .aer files to search-source.sh ----------------------------------------------------------------------- Summary of changes: code/maint/search-source.sh | 1 + code/src/aesop/ae-ctl.h | 1 + code/src/aesop/ae-remote-parser.h | 4 +- code/src/aesop/hints.c | 95 ++++++++++++++++++++++++++++++------- code/src/aesop/hints.h | 24 ++++++---- code/src/aesop/opcache.c | 42 ++++++++--------- code/src/aesop/opcache.h | 2 +- 7 files changed, 117 insertions(+), 52 deletions(-) Diff of changes: diff --git a/code/maint/search-source.sh b/code/maint/search-source.sh index be3ff43..905b6c0 100755 --- a/code/maint/search-source.sh +++ b/code/maint/search-source.sh @@ -3,4 +3,5 @@ find . -iname \*.h \ -o -iname \*.c \ -o -iname \*.ae \ + -o -iname \*.aer \ | xargs grep "$*" diff --git a/code/src/aesop/ae-ctl.h b/code/src/aesop/ae-ctl.h index bcce50b..daf1569 100644 --- a/code/src/aesop/ae-ctl.h +++ b/code/src/aesop/ae-ctl.h @@ -177,6 +177,7 @@ static inline void ae_ctl_lone_pbranch_start(struct ae_ctl *ctl) { ae_list_link_clear(&ctl->link); ae_lone_pbranches_add(ctl); + /* parent context disappears, we need to copy the hint */ ae_hints_dup(ctl->parent->hints, &ctl->hints); ae_ctl_refinc(ctl->parent); } diff --git a/code/src/aesop/ae-remote-parser.h b/code/src/aesop/ae-remote-parser.h index d2f9937..7fc90ec 100644 --- a/code/src/aesop/ae-remote-parser.h +++ b/code/src/aesop/ae-remote-parser.h @@ -251,9 +251,9 @@ extern triton_debug_mask_t encoding_dbg_mask; s = triton_addr_is_self(id); \ if(s) \ { \ - ret = ae_hints_put(__ae_ctl->gen.hints, "triton.remote.context", sizeof(ctx), &ctx, 1); \ + ret = ae_hints_put(&__ae_ctl->gen.hints, "triton.remote.context", sizeof(ctx), &ctx, 1); \ if(ret != TRITON_SUCCESS) triton_log_error(triton_log_default, ret, "Failed to store remote context in hints\n"); \ - ret = ae_hints_put(__ae_ctl->gen.hints, "triton.remote.from", sizeof(id), &id, 1); \ + ret = ae_hints_put(&__ae_ctl->gen.hints, "triton.remote.from", sizeof(id), &id, 1); \ if(ret != TRITON_SUCCESS) triton_log_error(triton_log_default, ret, "Failed to store remote address in hints\n"); \ return __fname__(__inname__, __outname__); \ } \ diff --git a/code/src/aesop/hints.c b/code/src/aesop/hints.c index 5bd386b..f300745 100644 --- a/code/src/aesop/hints.c +++ b/code/src/aesop/hints.c @@ -60,6 +60,7 @@ static int hints_type_hash(const void *t, int table_size) static void ae_hint_info_destroy(void * hi) { struct ae_hint_info *info = (struct ae_hint_info *)hi; + free(info->key); free(info); } @@ -231,6 +232,9 @@ static void delete_hint(struct ae_hint_entry *h) triton_ret_t ae_hints_del(ae_hints_t *hints, const char *key) { + if (!hints) + return TRITON_ERR_NOENT; + struct ae_hint_info *info; struct ae_hint_entry *entry, *tmpentry; triton_ret_t ret; @@ -261,11 +265,14 @@ triton_ret_t ae_hints_del(ae_hints_t *hints, const char *key) return TRITON_ERR_NOENT; } -triton_ret_t ae_hints_modify(ae_hints_t *hints, +triton_ret_t ae_hints_modify(ae_hints_t * hints, const char *key, int length, void *value) { + if (!hints) + return TRITON_ERR_NOENT; + struct ae_hint_info *info; struct ae_hint_entry *entry, *tmpentry; triton_ret_t ret; @@ -299,17 +306,43 @@ triton_ret_t ae_hints_modify(ae_hints_t *hints, return TRITON_ERR_NOENT; } +static ae_hints_t * alloc_init_hint () +{ + ae_hints_t * h = malloc(sizeof(*h)); + triton_ret_t ret; + + if(!h) return 0; + + ret = ae_hints_init(h); + if(ret != TRITON_SUCCESS) + { + free(h); + return 0; + } + return h; +} -triton_ret_t ae_hints_put(ae_hints_t *hints, +triton_ret_t ae_hints_put(ae_hints_t ** h, const char *key, int length, void *value, int overwrite) { + ae_hints_t * hints; struct ae_hint_info *info; struct ae_hint_entry *entry, *tmpentry; triton_ret_t ret; + /** + * If the hint structure wasn't allocated yet, do so now. + */ + if (!*h) + { + *h = alloc_init_hint (); + } + + hints = *h; + info = ae_hints_get_info_by_key(key); if(!info) { @@ -415,45 +448,71 @@ void ae_hints_destroy(ae_hints_t *hints) if(r == 0 && hints->needs_free) free(hints); } -triton_ret_t ae_hints_dup(ae_hints_t *oldh, ae_hints_t **newh) +triton_ret_t ae_hints_dup(ae_hints_t *oldh, ae_hints_t ** newh) { + if (!oldh) + { + *newh = oldh; + return TRITON_SUCCESS; + } + struct ae_hints *h; triton_ret_t ret; - h = malloc(sizeof(*h)); - if(!h) return TRITON_ERR_NOMEM; - - ret = ae_hints_init(h); - if(ret != TRITON_SUCCESS) + if (!oldh) { - free(h); - return ret; + *newh = oldh; + return TRITON_SUCCESS; } - ret = ae_hints_copy(oldh, h); + + /* ae_hints_copy will allocate h if needed */ + h = 0; + ret = ae_hints_copy(oldh, &h); if(ret != TRITON_SUCCESS) { free(h); return ret; } - h->needs_free = 1; + + if (h) + h->needs_free = 1; + *newh = h; return TRITON_SUCCESS; } -triton_ret_t ae_hints_copy(ae_hints_t *oldh, ae_hints_t *newh) +triton_ret_t ae_hints_copy(ae_hints_t *oldh, ae_hints_t ** newh) { - ae_hints_init(newh); + if (!oldh) + return TRITON_SUCCESS; + + if (!*newh) + { + *newh = alloc_init_hint (); + } + + ae_hints_init(*newh); triton_mutex_lock(&oldh->lock); oldh->refcount++; - newh->parent = oldh; + assert (!(*newh)->parent); /* make sure we have correct refcounts */ + (*newh)->parent = oldh; triton_mutex_unlock(&oldh->lock); return TRITON_SUCCESS; } -triton_ret_t ae_hints_clone(ae_hints_t *oldh, ae_hints_t *newh) +triton_ret_t ae_hints_clone(ae_hints_t *oldh, ae_hints_t ** pnh) { + if (!oldh) + return TRITON_SUCCESS; + + if (!*pnh) + { + *pnh = alloc_init_hint (); + } + + ae_hints_t * newh = *pnh; triton_ret_t ret; ae_hints_t *tmp; struct ae_hint_entry *nh, *entry, *tmpentry; @@ -723,9 +782,9 @@ triton_ret_t aer_init_null_ae_hints_t(void *x) return TRITON_SUCCESS; } -triton_ret_t aer_copy_ae_hints_t(void *x, void *y) +triton_ret_t aer_copy_ae_hints_t(void *x, void **y) { - return ae_hints_copy((ae_hints_t *)x, (ae_hints_t *)y); + return ae_hints_copy((ae_hints_t *)x, (ae_hints_t **)y); } void aer_destroy_ae_hints_t(void *x) diff --git a/code/src/aesop/hints.h b/code/src/aesop/hints.h index 883b623..811e3aa 100644 --- a/code/src/aesop/hints.h +++ b/code/src/aesop/hints.h @@ -24,7 +24,7 @@ typedef struct ae_hints ae_hints_t; #define aesop_hints_get(__key, __length, __value) \ ae_hints_get(__ae_ctl->gen.hints, __key, __length, __value) #define aesop_hints_put(__key, __length, __value, __overwrite) \ - ae_hints_put(__ae_ctl->gen.hints, __key, __length, __value, __overwrite) + ae_hints_put(&__ae_ctl->gen.hints, __key, __length, __value, __overwrite) #define aesop_hints_modify(__key, __length, __value) \ ae_hints_modify(__ae_ctl->gen.hints, __key, __length, __value) #define aesop_hints_del(__key) \ @@ -50,7 +50,10 @@ static inline triton_ret_t aesop_hints_del(ae_hints_t *hints, const char *key) } #endif -triton_ret_t ae_hints_put(ae_hints_t *hints, +/** + * Put might allocate a hint structure if there was no previous hint allocated + */ +triton_ret_t ae_hints_put(ae_hints_t ** hints, const char *key, int length, void *value, @@ -61,12 +64,13 @@ triton_ret_t ae_hints_get(ae_hints_t *hints, int length, void *value); -/* This is different from a put() with overwrite, because it will walk up to +/* This is different from a put() with overwrite, because it will walk + * up to * parent hints, and it will return ENOENT if the hint in question is not * found. It is intended for lower level components that need to modify a * hint that was injected by a higher level component. - */ -triton_ret_t ae_hints_modify(ae_hints_t *hints, + */ +triton_ret_t ae_hints_modify(ae_hints_t * hints, const char *key, int length, void *value); @@ -79,18 +83,18 @@ triton_ret_t ae_hints_del(ae_hints_t *hints, * Copy all hints by incrementing refcount on old hints and pointing new * hints to old. Hints added to the new hints will not show up on the old hints */ -triton_ret_t ae_hints_copy(ae_hints_t *oldh, ae_hints_t *newh); +triton_ret_t ae_hints_copy(ae_hints_t *oldh, ae_hints_t ** newh); /** * Deep copy of all hints from old to new. Updates to old or new are not reflected * in the other. */ -triton_ret_t ae_hints_clone(ae_hints_t *oldh, ae_hints_t *newh); +triton_ret_t ae_hints_clone(ae_hints_t *oldh, ae_hints_t ** newh); /** * Allocates a pointer for new hints and does a ae_hints_copy. */ -triton_ret_t ae_hints_dup(ae_hints_t *oldh, ae_hints_t **newh); +triton_ret_t ae_hints_dup(ae_hints_t *oldh, ae_hints_t ** newh); /** * Check that hints hold a value for a particular hint type. @@ -113,13 +117,15 @@ void ae_hints_destroy(ae_hints_t *h); * Calls destroy on hint structure and then frees pointer. Companion to ae_hints_dup. */ void ae_hints_free(ae_hints_t *h); + + #include "src/common/triton-buffer.h" uint64_t aer_encode_size_ae_hints_t(const char *n, void *x); triton_ret_t aer_encode_ae_hints_t(triton_buffer_t *buf, const char *n, void *x); triton_ret_t aer_decode_ae_hints_t(triton_buffer_t *buf, char **n __unused__, void *x); triton_ret_t aer_init_null_ae_hints_t(void *x); -triton_ret_t aer_copy_ae_hints_t(void *x, void *y); +triton_ret_t aer_copy_ae_hints_t(void *x, void **y); void aer_destroy_ae_hints_t(void *x); /* TODO: fix hints encoding/decoding */ diff --git a/code/src/aesop/opcache.c b/code/src/aesop/opcache.c index a32971a..415ba0b 100644 --- a/code/src/aesop/opcache.c +++ b/code/src/aesop/opcache.c @@ -1,8 +1,10 @@ -#include <errno.h> #include "src/aesop/aesop.h" #include "src/aesop/opcache.h" #include "src/common/triton-error.h" +#include <errno.h> +#include <opa_primitives.h> + /* Don't try to do manual memory management */ #define TRITON_OPCACHE_MALLOC @@ -20,9 +22,9 @@ struct ae_opcache #endif triton_mutex_t mutex; triton_cond_t cond; - int num_ops_in_use; + OPA_int_t num_ops_in_use; void (*completion_fn)(struct ae_opcache* opcache, struct ae_op* op); - int num_threads; + OPA_int_t num_threads; pthread_t* tids; ae_ops_t thread_queue; int typesize; @@ -36,7 +38,7 @@ static void* thread_pool_fn(void* foo) ae_opcache_t cache = (ae_opcache_t)foo; struct ae_op* op; - while(cache->num_threads > 0) + while(OPA_load_int(&cache->num_threads) > 0) { triton_mutex_lock(&cache->mutex); while((op = ae_ops_dequeue(&cache->thread_queue)) == NULL) @@ -56,7 +58,7 @@ triton_ret_t ae_opcache_set_threads(ae_opcache_t cache, int i; int ret; - cache->num_threads = num_threads; + OPA_store_int (&cache->num_threads, num_threads); cache->tids = (pthread_t*)malloc(num_threads*sizeof(pthread_t)); if(!cache->tids) return(TRITON_ERR_NOMEM); @@ -76,15 +78,15 @@ triton_ret_t ae_opcache_set_threads(ae_opcache_t cache, void ae_opcache_complete_op_threaded(ae_opcache_t cache, struct ae_op* op) { - triton_mutex_lock(&cache->mutex); - if(cache->num_ops_in_use > 1) + if(OPA_load_int(&cache->num_ops_in_use) > 1) { + triton_mutex_lock(&cache->mutex); ae_ops_enqueue(op, &cache->thread_queue); triton_cond_signal(&cache->cond); triton_mutex_unlock(&cache->mutex); } else { - triton_mutex_unlock(&cache->mutex); + //triton_mutex_unlock(&cache->mutex); cache->completion_fn(cache, op); } return; @@ -116,8 +118,8 @@ triton_ret_t ae_opcache_init(int typesize, int member_offset, int init_size, ae_ triton_mutex_init(&c->mutex, NULL); triton_cond_init(&c->cond, NULL); ae_ops_init(&c->thread_queue); - c->num_ops_in_use = 0; - c->num_threads = 0; + OPA_store_int (&c->num_ops_in_use, 0); + OPA_store_int (&c->num_threads, 0); c->typesize = typesize; c->member_offset = member_offset; *cache = c; @@ -167,8 +169,7 @@ void ae_opcache_destroy(ae_opcache_t cache) } triton_mutex_unlock(&cache->mutex); #endif - nthreads = cache->num_threads; - cache->num_threads = 0; + nthreads = OPA_swap_int (&cache->num_threads, 0); for(i=0; i<nthreads; i++) { pthread_join(cache->tids[i], NULL); @@ -211,11 +212,9 @@ struct ae_op *ae_opcache_get(ae_opcache_t cache) return op; ae_op_clear(op); - if(cache->num_threads > 0) + if(OPA_load_int (&cache->num_threads) > 0) { - triton_mutex_lock(&cache->mutex); - cache->num_ops_in_use++; - triton_mutex_unlock(&cache->mutex); + OPA_incr_int (&cache->num_ops_in_use); } #else int aind, count; @@ -247,8 +246,9 @@ struct ae_op *ae_opcache_get(ae_opcache_t cache) { op = ae_ops_dequeue(&cache->free_list); } - cache->num_op_in_use++; + OPA_incr_int (&cache->num_op_in_use); triton_mutex_unlock(&cache->mutex); + /* should always succeed since we're not allocating mem */ assert(op); #endif return op; @@ -258,16 +258,14 @@ void ae_opcache_put(ae_opcache_t cache, struct ae_op *op) { #ifdef TRITON_OPCACHE_MALLOC free ((char*) op - cache->member_offset); - if(cache->num_threads > 0) + if(OPA_load_int (&cache->num_threads) > 0) { - triton_mutex_lock(&cache->mutex); - cache->num_ops_in_use--; - triton_mutex_unlock(&cache->mutex); + OPA_decr_int(&cache->num_ops_in_use); } #else triton_mutex_lock(&cache->mutex); ae_ops_enqueue(op, &cache->free_list); - cache->num_ops_in_use--; + OPA_decr_int(&cache->num_ops_in_use); triton_mutex_unlock(&cache->mutex); #endif diff --git a/code/src/aesop/opcache.h b/code/src/aesop/opcache.h index 8baa328..72cadb6 100644 --- a/code/src/aesop/opcache.h +++ b/code/src/aesop/opcache.h @@ -28,7 +28,7 @@ void ae_opcache_complete_op_threaded(ae_opcache_t cache, struct ae_op* op); * init_size is a hint and may be ignored. */ ae_ret_t ae_opcache_init(int typesize, int member_offset, int init_size, - ae_opcache_t *cache); + ae_opcache_t * cache); /** * Activates a thread pool to run callbacks for the opcache hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. bdf98d9a497449999067fb1b7d7a74b88001676a
by noreply＠mcs.anl.gov 31 Aug '11

31 Aug '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 bdf98d9a497449999067fb1b7d7a74b88001676a (commit) from d3a6189763d9ee82aed359b3888980e43343a72f (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 bdf98d9a497449999067fb1b7d7a74b88001676a Author: Philip Carns <carns(a)flogin3.lcrc.anl.gov> Date: Wed Aug 31 13:25:17 2011 -0500 swap method for assigning sockets to libev ----------------------------------------------------------------------- Summary of changes: code/src/common/resources/aesocket/aesocket.c | 24 +++++++++++++++++------- 1 files changed, 17 insertions(+), 7 deletions(-) Diff of changes: diff --git a/code/src/common/resources/aesocket/aesocket.c b/code/src/common/resources/aesocket/aesocket.c index 30aa811..dfa940e 100644 --- a/code/src/common/resources/aesocket/aesocket.c +++ b/code/src/common/resources/aesocket/aesocket.c @@ -482,6 +482,11 @@ static void eloop_break_cb(EV_P_ ev_async *w, int revents) return; } +#if 0 +static int balancer = 0; +static triton_mutex_t balancer_mutex = TRITON_MUTEX_INITIALIZER; +#endif + static int find_ev_loop(int fd) { int loop_index; @@ -490,24 +495,29 @@ static int find_ev_loop(int fd) /* this fn shoudn't be called if event loop threads are disabled */ assert(nthreads_event_loop > 0); - #if 0 - /* fast, but might give uneven distribution if there is some pattern - * to the fd assignment by the kernel + /* different methods of assigning file descriptors to the various libev + * loop threads + */ + #if 1 + /* this seems to be the fastest option. The only caveat is if there + * is a pattern to the fd numbers then we might not balance well */ loop_index = fd % nthreads_event_loop; #endif #if 0 - /* Perfectly balanced, but some overhead in getting atomic - * assignment; could do this with openpa... + /* DON't USE THIS ONE + * Very slow because it doesn't keep a given socket consistently on + * the same libev loop. */ triton_mutex_lock(&balancer_mutex); loop_index = balancer % nthreads_event_loop; balancer++; triton_mutex_unlock(&balancer_mutex); #endif - #if 1 + #if 0 /* hash to add noise to the fd number and hopefully get a more even - * distribution + * distribution in theory. In practice it seems slightly slower than + * just doing a modulo of the fd number. */ bj_hashlittle2(&fd, sizeof(fd), &pc, &pb); /* this could be a bit shift instead of modulo if nthreads is a hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. d3a6189763d9ee82aed359b3888980e43343a72f
by noreply＠mcs.anl.gov 31 Aug '11

31 Aug '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 d3a6189763d9ee82aed359b3888980e43343a72f (commit) from 26b7759a6485eeabf87fd7ed771a6df07e9593b7 (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 d3a6189763d9ee82aed359b3888980e43343a72f Author: Phil Carns <carns(a)mcs.anl.gov> Date: Wed Aug 31 09:30:42 2011 -0400 rough cut at concurrent libev loops in aesocket optional; controlled via triton_aesocket_nthreads_event_loop zeroconf parameter ----------------------------------------------------------------------- Summary of changes: code/src/common/resources/aesocket/aesocket.c | 268 ++++++++++++++++++++++-- 1 files changed, 245 insertions(+), 23 deletions(-) Diff of changes: diff --git a/code/src/common/resources/aesocket/aesocket.c b/code/src/common/resources/aesocket/aesocket.c index 24afb6b..30aa811 100644 --- a/code/src/common/resources/aesocket/aesocket.c +++ b/code/src/common/resources/aesocket/aesocket.c @@ -4,6 +4,8 @@ #include "src/common/resources/aesocket/aesocket.h" #include "src/common/triton-init.h" #include "src/zeroconf/zeroconf.h" +#include "src/common/jenkins-hash.h" + #include <assert.h> #include <pthread.h> @@ -11,21 +13,25 @@ #include "src/common/libev/ev.h" -struct ae_context -{ - int id; - int resource_count; - int* resource_ids; - struct ae_poll_data* poll_data; - struct ev_loop *eloop; - ev_async eloop_breaker; -}; - #define AESOCKET_DEFAULT_SIZE 1024 static ae_opcache_t aesocket_opcache = NULL; static int triton_aesocket_resource_id; static int nthreads = 0; +static int nthreads_event_loop = 0; + +struct event_loop_data +{ + pthread_t tid; + struct ev_loop* eloop; + ev_async break_watcher; + ev_async op_watcher; + ae_ops_t posted_oplist; + ae_ops_t inflight_oplist; + ae_ops_t cancelled_oplist; + triton_mutex_t mutex; + int running; +}; struct aesocket_op { @@ -35,27 +41,45 @@ struct aesocket_op int fd; int flags; ev_io io; + struct event_loop_data* event_loop; }; static ae_ops_t posted_oplist; static ae_ops_t inflight_oplist; static ae_ops_t cancelled_oplist; static pthread_t event_loop_thread; - static triton_mutex_t aesocket_mutex = TRITON_MUTEX_INITIALIZER; +struct event_loop_data* event_loops = NULL; + +static void* event_loop_thread_fn(void* foo); +static void eloop_process_op_cb(EV_P_ ev_async *w, int revents); +static void eloop_break_cb(EV_P_ ev_async *w, int revents); +static int find_ev_loop(int fd); static void aesocket_fd_ready( EV_P_ ev_io * io, int revents) { + triton_mutex_t* mutex_p; + struct ev_loop *eloop; struct ae_op *op = (struct ae_op *) io->data; struct aesocket_op *socket_op = ae_op_entry(io->data, struct aesocket_op, op); - struct ev_loop *eloop = ae_resource_get_eloop(op->ctx); + + if(nthreads_event_loop > 0) + { + mutex_p = &socket_op->event_loop->mutex; + eloop = socket_op->event_loop->eloop; + } + else + { + mutex_p = &aesocket_mutex; + eloop = ae_resource_get_eloop(op->ctx); + } - triton_mutex_lock(&aesocket_mutex); + triton_mutex_lock(mutex_p); ae_ops_del(op); - triton_mutex_unlock(&aesocket_mutex); + triton_mutex_unlock(mutex_p); ev_io_stop(eloop, io); ae_opcache_complete_op_threaded(aesocket_opcache, op); @@ -68,6 +92,11 @@ ae_define_post(triton_ret_t, triton_aesocket_ready, int fd, struct ae_op *op; struct aesocket_op *socket_op; struct ev_loop *eloop; + pthread_t target_thread; + triton_mutex_t* mutex_p; + ae_ops_t* posted_p; + ae_ops_t* inflight_p; + struct event_loop_data* event_loop_p = NULL; if (!aesocket_opcache) { @@ -87,6 +116,25 @@ ae_define_post(triton_ret_t, triton_aesocket_ready, int fd, socket_op->fd = fd; socket_op->flags = (mode & AESOCKET_READ ? EV_READ : 0) | (mode & AESOCKET_WRITE ? EV_WRITE : 0); + if(nthreads_event_loop > 0) + { + event_loop_p = &event_loops[find_ev_loop(fd)]; + socket_op->event_loop = event_loop_p; + eloop = event_loop_p->eloop; + target_thread = event_loop_p->tid; + mutex_p = &event_loop_p->mutex; + posted_p = &event_loop_p->posted_oplist; + inflight_p = &event_loop_p->inflight_oplist; + } + else + { + socket_op->event_loop = NULL; + eloop = ae_resource_get_eloop(op->ctx); + target_thread = event_loop_thread; + mutex_p = &aesocket_mutex; + posted_p = &posted_oplist; + inflight_p = &inflight_oplist; + } assert(socket_op->flags && "Need to specify one of AESOCKET_READ|AESOCKET_WRITE"); @@ -98,24 +146,30 @@ ae_define_post(triton_ret_t, triton_aesocket_ready, int fd, * can modify/start libev watchers in place. Otherwise we have to queue * up modifications for the event loop to handle */ - if(pthread_equal(event_loop_thread, pthread_self())) + if(pthread_equal(target_thread, pthread_self())) { - eloop = ae_resource_get_eloop(op->ctx); ev_io_init(&socket_op->io, aesocket_fd_ready, socket_op->fd, socket_op->flags); socket_op->io.data = op; ev_io_start(eloop, &socket_op->io); - triton_mutex_lock(&aesocket_mutex); - ae_ops_enqueue(op, &inflight_oplist); - triton_mutex_unlock(&aesocket_mutex); + triton_mutex_lock(mutex_p); + ae_ops_enqueue(op, inflight_p); + triton_mutex_unlock(mutex_p); } else { - triton_mutex_lock(&aesocket_mutex); - ae_ops_enqueue(op, &posted_oplist); - triton_mutex_unlock(&aesocket_mutex); - ae_resource_request_poll(op->ctx, triton_aesocket_resource_id); + triton_mutex_lock(mutex_p); + ae_ops_enqueue(op, posted_p); + triton_mutex_unlock(mutex_p); + if(nthreads_event_loop > 0) + { + ev_async_send(eloop, &event_loop_p->op_watcher); + } + else + { + ae_resource_request_poll(op->ctx, triton_aesocket_resource_id); + } } return TRITON_SUCCESS; @@ -175,6 +229,9 @@ static triton_ret_t triton_aesocket_cancel( struct aesocket_op *socket_op; ae_context_t ctx; + /* TODO: implement for threaded event loop mode */ + assert(nthreads_event_loop == 0); + /* lock to keep the op from disappearing out from under us due to * completion */ @@ -238,6 +295,19 @@ static void aesocket_completion_fn(ae_opcache_t cache, struct ae_op* op) ae_opcache_complete_op(cache, op, triton_ret_t, TRITON_SUCCESS); } +static triton_ret_t nthreads_el_updater(const char* key, const char* value) +{ + int ret; + + ret = sscanf(value, "%d", &nthreads_event_loop); + if(ret != 1) + { + return(TRITON_ERR_INVAL); + } + + return(TRITON_SUCCESS); +} + static triton_ret_t nthreads_updater(const char* key, const char* value) { int ret; @@ -256,6 +326,14 @@ triton_ret_t triton_aesocket_init( { triton_ret_t tret; int ret; + int i; + + tret = triton_zeroconf_register("triton.aesocket.nthreads_event_loop", "0", + nthreads_el_updater, "Number of threads the aesocket resource will use to drive event loops."); + if(tret != TRITON_SUCCESS) + { + return(tret); + } tret = triton_zeroconf_register("triton.aesocket.nthreads", "2", nthreads_updater, "Number of threads the aesocket resource will use for callbacks."); @@ -286,6 +364,39 @@ triton_ret_t triton_aesocket_init( return tret; } + if(nthreads_event_loop > 0) + { + event_loops = malloc(nthreads_event_loop * sizeof(*event_loops)); + if(!event_loops) + { + return(TRITON_ERR_NOMEM); + } + memset(event_loops, 0, nthreads_event_loop * sizeof(*event_loops)); + } + for(i=0; i<nthreads_event_loop; i++) + { + event_loops[i].eloop = ev_loop_new(EVFLAG_AUTO); + /* TODO: err handling */ + assert(event_loops[i].eloop); + + ev_async_init(&event_loops[i].op_watcher, eloop_process_op_cb); + event_loops[i].op_watcher.data = &event_loops[i]; + ev_async_start(event_loops[i].eloop, &event_loops[i].op_watcher); + + ev_async_init(&event_loops[i].break_watcher, eloop_break_cb); + event_loops[i].break_watcher.data = &event_loops[i]; + ev_async_start(event_loops[i].eloop, &event_loops[i].break_watcher); + ae_ops_init(&event_loops[i].posted_oplist); + ae_ops_init(&event_loops[i].inflight_oplist); + ae_ops_init(&event_loops[i].cancelled_oplist); + triton_mutex_init(&event_loops[i].mutex, NULL); + + ret = pthread_create(&event_loops[i].tid, NULL, event_loop_thread_fn, + &event_loops[i]); + /* TODO: err handling */ + assert(ret == 0); + } + return ae_resource_register(&triton_aesocket_resource, &triton_aesocket_resource_id); } @@ -293,10 +404,121 @@ triton_ret_t triton_aesocket_init( void triton_aesocket_finalize( void) { + int i; + int ret; + + for(i=0; i<nthreads_event_loop; i++) + { + ev_async_send(event_loops[i].eloop, &event_loops[i].break_watcher); + ret = pthread_join(event_loops[i].tid, NULL); + /* TODO: err handling */ + assert(ret == 0); + } + if(nthreads_event_loop > 0) + { + free(event_loops); + } + ae_resource_unregister(triton_aesocket_resource_id); ae_opcache_destroy(aesocket_opcache); } +/* event_loop_thread_fn() + * + * This function is used to drive an event loop if aesocket is configured to + * use threads to drive its own loops independent of aesop's main loop. + */ +static void* event_loop_thread_fn(void* foo) +{ + struct event_loop_data* my_loop = (struct event_loop_data*)foo; + + ev_run(my_loop->eloop, 0); + + /* if we exit the event loop, then it means that we have received an + * async event telling us to shut down this thread. + */ + ev_async_stop(my_loop->eloop, &my_loop->op_watcher); + ev_async_stop(my_loop->eloop, &my_loop->break_watcher); + ev_loop_destroy(my_loop->eloop); + + ae_ops_destroy(my_loop->posted_oplist); + ae_ops_destroy(my_loop->inflight_oplist); + triton_mutex_destroy(&my_loop->mutex); + + return(NULL); +} + +/* callback function to handle the insertion of new ops if independent event + * loop functions are in use + */ +static void eloop_process_op_cb(EV_P_ ev_async *w, int revents) +{ + struct ae_op *op; + struct aesocket_op *socket_op; + struct event_loop_data* my_loop = (struct event_loop_data*)w->data; + + triton_mutex_lock(&my_loop->mutex); + while((op = ae_ops_dequeue(&my_loop->posted_oplist))) + { + socket_op = ae_op_entry(op, struct aesocket_op, op); + ev_io_init(&socket_op->io, aesocket_fd_ready, socket_op->fd, + socket_op->flags); + socket_op->io.data = op; + ev_io_start(my_loop->eloop, &socket_op->io); + + ae_ops_enqueue(op, &my_loop->inflight_oplist); + } + triton_mutex_unlock(&my_loop->mutex); + + return; +} + +static void eloop_break_cb(EV_P_ ev_async *w, int revents) +{ + /* the only purpose of this callback is to break the event loop so that + * the thread can shut down + */ + ev_break(EV_A_ EVBREAK_ONE); + return; +} + +static int find_ev_loop(int fd) +{ + int loop_index; + uint32_t pc = 0, pb = 0; + + /* this fn shoudn't be called if event loop threads are disabled */ + assert(nthreads_event_loop > 0); + + #if 0 + /* fast, but might give uneven distribution if there is some pattern + * to the fd assignment by the kernel + */ + loop_index = fd % nthreads_event_loop; + #endif + #if 0 + /* Perfectly balanced, but some overhead in getting atomic + * assignment; could do this with openpa... + */ + triton_mutex_lock(&balancer_mutex); + loop_index = balancer % nthreads_event_loop; + balancer++; + triton_mutex_unlock(&balancer_mutex); + #endif + #if 1 + /* hash to add noise to the fd number and hopefully get a more even + * distribution + */ + bj_hashlittle2(&fd, sizeof(fd), &pc, &pb); + /* this could be a bit shift instead of modulo if nthreads is a + * power of 2 + */ + loop_index = pc % nthreads_event_loop; + #endif + + return loop_index; +} + /* * Local variables: * c-indent-level: 4 hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. 26b7759a6485eeabf87fd7ed771a6df07e9593b7
by noreply＠mcs.anl.gov 30 Aug '11

30 Aug '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 26b7759a6485eeabf87fd7ed771a6df07e9593b7 (commit) from 471f45bdf3686e8d89b4cc0e48cb42c55253c300 (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 26b7759a6485eeabf87fd7ed771a6df07e9593b7 Author: Dries Kimpe <dkimpe(a)mcs.anl.gov> Date: Tue Aug 30 13:41:45 2011 -0500 Remove some more locking from ae-blocking-parser.h ----------------------------------------------------------------------- Summary of changes: code/src/aesop/ae-blocking-parser.h | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) Diff of changes: diff --git a/code/src/aesop/ae-blocking-parser.h b/code/src/aesop/ae-blocking-parser.h index 0909e2d..0bd4686 100644 --- a/code/src/aesop/ae-blocking-parser.h +++ b/code/src/aesop/ae-blocking-parser.h @@ -42,10 +42,12 @@ struct __fname##_ctl *__ae_ctl_done __unused__; \ \ __ae_ctl = (struct __fname##_ctl *)__ae_ptr; \ - ae_mutex_lock(&__ae_ctl->gen.mutex); \ + /* Don't know why lock was here: manipulating */ \ + /* variables local to this code block ... */ \ state = AE_CTL_CALL_COMPLETE; \ + /* ae_mutex_lock(&__ae_ctl->gen.mutex); */ \ ae_op_id_clear(__ae_ctl->gen.current_op_id); \ - ae_mutex_unlock(&__ae_ctl->gen.mutex); + /* ae_mutex_unlock(&__ae_ctl->gen.mutex); */ #define AE_MK_CB_FN_INVOKE_WORKER(__bfun, __fname, __pos_str) \ cbret = __ae_worker_##__bfun(__ae_ctl, &state); \ hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. 471f45bdf3686e8d89b4cc0e48cb42c55253c300
by noreply＠mcs.anl.gov 29 Aug '11

29 Aug '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 471f45bdf3686e8d89b4cc0e48cb42c55253c300 (commit) from a72d15e91840697f7edd5d957a441572ab8566b9 (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 471f45bdf3686e8d89b4cc0e48cb42c55253c300 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Mon Aug 29 08:45:12 2011 -0400 should have been in previous commit ----------------------------------------------------------------------- Summary of changes: code/src/common/triton-init-registry-lite.c | 32 +++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) create mode 100644 code/src/common/triton-init-registry-lite.c Diff of changes: diff --git a/code/src/common/triton-init-registry-lite.c b/code/src/common/triton-init-registry-lite.c new file mode 100644 index 0000000..36590d9 --- /dev/null +++ b/code/src/common/triton-init-registry-lite.c @@ -0,0 +1,32 @@ + + +/** + * Components that want to be initialized by the init interface (triton_init/triton_finalize) need to add + * a register call here. Normally these would be automatically called through the __attribute__((constructor)) + * feature of gcc, but that doesn't work with static libraries. If we move to using purely shared libraries, we can + * get rid of this function. + * + * Note that ordering here does NOT matter. Just toss your component initializer function at the end. The init + * interface takes care of calling components in dependency order properly. + */ + +void ae_hints_init_register(void); +void aesop_init_register(void); +void triton_timer_init_register(void); +void triton_debug_init_register(void); +void triton_zeroconf_init_register(void); +void triton_file_init_register(void); +void triton_aesocket_init_register(void); + +void triton_init_register_components(void); + +void triton_init_register_components(void) +{ + ae_hints_init_register(); + aesop_init_register(); + triton_timer_init_register(); + triton_debug_init_register(); + triton_zeroconf_init_register(); + triton_file_init_register(); + triton_aesocket_init_register(); +} hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. a72d15e91840697f7edd5d957a441572ab8566b9
by noreply＠mcs.anl.gov 28 Aug '11

28 Aug '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 a72d15e91840697f7edd5d957a441572ab8566b9 (commit) from 2188f9685cba66c0207f11bf44e3eef527c2c6e2 (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 a72d15e91840697f7edd5d957a441572ab8566b9 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Sun Aug 28 21:51:01 2011 -0400 quick hack: rules to build a smaller echo-server - the default echo-server includes every triton component at link time - this hack adds a src/socket/test/echo-server-lite target (not included in the tests or default rule, must be manually specified) that only links in required objects ----------------------------------------------------------------------- Summary of changes: code/src/common/module.mk.in | 3 +++ code/src/socket/test/module.mk.in | 2 ++ 2 files changed, 5 insertions(+), 0 deletions(-) Diff of changes: diff --git a/code/src/common/module.mk.in b/code/src/common/module.mk.in index 8d419ab..68a5500 100644 --- a/code/src/common/module.mk.in +++ b/code/src/common/module.mk.in @@ -20,5 +20,8 @@ $(COMMONDIR)/triton-error-defs.c $(COMMONDIR)/triton-error-decls.h: $(COMMONDIR) GENLIBHDR += $(DIR)/triton-error-decls.h GENLIBSRC += $(DIR)/triton-error-defs.c +src/common/triton-init-registry-lite.o: src/common/triton-init-registry-lite.c + gcc -c $^ -o $@ + clean:: @rm -rf $(builddir)/$(COMMONDIR)/triton-error-decls.h $(builddir)/$(COMMONDIR)/triton-error-defs.c diff --git a/code/src/socket/test/module.mk.in b/code/src/socket/test/module.mk.in index d018abc..1efbce8 100644 --- a/code/src/socket/test/module.mk.in +++ b/code/src/socket/test/module.mk.in @@ -2,3 +2,5 @@ DIR := src/socket/test AETESTSRC += $(DIR)/echo-server.ae +src/socket/test/echo-server-lite: src/socket/test/echo-server.o src/socket/triton-socket.o src/versioned-osd/prototype/file-resource/file-resource.o src/common/libev/ev.o src/common/resources/aesocket/aesocket.o src/common/resources/timer/timer.o src/common/triton-error.o src/common/triton-debug.o src/common/triton-log.o src/common/triton-string.o src/common/lookup3.o src/common/triton-init.o src/common/triton-init-registry-lite.o src/zeroconf/zeroconf.o src/aesop/opcache.o src/aesop/aesop.o src/aesop/resource.o src/aesop/hints.o src/aesop/ae-ctl.o src/common/triton-error-defs.o src/net/triton-message.o src/remote/message.o + gcc $(LDFLAGS) $^ -lpthread -lm -o $@ hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. 2188f9685cba66c0207f11bf44e3eef527c2c6e2
by noreply＠mcs.anl.gov 28 Aug '11

28 Aug '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 2188f9685cba66c0207f11bf44e3eef527c2c6e2 (commit) from be9d2c8ff52c10f3555777dfbe088b8d0499ecde (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 2188f9685cba66c0207f11bf44e3eef527c2c6e2 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Sun Aug 28 08:00:34 2011 -0400 option to control immed complete in triton_socket - zeroconf option can be toggled with "export triton_socket_immed_completion=0" - trades off some latency for fairness in thread/callback work ----------------------------------------------------------------------- Summary of changes: code/src/common/triton-init.c | 2 +- code/src/socket/triton-socket.ae | 125 ++++++++++++++++++++++++++++++++----- 2 files changed, 109 insertions(+), 18 deletions(-) Diff of changes: diff --git a/code/src/common/triton-init.c b/code/src/common/triton-init.c index 7aa0d12..78dbe19 100644 --- a/code/src/common/triton-init.c +++ b/code/src/common/triton-init.c @@ -418,7 +418,7 @@ __attribute__((constructor)) void triton_logical_register(void) NULL, "triton.vosd.file", "triton.resource.timer", - "triton.resource.aesocket"); + "triton.socket"); triton_init_register("triton.server", NULL, diff --git a/code/src/socket/triton-socket.ae b/code/src/socket/triton-socket.ae index 9de2903..961b40f 100644 --- a/code/src/socket/triton-socket.ae +++ b/code/src/socket/triton-socket.ae @@ -1,9 +1,19 @@ #include "triton-socket.hae" #include "src/common/resources/aesocket/aesocket.hae" +#include "src/zeroconf/zeroconf.h" #include <unistd.h> #include <assert.h> +static triton_ret_t immed_completion_updater( + const char* key, const char* value); +static triton_ret_t triton_socket_init( + void); +static void triton_socket_finalize( + void); + +static int immediate_completion = 1; + /* Number of zero byte reads in a row that we will observe before assuming * that the peer has closed the socket; this is a hack to weed out * spurious zero byte reads that can show up on some systems. @@ -23,27 +33,36 @@ __blocking triton_ret_t triton_accept( while(1) { + if(!immediate_completion) + { + ret = triton_aesocket_ready(sockfd, AESOCKET_READ); + if (ret != TRITON_SUCCESS) + return ret; + } + r = accept(sockfd, addr, addrlen); if (r >= 0) { *newfd = r; return(TRITON_SUCCESS); } - else if (errno == EAGAIN || errno == EWOULDBLOCK) + else if (errno != EAGAIN && errno != EWOULDBLOCK && errno != EINTR) + { + return triton_error_from_errno(errno); + } + + if(immediate_completion) { ret = triton_aesocket_ready(sockfd, AESOCKET_READ); if (ret != TRITON_SUCCESS) return ret; } - else - { - return triton_error_from_errno(errno); - } } return TRITON_SUCCESS; } + __blocking triton_ret_t triton_read( int fd, void *buf, @@ -52,7 +71,7 @@ __blocking triton_ret_t triton_read( { triton_ret_t ret; int r; - char* tmp_buf = buf; + char* tmp_buf = (char*)buf; int tmp_count = count; int zero_reads = 0; @@ -61,6 +80,13 @@ __blocking triton_ret_t triton_read( do { + if(!immediate_completion) + { + ret = triton_aesocket_ready(fd, AESOCKET_READ); + if (ret != TRITON_SUCCESS) + return ret; + } + r = read(fd, tmp_buf, tmp_count); if(r > 0) { @@ -77,16 +103,17 @@ __blocking triton_ret_t triton_read( return(TRITON_ERR_IO); } } - else if(errno == EAGAIN || errno == EWOULDBLOCK || errno == EINTR) + else if(errno != EAGAIN && errno != EWOULDBLOCK && errno != EINTR) + { + return triton_error_from_errno(errno); + } + + if(immediate_completion && tmp_count > 0) { ret = triton_aesocket_ready(fd, AESOCKET_READ); if (ret != TRITON_SUCCESS) return ret; } - else - { - return triton_error_from_errno(errno); - } } while (tmp_count > 0); *len = count; @@ -102,7 +129,7 @@ __blocking triton_ret_t triton_write( { triton_ret_t ret; int r; - char* tmp_buf = buf; + const char* tmp_buf = (const char*)buf; int tmp_count = count; assert(buf && count); @@ -110,28 +137,92 @@ __blocking triton_ret_t triton_write( do { + if(!immediate_completion) + { + ret = triton_aesocket_ready(fd, AESOCKET_WRITE); + if (ret != TRITON_SUCCESS) + return ret; + } + r = write(fd, buf, count); if(r >= 0) { tmp_buf += r; tmp_count -= r; } - else if(errno == EAGAIN || errno == EWOULDBLOCK || errno == EINTR) + else if(errno != EAGAIN && errno != EWOULDBLOCK && errno != EINTR) + { + return triton_error_from_errno(errno); + } + + if(immediate_completion && tmp_count > 0) { ret = triton_aesocket_ready(fd, AESOCKET_WRITE); if (ret != TRITON_SUCCESS) return ret; } - else - { - return triton_error_from_errno(errno); - } + } while (tmp_count > 0); *len = count; return TRITON_SUCCESS; } +__attribute__ ((constructor)) + void triton_socket_init_register( + void); + +__attribute__ ((constructor)) + void triton_socket_init_register( + void) +{ + triton_init_register("triton.socket", triton_socket_init, + triton_socket_finalize, NULL, "triton.resource.aesocket"); +} + + +static triton_ret_t triton_socket_init( + void) +{ + triton_ret_t tret; + + tret = triton_zeroconf_register("triton.socket.immed_completion", "1", + immed_completion_updater, "Enable immediate completion (1|0)"); + if(tret != TRITON_SUCCESS) + { + return(tret); + } + + return(TRITON_SUCCESS); +} + +static void triton_socket_finalize( + void) +{ + return; +} + + +static triton_ret_t immed_completion_updater(const char* key, const char* value) +{ + int ret; + int tmp; + + ret = sscanf(value, "%d", &tmp); + if(ret != 1) + { + return(TRITON_ERR_INVAL); + } + if(tmp != 0 && tmp != 1) + { + return(TRITON_ERR_INVAL); + } + + immediate_completion = tmp; + + return(TRITON_SUCCESS); +} + /* * Local variables: * c-indent-level: 4 hooks/post-receive -- Triton Repository

1 0

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

25 Aug '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 be9d2c8ff52c10f3555777dfbe088b8d0499ecde (commit) from 35846d9d15fa3e5dee2a27310f6e6914e34ae936 (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 be9d2c8ff52c10f3555777dfbe088b8d0499ecde Author: Dries Kimpe <dkimpe(a)mcs.anl.gov> Date: Thu Aug 25 23:02:28 2011 -0500 More mutex removal work in ae_ctl ----------------------------------------------------------------------- Summary of changes: code/src/aesop/ae-ctl.h | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) Diff of changes: diff --git a/code/src/aesop/ae-ctl.h b/code/src/aesop/ae-ctl.h index b06cba0..bcce50b 100644 --- a/code/src/aesop/ae-ctl.h +++ b/code/src/aesop/ae-ctl.h @@ -137,10 +137,7 @@ static inline int ae_ctl_refinc(struct ae_ctl *ctl) static inline void ae_ctl_addref(struct ae_ctl *ctl) { - int ret; - ae_mutex_lock(&ctl->mutex); - ret = ae_ctl_refinc(ctl); - ae_mutex_unlock(&ctl->mutex); + OPA_incr_int (&ctl->refcount); } /** @@ -181,9 +178,7 @@ static inline void ae_ctl_lone_pbranch_start(struct ae_ctl *ctl) ae_list_link_clear(&ctl->link); ae_lone_pbranches_add(ctl); ae_hints_dup(ctl->parent->hints, &ctl->hints); - ae_mutex_lock(&ctl->parent->mutex); ae_ctl_refinc(ctl->parent); - ae_mutex_unlock(&ctl->parent->mutex); } static inline void ae_ctl_lone_pbranch_done(struct ae_ctl *ctl, enum ae_ctl_state *state) hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. 35846d9d15fa3e5dee2a27310f6e6914e34ae936
by noreply＠mcs.anl.gov 25 Aug '11

25 Aug '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 35846d9d15fa3e5dee2a27310f6e6914e34ae936 (commit) from d6485d4b3de174406bff931aa29de64ce7582c3a (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 35846d9d15fa3e5dee2a27310f6e6914e34ae936 Author: Dries Kimpe <dkimpe(a)mcs.anl.gov> Date: Thu Aug 25 16:01:42 2011 -0500 Reduce locking in generated code Don't lock around reference count updates for the control structure. Use OpenPA instead. ----------------------------------------------------------------------- Summary of changes: code/src/aesop/ae-ctl.h | 22 +++++++++++++++------- 1 files changed, 15 insertions(+), 7 deletions(-) Diff of changes: diff --git a/code/src/aesop/ae-ctl.h b/code/src/aesop/ae-ctl.h index 38054a8..b06cba0 100644 --- a/code/src/aesop/ae-ctl.h +++ b/code/src/aesop/ae-ctl.h @@ -8,6 +8,8 @@ #include "src/aesop/ae-error.h" #include "src/aesop/hints.h" +#include <opa_primitives.h> + enum ae_ctl_state { /* inputs for worker functions */ @@ -70,7 +72,7 @@ struct ae_ctl int in_pwait; ae_hints_t *hints; ae_context_t context; - int refcount; + OPA_int_t refcount; }; /** @@ -104,7 +106,7 @@ static inline void ae_ctl_init(struct ae_ctl *ctl, ctl->context = context; ae_mutex_init(&ctl->mutex, NULL); ae_list_init(&ctl->children); - ctl->refcount = 1; + OPA_store_int (&ctl->refcount, 1); ae_op_id_clear(ctl->current_op_id); if(internal) ctl->parent = (struct ae_ctl *)user_ptr; else ctl->parent = NULL; @@ -119,14 +121,17 @@ static inline void ae_ctl_destroy(void *tctl, struct ae_ctl *ctl) static inline int ae_ctl_refcount(struct ae_ctl *ctl) { int rc; - rc = ctl->refcount; + rc = OPA_load_int (&ctl->refcount); return rc; } +/** + * Atomically increment the refcount and return the new value. + */ static inline int ae_ctl_refinc(struct ae_ctl *ctl) { int rc; - rc = ++ctl->refcount; + rc = OPA_fetch_and_incr_int (&ctl->refcount) + 1; return rc; } @@ -138,10 +143,13 @@ static inline void ae_ctl_addref(struct ae_ctl *ctl) ae_mutex_unlock(&ctl->mutex); } +/** + * Atomically decrement refcount and return the new value + */ static inline int ae_ctl_refdec(struct ae_ctl *ctl) { int rc; - rc = --ctl->refcount; + rc = OPA_fetch_and_decr_int (&ctl->refcount) - 1; return rc; } @@ -149,10 +157,10 @@ static inline void ae_ctl_done(struct ae_ctl *ctl) { int refcount; void *fctl = ctl->spec_ctl; - ae_mutex_lock(&ctl->mutex); + + refcount = ae_ctl_refdec(ctl); assert(refcount >= 0); - ae_mutex_unlock(&ctl->mutex); if(refcount == 0) { free(fctl); hooks/post-receive -- Triton Repository

1 0

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

25 Aug '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 d6485d4b3de174406bff931aa29de64ce7582c3a (commit) from 6de2e50938c0e5023f7fea329899235dbba48da9 (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 d6485d4b3de174406bff931aa29de64ce7582c3a Author: Dries Kimpe <dkimpe(a)mcs.anl.gov> Date: Thu Aug 25 15:35:56 2011 -0500 Add --enable-release configure option ----------------------------------------------------------------------- Summary of changes: code/configure.ac | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) Diff of changes: diff --git a/code/configure.ac b/code/configure.ac index e5161de..d8e7ddb 100644 --- a/code/configure.ac +++ b/code/configure.ac @@ -286,6 +286,24 @@ AC_ARG_ENABLE(aesop-debug, AE_DEBUG=1) AC_SUBST(AE_DEBUG) +AC_ARG_ENABLE(release, + [AS_HELP_STRING( + [--enable-release], + [Optimize for performance; disable debugging]) + ], + [enable_release=$enableval], + [enable_release="no"]) + +if test "A$enable_release" = "Ayes"; then + CPPFLAGS="-DNDEBUG $CPPFLAGS" +elif test "A$enable_release" = "Ano"; then + dummy="" +else + AC_MSG_ERROR([Invalid value for --enable-release! must be yes or no]) +fi + + + AC_ARG_ENABLE(coverage, [ --enable-coverage Enable coverage analysis (disables optimizations)], [ CFLAGS="$CFLAGS -g -pg -ftest-coverage -O0" hooks/post-receive -- Triton Repository

1 0