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

Triton Repository branch, master, updated. 788dacae0d6d281ad9890014cab2c9c3e2986d1f
by noreply＠mcs.anl.gov 18 Aug '11

18 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 788dacae0d6d281ad9890014cab2c9c3e2986d1f (commit) from fc89005c7aff08285b56a9b9f6e8e803fa57125e (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 788dacae0d6d281ad9890014cab2c9c3e2986d1f Author: Phil Carns <carns(a)mcs.anl.gov> Date: Thu Aug 18 10:26:46 2011 -0400 bug fix to ae_poll_break() re: #147 ----------------------------------------------------------------------- Summary of changes: code/src/aesop/resource.c | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) Diff of changes: diff --git a/code/src/aesop/resource.c b/code/src/aesop/resource.c index b2a5309..905dd49 100644 --- a/code/src/aesop/resource.c +++ b/code/src/aesop/resource.c @@ -189,14 +189,6 @@ void ae_poll_break(ae_context_t context) ev_async* breaker = NULL; struct ev_loop *target_loop = NULL; - if(pthread_equal(ev_loop_thread, pthread_self())) - { - /* this was called from the event loop thread, so we know that it is - * already awake - */ - return; - } - if(context) { breaker = &context->eloop_breaker; @@ -208,6 +200,16 @@ void ae_poll_break(ae_context_t context) target_loop = eloop; } + if(pthread_equal(ev_loop_thread, pthread_self())) + { + /* this was called from the event loop thread, so we know that it is + * already awake. Just make sure that it exits if the + * ae_poll_break() as called from a libev callback. + */ + ev_break(target_loop, EVBREAK_ONE); + return; + } + ev_async_send(target_loop, breaker); } hooks/post-receive -- Triton Repository

1 0

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

16 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 fc89005c7aff08285b56a9b9f6e8e803fa57125e (commit) from 7bf46352e0b63bb9b7ea0f03dabd8dd07dbd64f4 (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 fc89005c7aff08285b56a9b9f6e8e803fa57125e Author: Kevin Harms <harms(a)alcf.anl.gov> Date: Tue Aug 16 14:13:19 2011 -0500 Make aesop_cancle_branches_wait cancel the branch and then immediately check to see if the other branches were cancelled. This change will also prevent 2 branches from getting stuck in a cycle where both branches are trying to cancel each other, however it falls down if there are more than 2 branches in cancel. ----------------------------------------------------------------------- Summary of changes: code/src/aesop/aesop-support.hae | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) Diff of changes: diff --git a/code/src/aesop/aesop-support.hae b/code/src/aesop/aesop-support.hae index 17eecbe..787276f 100644 --- a/code/src/aesop/aesop-support.hae +++ b/code/src/aesop/aesop-support.hae @@ -5,9 +5,16 @@ #include "src/aesop/resource.h" #include "src/common/resources/timer/timer.hae" -#define aesop_cancel_branches_wait() while(aesop_count_branches() > 1) { \ - aesop_cancel_branches(); \ - triton_timer(2); \ - } +#define aesop_cancel_branches_wait() \ + { \ + triton_ret_t __ae_cancel_branches_wait_ret; \ + do { \ + aesop_cancel_branches(); \ + if (aesop_count_branches() < 2) { \ + break; \ + } \ + __ae_cancel_branches_wait_ret = triton_timer(2); \ + } while (__ae_cancel_branches_wait_ret == TRITON_SUCCESS); \ + } #endif hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. 7bf46352e0b63bb9b7ea0f03dabd8dd07dbd64f4
by noreply＠mcs.anl.gov 16 Aug '11

16 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 7bf46352e0b63bb9b7ea0f03dabd8dd07dbd64f4 (commit) via 9c93bba0681d1542bb2bdbf3dac5df923b41f708 (commit) from 55c2957f48b2f46fe4ad9ddc6323a7d4a3383f58 (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 7bf46352e0b63bb9b7ea0f03dabd8dd07dbd64f4 Merge: 9c93bba0681d1542bb2bdbf3dac5df923b41f708 55c2957f48b2f46fe4ad9ddc6323a7d4a3383f58 Author: Kevin Harms <harms(a)alcf.anl.gov> Date: Tue Aug 16 13:56:12 2011 -0500 Merge branch 'master' of git.mcs.anl.gov:triton commit 9c93bba0681d1542bb2bdbf3dac5df923b41f708 Author: Kevin Harms <harms(a)alcf.anl.gov> Date: Wed Aug 3 22:25:59 2011 -0500 Change timer resource to only modify event loop from main libev thread. ----------------------------------------------------------------------- Summary of changes: code/src/common/resources/timer/timer.c | 82 +++++++++++++++++++++++++++--- 1 files changed, 73 insertions(+), 9 deletions(-) Diff of changes: diff --git a/code/src/common/resources/timer/timer.c b/code/src/common/resources/timer/timer.c index 76fc0d2..7ea7445 100644 --- a/code/src/common/resources/timer/timer.c +++ b/code/src/common/resources/timer/timer.c @@ -27,16 +27,21 @@ static int triton_timer_resource_id; static ev_timer timer_watcher; static struct ev_loop* timer_loop = NULL; static void timer_cb(EV_P_ ev_timer *w, int revents); +static int64_t global_timer_id_seed = 0; +static int64_t current_timer_id = 0; struct timer_op { struct timeval timer; + int milliseconds; + int64_t timer_id; ae_op_id_t op_id; struct ae_op op; triton_ret_t tret; }; static triton_mutex_t timer_mutex = TRITON_MUTEX_INITIALIZER; static ae_ops_t timer_oplist; +static ae_ops_t cancel_oplist; ae_define_post(triton_ret_t, triton_timer, int millisecs) { @@ -59,6 +64,7 @@ ae_define_post(triton_ret_t, triton_timer, int millisecs) top = ae_op_entry(op, struct timer_op, op); top->op_id = ae_id_gen(triton_timer_resource_id, (uintptr_t) op); top->tret = TRITON_SUCCESS; + top->milliseconds = millisecs; adjust.tv_sec = (int)(millisecs / 1e3); adjust.tv_usec = (millisecs % 1000) * 1e3; @@ -66,7 +72,8 @@ ae_define_post(triton_ret_t, triton_timer, int millisecs) timeradd(&adjust, &now, &(top->timer)); triton_mutex_lock(&timer_mutex); - //holder = ae_ops_peek(&timer_oplist); + top->timer_id = ++global_timer_id_seed; + 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 @@ -91,20 +98,69 @@ ae_define_post(triton_ret_t, triton_timer, int millisecs) ae_ops_enqueue(op, &timer_oplist); } + *__ae_op_id = top->op_id; + + triton_mutex_unlock(&timer_mutex); + + ae_resource_request_poll(op->ctx, triton_timer_resource_id); + + return TRITON_SUCCESS; +} + +static triton_ret_t triton_timer_poll(ae_context_t context) +{ + struct ae_op *op; + struct ae_op *op_head; + struct timer_op *top; + struct timer_op *top_head; + struct timeval result, now; + ev_tstamp seconds; + /* Did this end up at the head of the queue? */ - holder = ae_ops_peek(&timer_oplist); - if(holder == op) + triton_mutex_lock(&timer_mutex); + op_head = ae_ops_peek(&timer_oplist); + triton_mutex_unlock(&timer_mutex); + + /* + * Update the libev timer if there is a new deadline + */ + if ((op_head != NULL) && + (top_head = ae_op_entry(op_head, struct timer_op, op)) && + (top_head->timer_id != current_timer_id)) { - /* new head of queue; arm a new timer or modify the existing one */ + current_timer_id = top_head->timer_id; + + top = ae_op_entry(op_head, struct timer_op, op); + gettimeofday(&now, NULL); + timersub(&(top->timer), &now, &result); + seconds = (double)result.tv_sec + ((double)result.tv_usec / 1e6); + + /* timer has already expired, whoops. + * handle completing it in the libev callback. + */ + if (seconds < 0.0) + { + seconds = 0.0001; + } + 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_set(&timer_watcher, seconds, 0); + timer_loop = ae_resource_get_eloop(op_head->ctx); ev_timer_start(timer_loop, &timer_watcher); } - *__ae_op_id = top->op_id; + /* harvest any timers that have been cancelled */ + triton_mutex_lock(&timer_mutex); + while((op = ae_ops_dequeue(&cancel_oplist))) + { + triton_mutex_unlock(&timer_mutex); + top = ae_op_entry(op, struct timer_op, op); + assert(top->tret == TRITON_ERR_CANCELED); + ae_opcache_complete_op(timer_opcache, op, triton_ret_t, top->tret); + triton_mutex_lock(&timer_mutex); + } triton_mutex_unlock(&timer_mutex); return TRITON_SUCCESS; @@ -147,10 +203,14 @@ static triton_ret_t triton_timer_cancel(ae_context_t triton_ctx, ae_op_id_t op_i assert(ae_ops_exists(&timer_oplist, &op->link)); ae_ops_del(op); - /* trigger callback immediately; no need to wait for a poll cycle */ + /* move to a special queue of cancelled timers */ ctx = op->ctx; + ae_ops_enqueue(op, &cancel_oplist); + triton_mutex_unlock(&timer_mutex); - ae_opcache_complete_op(timer_opcache, op, triton_ret_t, TRITON_ERR_CANCELED); + + /* request a poll for aesop to harvest the cancelled timer */ + ae_resource_request_poll(ctx, triton_timer_resource_id); return TRITON_SUCCESS; } @@ -158,6 +218,7 @@ static triton_ret_t triton_timer_cancel(ae_context_t triton_ctx, ae_op_id_t op_i struct ae_resource triton_timer_resource = { .resource_name = "timer", + .poll_context = triton_timer_poll, .cancel = triton_timer_cancel }; @@ -176,6 +237,7 @@ triton_ret_t triton_timer_init(void) ev_init(&timer_watcher, timer_cb); ae_ops_init(&timer_oplist); + ae_ops_init(&cancel_oplist); tret = AE_OPCACHE_INIT(struct timer_op, op, TIMER_DEFAULT_SIZE, &timer_opcache); if(tret != TRITON_SUCCESS) @@ -232,6 +294,8 @@ static void timer_cb(EV_P_ ev_timer *w, int revents) top = ae_op_entry(gop, struct timer_op, op); if(top) { + current_timer_id = top->timer_id; + gettimeofday(&now, NULL); timersub(&top->timer, &now, &diff); if(diff.tv_sec < 0 || diff.tv_usec < 0) hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. 55c2957f48b2f46fe4ad9ddc6323a7d4a3383f58
by noreply＠mcs.anl.gov 13 Aug '11

13 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 55c2957f48b2f46fe4ad9ddc6323a7d4a3383f58 (commit) from eeb1adfaa1ca48c66c144696a07bbb6d4a27a6af (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 55c2957f48b2f46fe4ad9ddc6323a7d4a3383f58 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Sat Aug 13 23:19:17 2011 -0400 move condition signal for thread pool improves performance a little on eureaka, and it is more standard to signal with the lock held anyway ----------------------------------------------------------------------- Summary of changes: code/src/aesop/opcache.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Diff of changes: diff --git a/code/src/aesop/opcache.c b/code/src/aesop/opcache.c index 122365e..73143c4 100644 --- a/code/src/aesop/opcache.c +++ b/code/src/aesop/opcache.c @@ -80,8 +80,8 @@ void ae_opcache_complete_op_threaded(ae_opcache_t cache, struct ae_op* op) if(cache->num_ops_in_use > 1) { ae_ops_enqueue(op, &cache->thread_queue); - triton_mutex_unlock(&cache->mutex); triton_cond_signal(&cache->cond); + triton_mutex_unlock(&cache->mutex); } else { triton_mutex_unlock(&cache->mutex); hooks/post-receive -- Triton Repository

1 0

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

03 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 eeb1adfaa1ca48c66c144696a07bbb6d4a27a6af (commit) from 9f5854e016bdcbc44ae1f460e2f8fc6018d8cf81 (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 eeb1adfaa1ca48c66c144696a07bbb6d4a27a6af Author: Phil Carns <carns(a)mcs.anl.gov> Date: Wed Aug 3 21:33:23 2011 -0500 starting point for aesop documentation ----------------------------------------------------------------------- Summary of changes: code/doc/aesop.txt | 64 +++++++++++++++++++++++++++++++++++++++++++++++++ code/doc/module.mk.in | 3 +- 2 files changed, 66 insertions(+), 1 deletions(-) create mode 100644 code/doc/aesop.txt Diff of changes: diff --git a/code/doc/aesop.txt b/code/doc/aesop.txt new file mode 100644 index 0000000..6203687 --- /dev/null +++ b/code/doc/aesop.txt @@ -0,0 +1,64 @@ +Aesop +===== + +== Source files + +Aesop source and header files are named *.ae and *.hae, respectively. They +are used exactly like c source and header files, except that they support +additional constructs, such as the __blocking qualifier for functions and +the pwait and pbranch constructs. + +In addition, Aesop remote code (ie, RPC functions) can be found in .aer and +.haer functions. These source files support an additional __remote +qualifier for functions to be invoked via RPC. + +== Compilers + +The configure process produces two compilers in the maint/ directory. aecc +is a compiler for .ae files, and aercc is a compiler for .aer files. Both +are shell scripts that combine preprocessing, source translation, and +compilation into one step. + +== Resources + +Resources are the lowest level aesop components that present Aesop +compatible intefaces for managing concurrency. The current list of +resources includes: + +* file resource +** code/src/versioned-osd/prototype/file-resource +** provides a mapping of open, close, read, write etc. functions. It uses + a thread pool by default to implement nonblocking semantics. + +* Berkeley DB resource +** code/src/versioned-osd/prototype/bdb-resource +** provides a mapping of common Berkeley DB functions. It uses a thread + pool by default to implement nonblocking semantics. + +* socket resource +** code/src/common/resources/aesocket/ +** waits for a file descriptor to be ready for read or write operations. + It does not implement actual read or write calls; it is assumed that the + caller will use this resource in conjunction with nonblocking reads and + writes. It uses libev, which in turn uses epoll() on Linux. + +* timer resource +** code/src/common/resources/timer/ +** implements timers with millisecond resolution. The underlying + implementation uses libev. + +* scheduling resource +** code/src/common/resource/scheduling/ +** Implements various synchronization primitives, for example Aesop + equivalents for condition variables. + +* branch threader resource +** code/src/common/resource/branch-threader/ +** Proof of concept that allows the developer to manually allocate a thread + for particular aesop code blocks. + +== Test programs + +A variety of tests and/or examples for Aesop functionality can be found in +the code/src/aesop/parser/tests/blocking directory. These tests use a +dummy resource to demonstrate various language features. diff --git a/code/doc/module.mk.in b/code/doc/module.mk.in index 659b2ad..46769d8 100644 --- a/code/doc/module.mk.in +++ b/code/doc/module.mk.in @@ -4,4 +4,5 @@ DOCSRC += $(DIR)/test.txt \ $(DIR)/fault-handling-overview.txt \ $(DIR)/fault-injection.txt \ $(DIR)/pipelining.txt \ - $(DIR)/compiling-triton.txt + $(DIR)/compiling-triton.txt \ + $(DIR)/aesop.txt hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. 9f5854e016bdcbc44ae1f460e2f8fc6018d8cf81
by noreply＠mcs.anl.gov 03 Aug '11

03 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 9f5854e016bdcbc44ae1f460e2f8fc6018d8cf81 (commit) via 8cd6d1e105031ba6a23c7f9cc5ff8e8bdc8a19c2 (commit) via 229d3362e4889c8c496920a515c3897ad15f3887 (commit) via afc3a0224e103f4bdb2ed2ade8e074e0cb230207 (commit) from 10a0d73364d35cbd10ce5497fb338c5f7a653ba4 (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 9f5854e016bdcbc44ae1f460e2f8fc6018d8cf81 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Wed Aug 3 21:27:21 2011 -0500 comment out aesop bug to get make test to work commit 8cd6d1e105031ba6a23c7f9cc5ff8e8bdc8a19c2 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Wed Aug 3 21:14:05 2011 -0500 fix typo commit 229d3362e4889c8c496920a515c3897ad15f3887 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Wed Aug 3 21:08:46 2011 -0500 fix typo commit afc3a0224e103f4bdb2ed2ade8e074e0cb230207 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Wed Aug 3 21:08:04 2011 -0500 finish commenting out test-remote-mpi ----------------------------------------------------------------------- Summary of changes: .../aesop/parser/tests/blocking/lonely-pbranch4.ae | 3 +++ code/src/aesop/parser/tests/remote/module.mk.in | 2 +- code/src/common/resources/timer/test/timer2.ae | 2 +- code/src/state/test/rpc-size.ae | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) Diff of changes: diff --git a/code/src/aesop/parser/tests/blocking/lonely-pbranch4.ae b/code/src/aesop/parser/tests/blocking/lonely-pbranch4.ae index e602b75..467f069 100644 --- a/code/src/aesop/parser/tests/blocking/lonely-pbranch4.ae +++ b/code/src/aesop/parser/tests/blocking/lonely-pbranch4.ae @@ -11,9 +11,12 @@ static __blocking void lonely_pbranch(void) pbranch { + /* FIXME: this does not compile! */ +#if 0 int localvar; localvar = rand(); +#endif ret1 = btest1(&a); if(ret1 != 0) diff --git a/code/src/aesop/parser/tests/remote/module.mk.in b/code/src/aesop/parser/tests/remote/module.mk.in index d3731ea..c7e023a 100644 --- a/code/src/aesop/parser/tests/remote/module.mk.in +++ b/code/src/aesop/parser/tests/remote/module.mk.in @@ -80,10 +80,10 @@ $(FULLMODNAME5).d: $(DIR_TESTREMOTE)/test-remote-buffer-response.aer REMOTE_TESTSRC += $(DIR_TESTREMOTE)/test-remote-mock.aer \ $(DIR_TESTREMOTE)/test-remote-mock-embedded-buffers.aer \ - $(DIR_TESTREMOTE)/test-remote-mpi.aer \ $(DIR_TESTREMOTE)/test-remote-fault-injector.aer \ $(DIR_TESTREMOTE)/test-remote-service-stop.aer \ $(DIR_TESTREMOTE)/test-remote-buffer-response.aer + #$(DIR_TESTREMOTE)/test-remote-mpi.aer endif # BUILD_MPI diff --git a/code/src/common/resources/timer/test/timer2.ae b/code/src/common/resources/timer/test/timer2.ae index ebf2cce..c88b66f 100644 --- a/code/src/common/resources/timer/test/timer2.ae +++ b/code/src/common/resources/timer/test/timer2.ae @@ -42,7 +42,7 @@ int receiver_ret; static void done_callback(void *user_ptr, int ret) { - ae_context_t ctx = (ae_context_t)up; + ae_context_t ctx = (ae_context_t)user_ptr; done = 1; receiver_ret = ret; ae_poll_break(ctx); diff --git a/code/src/state/test/rpc-size.ae b/code/src/state/test/rpc-size.ae index 4348830..7447d2e 100644 --- a/code/src/state/test/rpc-size.ae +++ b/code/src/state/test/rpc-size.ae @@ -106,7 +106,7 @@ int dostuff_ret; static void done_callback(void *user_ptr, int ret) { - ae_context_t ctx = (ae_context_t)up; + ae_context_t ctx = (ae_context_t)user_ptr; dostuff_ret = ret; done = 1; ae_poll_break(ctx); hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. 10a0d73364d35cbd10ce5497fb338c5f7a653ba4
by noreply＠mcs.anl.gov 03 Aug '11

03 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 10a0d73364d35cbd10ce5497fb338c5f7a653ba4 (commit) from e86d4d5217db1828d5cdfca1c019b27609278aac (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 10a0d73364d35cbd10ce5497fb338c5f7a653ba4 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Wed Aug 3 20:19:43 2011 -0500 ascidoc documentation on how to compile Triton ----------------------------------------------------------------------- Summary of changes: code/doc/compiling-triton.txt | 58 +++++++++++++++++++++++++++++++++++++++++ code/doc/module.mk.in | 3 +- 2 files changed, 60 insertions(+), 1 deletions(-) create mode 100644 code/doc/compiling-triton.txt Diff of changes: diff --git a/code/doc/compiling-triton.txt b/code/doc/compiling-triton.txt new file mode 100644 index 0000000..674baec --- /dev/null +++ b/code/doc/compiling-triton.txt @@ -0,0 +1,58 @@ +Compiling Triton +================ + +== Requirements + +* Linux +* Berkeley DB development libraries (package libdb4.8-dev or similar) +* Glaskow Haskell Compiler (package ghc6 or similar) +* MPI with support for MPI_THREAD_MULTIPLE (MPICH or OpenMPI) + +== Setting up the Haskell environment + +---- +# Download and compile necessary Haskell packages. This must only be +# done once as a normal user (not root). +cd code/maint/hs +./setup-hs-local +# Modify the langc package to support Aesop +./setup-langc +---- + +== Configuring Triton + +---- +# generate the configure script +cd code +./prepare +---- + +Triton supports VPATH builds as shown in the following example, although +you can also configure and build Triton in the source directory if you +prefer. If mpicc is not in your path then you will also have to provide +the --with-mpi=<path> argument to configure. + +---- +# create a build directory +mkdir build +# configure Triton +cd build +../code/configure +---- + +== Building Triton + +The Triton build supports the -j <level of concurrency> option to Make. + +The default makefile target will build the libtriton library, which +currently includes both client and server functionality. You can also +build a large collection of test programs using the "test" target. You can +also generate documenation using the "docs" target: + +---- +make -j 3 test +make -j 3 docs +---- + +This can take a long time to build completely, especially on slow systems. +The Aesop compilation speed is a known problem. diff --git a/code/doc/module.mk.in b/code/doc/module.mk.in index 2aa5c51..659b2ad 100644 --- a/code/doc/module.mk.in +++ b/code/doc/module.mk.in @@ -3,4 +3,5 @@ DIR := doc DOCSRC += $(DIR)/test.txt \ $(DIR)/fault-handling-overview.txt \ $(DIR)/fault-injection.txt \ - $(DIR)/pipelining.txt + $(DIR)/pipelining.txt \ + $(DIR)/compiling-triton.txt hooks/post-receive -- Triton Repository

1 0

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

01 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 e86d4d5217db1828d5cdfca1c019b27609278aac (commit) via c81023996a845207b689e3f7f36f99a720969d9a (commit) from e06a92b3380444c8c64551e984229cd80dd96699 (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 e86d4d5217db1828d5cdfca1c019b27609278aac Author: Phil Carns <carns(a)mcs.anl.gov> Date: Mon Aug 1 21:48:19 2011 -0500 configurable num threads in aesocket commit c81023996a845207b689e3f7f36f99a720969d9a Author: Phil Carns <carns(a)mcs.anl.gov> Date: Mon Aug 1 21:21:34 2011 -0500 add thread pool support to opcache ----------------------------------------------------------------------- Summary of changes: code/src/aesop/opcache.c | 105 ++++++++++++++++++++++++- code/src/aesop/opcache.h | 8 ++ code/src/common/resources/aesocket/aesocket.c | 36 ++++++++- 3 files changed, 144 insertions(+), 5 deletions(-) Diff of changes: diff --git a/code/src/aesop/opcache.c b/code/src/aesop/opcache.c index 0857720..122365e 100644 --- a/code/src/aesop/opcache.c +++ b/code/src/aesop/opcache.c @@ -16,13 +16,81 @@ struct ae_opcache int array_count; int size; int count; - triton_mutex_t mutex; ae_ops_t free_list; #endif + triton_mutex_t mutex; + triton_cond_t cond; + int num_ops_in_use; + void (*completion_fn)(struct ae_opcache* opcache, struct ae_op* op); + int num_threads; + pthread_t* tids; + ae_ops_t thread_queue; int typesize; int member_offset; }; +static void* thread_pool_fn(void* foo); + +static void* thread_pool_fn(void* foo) +{ + ae_opcache_t cache = (ae_opcache_t)foo; + struct ae_op* op; + + while(cache->num_threads > 0) + { + triton_mutex_lock(&cache->mutex); + while((op = ae_ops_dequeue(&cache->thread_queue)) == NULL) + { + pthread_cond_wait(&cache->cond, &cache->mutex); + } + triton_mutex_unlock(&cache->mutex); + cache->completion_fn(cache, op); + } + return(NULL); +} + +triton_ret_t ae_opcache_set_threads(ae_opcache_t cache, + void(*completion_fn)(ae_opcache_t opcache, struct ae_op* op), + int num_threads) +{ + int i; + int ret; + + cache->num_threads = num_threads; + cache->tids = (pthread_t*)malloc(num_threads*sizeof(pthread_t)); + if(!cache->tids) + return(TRITON_ERR_NOMEM); + cache->completion_fn = completion_fn; + + for(i=0; i<num_threads; i++) + { + ret = pthread_create(&cache->tids[i], NULL, thread_pool_fn, cache); + if(ret != 0) + { + return(TRITON_ERR_UNKNOWN); + } + } + + return(TRITON_SUCCESS); +} + +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) + { + ae_ops_enqueue(op, &cache->thread_queue); + triton_mutex_unlock(&cache->mutex); + triton_cond_signal(&cache->cond); + } else + { + triton_mutex_unlock(&cache->mutex); + cache->completion_fn(cache, op); + } + return; +} + + triton_ret_t ae_opcache_init(int typesize, int member_offset, int init_size, ae_opcache_t *cache) { struct ae_opcache *c; @@ -43,9 +111,13 @@ triton_ret_t ae_opcache_init(int typesize, int member_offset, int init_size, ae_ } c->count = 0; ae_ops_init(&(c->free_list)); - triton_mutex_init(&c->mutex, NULL); #endif + 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; c->typesize = typesize; c->member_offset = member_offset; *cache = c; @@ -85,8 +157,9 @@ triton_ret_t ae_opcache_double_size(ae_opcache_t cache) void ae_opcache_destroy(ae_opcache_t cache) { -#ifndef TRITON_OPCACHE_MALLOC int i; + int nthreads; +#ifndef TRITON_OPCACHE_MALLOC triton_mutex_lock(&cache->mutex); for(i = 0; i < cache->array_count; ++i) { @@ -94,6 +167,16 @@ void ae_opcache_destroy(ae_opcache_t cache) } triton_mutex_unlock(&cache->mutex); #endif + nthreads = cache->num_threads; + cache->num_threads = 0; + for(i=0; i<nthreads; i++) + { + pthread_join(cache->tids[i], NULL); + } + free(cache->tids); + triton_mutex_destroy(&cache->mutex); + triton_cond_destroy(&cache->cond); + ae_ops_destroy(&cache->thread_queue); free(cache); return; } @@ -123,6 +206,12 @@ struct ae_op *ae_opcache_get(ae_opcache_t cache) op = (struct ae_op *) ( (char*) malloc (cache->typesize) + cache->member_offset); ae_op_clear(op); + if(cache->num_threads > 0) + { + triton_mutex_lock(&cache->mutex); + cache->num_ops_in_use++; + triton_mutex_unlock(&cache->mutex); + } #else int aind, count; @@ -149,6 +238,7 @@ struct ae_op *ae_opcache_get(ae_opcache_t cache) { op = ae_ops_dequeue(&cache->free_list); } + cache->num_op_in_use++; triton_mutex_unlock(&cache->mutex); assert(op); #endif @@ -158,10 +248,17 @@ struct ae_op *ae_opcache_get(ae_opcache_t cache) void ae_opcache_put(ae_opcache_t cache, struct ae_op *op) { #ifdef TRITON_OPCACHE_MALLOC - free ((char*) op - cache->member_offset); + free ((char*) op - cache->member_offset); + if(cache->num_threads > 0) + { + triton_mutex_lock(&cache->mutex); + cache->num_ops_in_use--; + triton_mutex_unlock(&cache->mutex); + } #else triton_mutex_lock(&cache->mutex); ae_ops_enqueue(op, &cache->free_list); + 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 a4b1da0..8baa328 100644 --- a/code/src/aesop/opcache.h +++ b/code/src/aesop/opcache.h @@ -21,6 +21,7 @@ typedef struct ae_opcache *ae_opcache_t; ae_opcache_put(__opcache, __op); \ } while(0) +void ae_opcache_complete_op_threaded(ae_opcache_t cache, struct ae_op* op); /** * Create an opcache. @@ -30,6 +31,13 @@ ae_ret_t ae_opcache_init(int typesize, int member_offset, int init_size, ae_opcache_t *cache); /** + * Activates a thread pool to run callbacks for the opcache + */ +triton_ret_t ae_opcache_set_threads(ae_opcache_t cache, + void(*completion_fn)(ae_opcache_t opcache, struct ae_op* op), + int num_threads); + +/** * Destroy the given opcache. * Note that all entries obtained from this cache are released and * invalidated. diff --git a/code/src/common/resources/aesocket/aesocket.c b/code/src/common/resources/aesocket/aesocket.c index a2eb690..24afb6b 100644 --- a/code/src/common/resources/aesocket/aesocket.c +++ b/code/src/common/resources/aesocket/aesocket.c @@ -3,6 +3,7 @@ #include "src/aesop/opcache.h" #include "src/common/resources/aesocket/aesocket.h" #include "src/common/triton-init.h" +#include "src/zeroconf/zeroconf.h" #include <assert.h> #include <pthread.h> @@ -24,6 +25,7 @@ struct ae_context static ae_opcache_t aesocket_opcache = NULL; static int triton_aesocket_resource_id; +static int nthreads = 0; struct aesocket_op { @@ -56,7 +58,7 @@ static void aesocket_fd_ready( triton_mutex_unlock(&aesocket_mutex); ev_io_stop(eloop, io); - ae_opcache_complete_op(aesocket_opcache, op, triton_ret_t, TRITON_SUCCESS); + ae_opcache_complete_op_threaded(aesocket_opcache, op); return; } @@ -231,12 +233,37 @@ __attribute__ ((constructor)) triton_aesocket_finalize, NULL, "aesop.control"); } +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_updater(const char* key, const char* value) +{ + int ret; + + ret = sscanf(value, "%d", &nthreads); + if(ret != 1) + { + return(TRITON_ERR_INVAL); + } + + return(TRITON_SUCCESS); +} + triton_ret_t triton_aesocket_init( void) { triton_ret_t tret; int ret; + tret = triton_zeroconf_register("triton.aesocket.nthreads", "2", + nthreads_updater, "Number of threads the aesocket resource will use for callbacks."); + if(tret != TRITON_SUCCESS) + { + return(tret); + } + event_loop_thread = pthread_self(); ae_ops_init(&posted_oplist); @@ -252,6 +279,13 @@ triton_ret_t triton_aesocket_init( return tret; } + tret = ae_opcache_set_threads(aesocket_opcache, aesocket_completion_fn, + nthreads); + if (tret != TRITON_SUCCESS) + { + return tret; + } + return ae_resource_register(&triton_aesocket_resource, &triton_aesocket_resource_id); } hooks/post-receive -- Triton Repository

1 0