February 2012 - Asg - mailman3.cels.anl.gov

Wiki update: User:Gyanasr
by Wiki update: Asg: Carns 22 Feb '12

22 Feb '12

1 0

Quota question
by Dries Kimpe 21 Feb '12

21 Feb '12

Hi everybody, I was just wondering what our goal/standpoint was related to file system quotas. - Are they merely useful or are they required functionality? - Are they something we will have to look at for each implementation or is (do we want) it to be a shared component? - As a side note: I don't think fuse supports quotas. (is not as bad as it sounds: we could provide our own tools to list /set quota, and have the file system reject writes that violate quota. [similar to XFS, which also doesn't implement quota in the standard way] Greetings, Dries

1 0

[aesop] #14: move aefile code
by aesop 21 Feb '12

21 Feb '12

#14: move aefile code ---------------------------+------------------------------------------------ Reporter: carns | Owner: carns Type: task | Status: new Priority: minor | Component: don't know Version: git repository | Keywords: ---------------------------+------------------------------------------------ The code that is currently in resources/file/* should be moved to a top level "file" or "aefile" subdirectory in the aesop tree. It isn't technically a resource and we don't plan to make it into one. -- Ticket URL: <https://trac.mcs.anl.gov/projects/aesop/ticket/14> aesop <https://trac.mcs.anl.gov/projects/aesop> The Aesop Language

1 1

[aesop] #13: implement cancel() in aethread resource
by aesop 21 Feb '12

21 Feb '12

#13: implement cancel() in aethread resource ----------------------------+----------------------------------------------- Reporter: carns | Owner: carns Type: feature request | Status: new Priority: minor | Component: don't know Version: git repository | Keywords: ----------------------------+----------------------------------------------- The new thread resource in the aesop tree doesn't support cancellation. It should at least check the operation queue and cancel any operations that have not begun service. -- Ticket URL: <https://trac.mcs.anl.gov/projects/aesop/ticket/13> aesop <https://trac.mcs.anl.gov/projects/aesop> The Aesop Language

1 1

Re: [ASG] [aesop] #3: set up trac to email updates to main project mailing list
by aesop 21 Feb '12

21 Feb '12

#3: set up trac to email updates to main project mailing list ------------------+--------------------------------------------------------- Reporter: carns | Owner: dkimpe Type: task | Status: closed Priority: major | Component: component1 Version: | Resolution: fixed Keywords: | ------------------+--------------------------------------------------------- Changes (by carns): * status: new => closed * resolution: => fixed Comment: This seems to be working now. -- Ticket URL: <https://trac.mcs.anl.gov/projects/aesop/ticket/3#comment:1> aesop <https://trac.mcs.anl.gov/projects/aesop> The Aesop Language

1 0

Re: [ASG] [aesop] #8: Basic example of modifying basic.ae does not work if we use an empty string "" in aesop_main_set()
by aesop 21 Feb '12

21 Feb '12

#8: Basic example of modifying basic.ae does not work if we use an empty string "" in aesop_main_set() -------------------+-------------------------------------------------------- Reporter: carns | Owner: somebody Type: defect | Status: closed Priority: major | Component: component1 Version: | Resolution: fixed Keywords: | -------------------+-------------------------------------------------------- Changes (by carns): * status: new => closed * resolution: => fixed Comment: Closing ticket. The example works if you just omit the last argument to aesop_main_set() instead of passing in an empty string. The test programs in the aesop tree have been updated to use this method (which enables all resources by default). -- Ticket URL: <https://trac.mcs.anl.gov/projects/aesop/ticket/8#comment:1> aesop <https://trac.mcs.anl.gov/projects/aesop> The Aesop Language

1 0

aesop Repository branch, master, updated. e64d7c91970c0a9315016b5729a3b2ea7a53818e
by noreply＠mcs.anl.gov 21 Feb '12

21 Feb '12

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 "aesop Repository". The branch, master has been updated via e64d7c91970c0a9315016b5729a3b2ea7a53818e (commit) from ebe80e0520e31f03415da31050493f15d346e9b8 (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 e64d7c91970c0a9315016b5729a3b2ea7a53818e Author: Phil Carns <carns(a)mcs.anl.gov> Date: Tue Feb 21 15:33:41 2012 -0500 move aefile again (to right subdir this time) ----------------------------------------------------------------------- Summary of changes: configure.ac | 4 ++-- {aefile => src/aefile}/aefile.ae | 2 +- {aefile => src/aefile}/aefile.hae | 0 {aefile => src/aefile}/module.mk.in | 2 +- {aefile => src/aefile}/test/aefile-example.ae | 2 +- {aefile => src/aefile}/test/module.mk.in | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) rename {aefile => src/aefile}/aefile.ae (98%) rename {aefile => src/aefile}/aefile.hae (100%) rename {aefile => src/aefile}/module.mk.in (77%) rename {aefile => src/aefile}/test/aefile-example.ae (98%) rename {aefile => src/aefile}/test/module.mk.in (64%) Diff of changes: diff --git a/configure.ac b/configure.ac index ae2ac6c..530ffa1 100644 --- a/configure.ac +++ b/configure.ac @@ -293,8 +293,8 @@ AC_CONFIG_FILES([bin/aecc], [chmod +x bin/aecc]) AC_OUTPUT([Makefile resources/timer/test/module.mk resources/timer/module.mk -aefile/module.mk -aefile/test/module.mk +src/aefile/module.mk +src/aefile/test/module.mk resources/thread/module.mk resources/thread/test/module.mk resources/resourcebuilder/module.mk diff --git a/aefile/aefile.ae b/src/aefile/aefile.ae similarity index 98% rename from aefile/aefile.ae rename to src/aefile/aefile.ae index 30573e6..db89705 100644 --- a/aefile/aefile.ae +++ b/src/aefile/aefile.ae @@ -10,7 +10,7 @@ #include <limits.h> #include <stdlib.h> -#include "aefile/aefile.hae" +#include "src/aefile/aefile.hae" #include "resources/thread/aethread.hae" struct aethread_group* file_threads = NULL; diff --git a/aefile/aefile.hae b/src/aefile/aefile.hae similarity index 100% rename from aefile/aefile.hae rename to src/aefile/aefile.hae diff --git a/aefile/module.mk.in b/src/aefile/module.mk.in similarity index 77% rename from aefile/module.mk.in rename to src/aefile/module.mk.in index 5d4cb22..aa0887d 100644 --- a/aefile/module.mk.in +++ b/src/aefile/module.mk.in @@ -1,4 +1,4 @@ -DIR := aefile +DIR := src/aefile AESOP_HDR += $(DIR)/aefile.hae diff --git a/aefile/test/aefile-example.ae b/src/aefile/test/aefile-example.ae similarity index 98% rename from aefile/test/aefile-example.ae rename to src/aefile/test/aefile-example.ae index 210c7ff..7f83c20 100644 --- a/aefile/test/aefile-example.ae +++ b/src/aefile/test/aefile-example.ae @@ -8,7 +8,7 @@ #include <stdlib.h> #include "aesop.h" -#include "aefile/aefile.hae" +#include "src/aefile/aefile.hae" #include "resources/thread/aethread.hae" static double wtime(void) diff --git a/aefile/test/module.mk.in b/src/aefile/test/module.mk.in similarity index 64% rename from aefile/test/module.mk.in rename to src/aefile/test/module.mk.in index e9400a6..1a10943 100644 --- a/aefile/test/module.mk.in +++ b/src/aefile/test/module.mk.in @@ -1,4 +1,4 @@ -DIR := aefile/test +DIR := src/aefile/test AETESTSRC += $(DIR)/aefile-example.ae hooks/post-receive -- aesop Repository

1 0

aesop Repository branch, master, updated. ebe80e0520e31f03415da31050493f15d346e9b8
by noreply＠mcs.anl.gov 21 Feb '12

21 Feb '12

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 "aesop Repository". The branch, master has been updated via ebe80e0520e31f03415da31050493f15d346e9b8 (commit) via eee59b0eebb1eb18452080f62bea889a100178f7 (commit) via ce86b8bcfc97435f70bc29a017ea3404106ad06f (commit) via da53255c21b534c73cc39a6620788144209c97aa (commit) from 3d521de5c3f9a46431f06993a440babd0ae1c2be (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 ebe80e0520e31f03415da31050493f15d346e9b8 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Tue Feb 21 13:25:12 2012 -0500 cancel support in aethread resource commit eee59b0eebb1eb18452080f62bea889a100178f7 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Tue Feb 21 12:18:29 2012 -0500 track active thread groups commit ce86b8bcfc97435f70bc29a017ea3404106ad06f Author: Phil Carns <carns(a)mcs.anl.gov> Date: Tue Feb 21 12:02:12 2012 -0500 return error code on aethread_hint() commit da53255c21b534c73cc39a6620788144209c97aa Author: Phil Carns <carns(a)mcs.anl.gov> Date: Tue Feb 21 11:11:24 2012 -0500 test program for aethread cancel functionality ----------------------------------------------------------------------- Summary of changes: resources/thread/aethread.c | 74 ++++++++++++++++----- resources/thread/aethread.hae | 2 +- resources/thread/test/aethread-cancel.ae | 105 ++++++++++++++++++++++++++++++ resources/thread/test/module.mk.in | 3 +- 4 files changed, 166 insertions(+), 18 deletions(-) create mode 100644 resources/thread/test/aethread-cancel.ae Diff of changes: diff --git a/resources/thread/aethread.c b/resources/thread/aethread.c index d6b2cdf..b7782a0 100644 --- a/resources/thread/aethread.c +++ b/resources/thread/aethread.c @@ -12,6 +12,7 @@ struct aethread_op { ae_op_id_t op_id; struct ae_op op; + int ret; }; struct aethread_group @@ -23,6 +24,7 @@ struct aethread_group pthread_cond_t pool_cond; pthread_mutex_t pool_mutex; ae_ops_t oplist; + triton_list_link_t link; }; /* TODO: make configurable, or better yet dynamic based a runtime * calculation that compares typical op service times against how long it @@ -36,10 +38,24 @@ static int initialized = 0; static void* thread_pool_fn(void* foo); +/* list of active groups. We have to track them all so that we can look + * through the groups to find operations to be cancelled. + */ +static triton_list_t group_list = TRITON_LIST_STATIC_INITIALIZER(group_list); +static pthread_mutex_t group_mutex = PTHREAD_MUTEX_INITIALIZER; + void aethread_destroy_group(struct aethread_group* group) { int i; + pthread_mutex_lock(&group_mutex); + triton_list_del(&group->link); + pthread_mutex_unlock(&group_mutex); + + /* TODO: should we do something to handle operations still in the queue + * for this group? + */ + pthread_mutex_lock(&group->pool_mutex); group->pool_started = 0; pthread_cond_broadcast(&group->pool_cond); @@ -89,6 +105,10 @@ struct aethread_group* aethread_create_group_pool(int size) assert(ret == 0); /* TODO: err handling */ } + pthread_mutex_lock(&group_mutex); + triton_list_add_back(&group->link, &group_list); + pthread_mutex_unlock(&group_mutex); + return(group); } @@ -96,8 +116,6 @@ static void* thread_pool_fn(void* foo) { struct aethread_group* group = (struct aethread_group*)foo; struct ae_op* op = NULL; - void* user_ptr; - void (*callback)(void*); while(1) { @@ -129,25 +147,14 @@ static void* thread_pool_fn(void* foo) /* no work; just run callback in the context of this thread */ /* trigger completion of the operation */ - /* TODO: follow up on this. Can't use the usual complete_op macro - * because there is no return code - */ - user_ptr = op->user_ptr; - callback = op->callback; - callback(user_ptr); - ae_opcache_put(aethread_opcache, op); + + ae_opcache_complete_op(aethread_opcache, op, int, 0); } return(NULL); } -int aethread_hint(void (*__ae_callback)(void *ptr), \ - void *__ae_user_ptr, \ - ae_hints_t *__ae_hints, \ - ae_context_t __ae_ctx, \ - ae_op_id_t *__ae_op_id, \ - int __ae_internal, \ - struct aethread_group* group) +ae_define_post(int, aethread_hint, struct aethread_group *group) { struct ae_op *op; struct aethread_op *a_op; @@ -168,6 +175,7 @@ int aethread_hint(void (*__ae_callback)(void *ptr), \ a_op = ae_op_entry(op, struct aethread_op, op); a_op->op_id = ae_id_gen(aethread_resource_id, (intptr_t) op); + a_op->ret = 0; *__ae_op_id = a_op->op_id; @@ -190,6 +198,40 @@ static int triton_aethread_poll(ae_context_t context) static int triton_aethread_cancel(ae_context_t triton_ctx, ae_op_id_t op_id) { + int resource_id; + struct ae_op *op; + struct aethread_op *aop; + ae_context_t ctx; + struct aethread_group *group, *tmpgroup; + int found = 0; + + triton_mutex_lock(&group_mutex); + + op = intptr2op (ae_id_lookup(op_id, &resource_id)); + assert(resource_id == aethread_resource_id); + + /* search to see if this operation is still in a queue waiting for + * service. If so, cancel it. If not, let it complete naturally. + */ + triton_list_for_each_entry(group, tmpgroup, &group_list, struct aethread_group, link) + { + pthread_mutex_lock(&group->pool_mutex); + if(ae_ops_exists(&group->oplist, &op->link)) + { + /* found it */ + triton_list_del(&op->link); + aop = ae_op_entry(op, struct aethread_op, op); + aop->ret = AE_ERR_CANCELLED; + ae_opcache_complete_op(aethread_opcache, op, int, AE_ERR_CANCELLED); + found = 1; + } + pthread_mutex_unlock(&group->pool_mutex); + if(found) + break; + } + + triton_mutex_unlock(&group_mutex); + return AE_SUCCESS; } diff --git a/resources/thread/aethread.hae b/resources/thread/aethread.hae index b95f050..c41b0f3 100644 --- a/resources/thread/aethread.hae +++ b/resources/thread/aethread.hae @@ -8,7 +8,7 @@ struct aethread_group; struct aethread_group* aethread_create_group_pool(int size); void aethread_destroy_group(struct aethread_group* group); -__blocking void aethread_hint(struct aethread_group* group); +__blocking int aethread_hint(struct aethread_group* group); int aethread_init(void); void aethread_finalize(void); diff --git a/resources/thread/test/aethread-cancel.ae b/resources/thread/test/aethread-cancel.ae new file mode 100644 index 0000000..4f8cba8 --- /dev/null +++ b/resources/thread/test/aethread-cancel.ae @@ -0,0 +1,105 @@ + +#include <stdio.h> +#include <unistd.h> +#include <sys/time.h> + +#include "aesop.h" +#include "resources/thread/aethread.hae" +#include "resources/timer/timer.hae" +#include "aesop-support.hae" + +static double wtime(void) +{ + struct timeval t; + gettimeofday(&t, (void *) 0); + return ( (double) t.tv_sec + ( (double) t.tv_usec / 1000000 ) ); +} + +static __blocking int dotest(void) +{ + struct aethread_group* agroup; + double start, end; + + /* thread group with 2 threads */ + agroup = aethread_create_group_pool(2); + assert(agroup); + + start = wtime(); + /* branch that starts three sleeps of 3 seconds each. Without cancel + * support, it will take 6 seconds to complete (because only 2 ops fit + * in the thread group at a time). With cancel support it should take 3 + * seconds because we will be able to cancel one in the queue. + */ + pwait + { + pprivate int ret; + + pbranch + { + ret = aethread_hint(agroup); + if(ret != AE_ERR_CANCELLED) + sleep(3); + else + printf("pbranch cancelled.\n"); + } + + pbranch + { + ret = aethread_hint(agroup); + if(ret != AE_ERR_CANCELLED) + sleep(3); + else + printf("pbranch cancelled.\n"); + } + + pbranch + { + ret = aethread_hint(agroup); + if(ret != AE_ERR_CANCELLED) + sleep(3); + else + printf("pbranch cancelled.\n"); + } + + pbranch + { + /* wait 100 milliseconds to make sure that some threads begin + * service + */ + triton_timer(100); + + /* cancel what we can */ + aesop_cancel_branches_wait(); + } + } + end = wtime(); + + printf("First example (should be about 3 seconds): %f seconds.\n", (end-start)); + + aethread_destroy_group(agroup); + return 0; +} + +__blocking int aesop_main(int argc, char **argv) +{ + int ret; + + ret = dotest(); + if(ret == 0) + printf("Success.\n"); + else + printf("Failure.\n"); + + return(ret); +} + +aesop_main_set(aesop_main); + +/* + * Local variables: + * c-indent-level: 4 + * c-basic-offset: 4 + * End: + * + * vim: ft=c ts=8 sts=4 sw=4 expandtab + */ diff --git a/resources/thread/test/module.mk.in b/resources/thread/test/module.mk.in index 8b4d1db..2aa721b 100644 --- a/resources/thread/test/module.mk.in +++ b/resources/thread/test/module.mk.in @@ -1,4 +1,5 @@ DIR := resources/thread/test -AETESTSRC += $(DIR)/aethread-example.ae +AETESTSRC += $(DIR)/aethread-example.ae \ + $(DIR)/aethread-cancel.ae hooks/post-receive -- aesop Repository

1 0

aesop Repository branch, master, updated. 3d521de5c3f9a46431f06993a440babd0ae1c2be
by noreply＠mcs.anl.gov 21 Feb '12

21 Feb '12

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 "aesop Repository". The branch, master has been updated via 3d521de5c3f9a46431f06993a440babd0ae1c2be (commit) from a2c2dccfc702bbd41fb16172faa1f1e2d3f04ebf (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 3d521de5c3f9a46431f06993a440babd0ae1c2be Author: Phil Carns <carns(a)mcs.anl.gov> Date: Tue Feb 21 10:58:03 2012 -0500 update timer tests to use aesop_main_set() ----------------------------------------------------------------------- Summary of changes: resources/timer/test/pthread-compare.ae | 37 ++++------------------------ resources/timer/test/timer-cancel.ae | 40 ++++--------------------------- resources/timer/test/timer1.ae | 39 +++--------------------------- resources/timer/test/timer2.ae | 37 ++++------------------------ 4 files changed, 19 insertions(+), 134 deletions(-) Diff of changes: diff --git a/resources/timer/test/pthread-compare.ae b/resources/timer/test/pthread-compare.ae index 181b891..a3f2321 100644 --- a/resources/timer/test/pthread-compare.ae +++ b/resources/timer/test/pthread-compare.ae @@ -24,16 +24,6 @@ static __blocking int triton_dosleep(void) return 0; } -static int done = 0; -static int dosleep_ret; -static void done_cb(void *up, int ret) -{ - ae_context_t ctx = (ae_context_t)up; - dosleep_ret = ret; - done = 1; - ae_poll_break(ctx); -} - static void *threadfun(void *cb) { sleep(1); @@ -65,30 +55,13 @@ static void thread_dosleep(void) -int main(int argc, char *argv[]) +__blocking int aesop_main(int argc, char **argv) { - int ret; - ae_op_id_t op_id; - ae_context_t ctx; - ae_hints_t hints; + int dosleep_ret; struct timeval t1, t2, diff; - triton_timer_init(); - - ae_context_create(&ctx, "timer"); - gettimeofday(&t1, NULL); - ae_hints_init(&hints); - ret = ae_post_blocking(triton_dosleep, done_cb, ctx, &hints, ctx, &op_id, &dosleep_ret); - if(ret == AE_SUCCESS) - { - while (done == 0) - { - ae_poll(ctx, 10); - } - } - aesop_error_assert(ret); - ae_hints_destroy(&hints); + dosleep_ret = triton_dosleep(); gettimeofday(&t2, NULL); diff.tv_sec = t2.tv_sec - t1.tv_sec; diff.tv_usec = t2.tv_usec - t1.tv_usec; @@ -111,11 +84,11 @@ int main(int argc, char *argv[]) } printf("thread time: %d.%06d secs\n", (int)diff.tv_sec, (int)diff.tv_usec); - ae_context_destroy(ctx); - triton_timer_finalize(); return dosleep_ret; } +aesop_main_set(aesop_main); + /* * Local variables: * c-indent-level: 4 diff --git a/resources/timer/test/timer-cancel.ae b/resources/timer/test/timer-cancel.ae index 804aaee..f38c6a5 100644 --- a/resources/timer/test/timer-cancel.ae +++ b/resources/timer/test/timer-cancel.ae @@ -31,47 +31,17 @@ static __blocking int dotimer(void) return 0; } -int done = 0; -int dotimer_ret; - -static void done_callback(void *up, int ret) -{ - ae_context_t ctx = (ae_context_t)up; - done = 1; - dotimer_ret = ret; - ae_poll_break(ctx); -} - -int main(int argc, char *argv[]) +__blocking int aesop_main(int argc, char **argv) { - int ret; - ae_context_t ctx; - ae_hints_t hints; - int pc = 0; - ae_op_id_t op_id; + int dotimer_ret; - triton_timer_init(); - ae_context_create(&ctx, "timer"); - - ae_hints_init(&hints); - ret = ae_post_blocking(dotimer, done_callback, ctx, &hints, ctx, &op_id, &dotimer_ret); - if(ret == AE_SUCCESS) - { - while(done == 0) - { - ae_poll(ctx, 10); - /* printf("polled %d times\n", ++pc); */ - } - } - aesop_error_assert(ret); - - ae_hints_destroy(&hints); - ae_context_destroy(ctx); - triton_timer_finalize(); + dotimer_ret = dotimer(); return dotimer_ret; } +aesop_main_set(aesop_main); + /* * Local variables: * c-indent-level: 4 diff --git a/resources/timer/test/timer1.ae b/resources/timer/test/timer1.ae index 09a657e..77a5b63 100644 --- a/resources/timer/test/timer1.ae +++ b/resources/timer/test/timer1.ae @@ -31,47 +31,16 @@ static __blocking int dotimer(void) return 0; } -int done = 0; -int dotimer_ret; - -static void done_callback(void *up, int ret) +__blocking int aesop_main(int argc, char **argv) { - ae_context_t ctx = (ae_context_t)up; - done = 1; - dotimer_ret = ret; - ae_poll_break(ctx); -} - -int main(int argc, char *argv[]) -{ - int ret; - ae_hints_t hints; - ae_context_t ctx; - int pc = 0; - ae_op_id_t op_id; - - triton_timer_init(); - ae_context_create(&ctx, "timer"); - - ae_hints_init(&hints); - ret = ae_post_blocking(dotimer, done_callback, ctx, &hints, ctx, &op_id, &dotimer_ret); - if(ret == AE_SUCCESS) - { - while(done == 0) - { - ae_poll(ctx, 10); - printf("polled %d times\n", ++pc); - } - } - aesop_error_assert(ret); + int dotimer_ret; - ae_hints_destroy(&hints); - ae_context_destroy(ctx); - triton_timer_finalize(); + dotimer_ret = dotimer(); return dotimer_ret; } +aesop_main_set(aesop_main); /* * Local variables: * c-indent-level: 4 diff --git a/resources/timer/test/timer2.ae b/resources/timer/test/timer2.ae index 26283d8..b62bc90 100644 --- a/resources/timer/test/timer2.ae +++ b/resources/timer/test/timer2.ae @@ -37,48 +37,21 @@ static __blocking int receiver() return 0; } -int done = 0; -int receiver_ret; - -static void done_callback(void *user_ptr, int ret) -{ - ae_context_t ctx = (ae_context_t)user_ptr; - done = 1; - receiver_ret = ret; - ae_poll_break(ctx); -} - -int main(int argc, char *argv[]) +__blocking int aesop_main(int argc, char **argv) { - int ret; - ae_op_id_t op_id; - ae_context_t ctx; - ae_hints_t hints; - - triton_timer_init(); - - ae_context_create(&ctx, "timer"); + int receiver_ret; printf("ready\n"); - ae_hints_init(&hints); - ret = ae_post_blocking(receiver, done_callback, ctx, &hints, ctx, &op_id, &receiver_ret); - if(ret == AE_SUCCESS) - { - while (done == 0) - { - ae_poll(ctx, 10); - } - } - aesop_error_assert(ret); - ae_hints_destroy(&hints); + receiver_ret = receiver(); printf("done\n"); - ae_context_destroy(ctx); return receiver_ret; } +aesop_main_set(aesop_main); + /* * Local Variables: * c-basic-offset: 4 hooks/post-receive -- aesop Repository

1 0

aesop Repository branch, master, updated. a2c2dccfc702bbd41fb16172faa1f1e2d3f04ebf
by noreply＠mcs.anl.gov 21 Feb '12

21 Feb '12

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 "aesop Repository". The branch, master has been updated via a2c2dccfc702bbd41fb16172faa1f1e2d3f04ebf (commit) from 025246d0d7015004b34fa4e77e44bafd341bf832 (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 a2c2dccfc702bbd41fb16172faa1f1e2d3f04ebf Author: Phil Carns <carns(a)mcs.anl.gov> Date: Tue Feb 21 09:44:46 2012 -0500 moved aefile code out of resource dir ----------------------------------------------------------------------- Summary of changes: {resources/file => aefile}/aefile.ae | 2 +- {resources/file => aefile}/aefile.hae | 0 {resources/file => aefile}/module.mk.in | 2 +- {resources/file => aefile}/test/aefile-example.ae | 2 +- {resources/file => aefile}/test/module.mk.in | 2 +- configure.ac | 4 ++-- 6 files changed, 6 insertions(+), 6 deletions(-) rename {resources/file => aefile}/aefile.ae (98%) rename {resources/file => aefile}/aefile.hae (100%) rename {resources/file => aefile}/module.mk.in (73%) rename {resources/file => aefile}/test/aefile-example.ae (98%) rename {resources/file => aefile}/test/module.mk.in (60%) Diff of changes: diff --git a/resources/file/aefile.ae b/aefile/aefile.ae similarity index 98% rename from resources/file/aefile.ae rename to aefile/aefile.ae index 27ada83..30573e6 100644 --- a/resources/file/aefile.ae +++ b/aefile/aefile.ae @@ -10,7 +10,7 @@ #include <limits.h> #include <stdlib.h> -#include "resources/file/aefile.hae" +#include "aefile/aefile.hae" #include "resources/thread/aethread.hae" struct aethread_group* file_threads = NULL; diff --git a/resources/file/aefile.hae b/aefile/aefile.hae similarity index 100% rename from resources/file/aefile.hae rename to aefile/aefile.hae diff --git a/resources/file/module.mk.in b/aefile/module.mk.in similarity index 73% rename from resources/file/module.mk.in rename to aefile/module.mk.in index d23d62d..5d4cb22 100644 --- a/resources/file/module.mk.in +++ b/aefile/module.mk.in @@ -1,4 +1,4 @@ -DIR := resources/file +DIR := aefile AESOP_HDR += $(DIR)/aefile.hae diff --git a/resources/file/test/aefile-example.ae b/aefile/test/aefile-example.ae similarity index 98% rename from resources/file/test/aefile-example.ae rename to aefile/test/aefile-example.ae index b971d09..210c7ff 100644 --- a/resources/file/test/aefile-example.ae +++ b/aefile/test/aefile-example.ae @@ -8,7 +8,7 @@ #include <stdlib.h> #include "aesop.h" -#include "resources/file/aefile.hae" +#include "aefile/aefile.hae" #include "resources/thread/aethread.hae" static double wtime(void) diff --git a/resources/file/test/module.mk.in b/aefile/test/module.mk.in similarity index 60% rename from resources/file/test/module.mk.in rename to aefile/test/module.mk.in index 03dc4d7..e9400a6 100644 --- a/resources/file/test/module.mk.in +++ b/aefile/test/module.mk.in @@ -1,4 +1,4 @@ -DIR := resources/file/test +DIR := aefile/test AETESTSRC += $(DIR)/aefile-example.ae diff --git a/configure.ac b/configure.ac index bc69217..ae2ac6c 100644 --- a/configure.ac +++ b/configure.ac @@ -293,8 +293,8 @@ AC_CONFIG_FILES([bin/aecc], [chmod +x bin/aecc]) AC_OUTPUT([Makefile resources/timer/test/module.mk resources/timer/module.mk -resources/file/module.mk -resources/file/test/module.mk +aefile/module.mk +aefile/test/module.mk resources/thread/module.mk resources/thread/test/module.mk resources/resourcebuilder/module.mk hooks/post-receive -- aesop Repository

1 0