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

Triton Repository branch, master, updated. 9c5d505e6107d19509776845be0a4ea07f663e2c
by noreply＠mcs.anl.gov 28 Apr '11

28 Apr '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 9c5d505e6107d19509776845be0a4ea07f663e2c (commit) from 926c102eec677a923a21dfb1bb0b8c9391658e66 (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 9c5d505e6107d19509776845be0a4ea07f663e2c Author: Phil Carns <carns(a)mcs.anl.gov> Date: Thu Apr 28 21:45:47 2011 -0400 add timer resource to pbreak tests ----------------------------------------------------------------------- Summary of changes: .../parser/tests/blocking/pbreak-immed-cancel.ae | 2 +- code/src/aesop/parser/tests/blocking/pbreak2.ae | 2 +- code/src/aesop/parser/tests/blocking/pbreak3.ae | 2 +- code/src/aesop/parser/tests/blocking/pbreak4.ae | 2 +- code/src/aesop/parser/tests/blocking/pbreak5.ae | 2 +- code/src/aesop/parser/tests/blocking/pbreak6.ae | 2 +- code/src/aesop/parser/tests/blocking/pbreak7.ae | 2 +- code/src/aesop/parser/tests/blocking/pbreak8.ae | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) Diff of changes: diff --git a/code/src/aesop/parser/tests/blocking/pbreak-immed-cancel.ae b/code/src/aesop/parser/tests/blocking/pbreak-immed-cancel.ae index cede438..3c83480 100644 --- a/code/src/aesop/parser/tests/blocking/pbreak-immed-cancel.ae +++ b/code/src/aesop/parser/tests/blocking/pbreak-immed-cancel.ae @@ -56,5 +56,5 @@ __blocking int aesop_main(int argc, char **argv) run_pbreak(); return 0; } -btest_main_set(aesop_main, "btest"); +btest_main_set(aesop_main, "btest", "timer"); diff --git a/code/src/aesop/parser/tests/blocking/pbreak2.ae b/code/src/aesop/parser/tests/blocking/pbreak2.ae index 5e57d14..977d11b 100644 --- a/code/src/aesop/parser/tests/blocking/pbreak2.ae +++ b/code/src/aesop/parser/tests/blocking/pbreak2.ae @@ -47,5 +47,5 @@ __blocking int aesop_main(int argc, char **argv) run_pbreak2(); return 0; } -btest_main_set(aesop_main, "btest"); +btest_main_set(aesop_main, "btest", "timer"); diff --git a/code/src/aesop/parser/tests/blocking/pbreak3.ae b/code/src/aesop/parser/tests/blocking/pbreak3.ae index e8bb3e9..f69a18d 100644 --- a/code/src/aesop/parser/tests/blocking/pbreak3.ae +++ b/code/src/aesop/parser/tests/blocking/pbreak3.ae @@ -56,4 +56,4 @@ __blocking int aesop_main(int argc, char **argv) run_pbreak3(); return 0; } -btest_main_set(aesop_main, "btest"); +btest_main_set(aesop_main, "btest", "timer"); diff --git a/code/src/aesop/parser/tests/blocking/pbreak4.ae b/code/src/aesop/parser/tests/blocking/pbreak4.ae index bb01cf5..4bdbe45 100644 --- a/code/src/aesop/parser/tests/blocking/pbreak4.ae +++ b/code/src/aesop/parser/tests/blocking/pbreak4.ae @@ -66,4 +66,4 @@ __blocking int aesop_main(int argc, char **argv) run_pbreak4(); return 0; } -btest_main_set(aesop_main, "btest"); +btest_main_set(aesop_main, "btest", "timer"); diff --git a/code/src/aesop/parser/tests/blocking/pbreak5.ae b/code/src/aesop/parser/tests/blocking/pbreak5.ae index 0014d00..15cd051 100644 --- a/code/src/aesop/parser/tests/blocking/pbreak5.ae +++ b/code/src/aesop/parser/tests/blocking/pbreak5.ae @@ -61,4 +61,4 @@ __blocking int aesop_main(int argc, char **argv) run_pbreak5(); return 0; } -btest_main_set(aesop_main, "btest"); +btest_main_set(aesop_main, "btest", "timer"); diff --git a/code/src/aesop/parser/tests/blocking/pbreak6.ae b/code/src/aesop/parser/tests/blocking/pbreak6.ae index f44d8ba..8178bb2 100644 --- a/code/src/aesop/parser/tests/blocking/pbreak6.ae +++ b/code/src/aesop/parser/tests/blocking/pbreak6.ae @@ -55,4 +55,4 @@ __blocking int aesop_main(int argc, char **argv) run_pbreak6(); return 0; } -btest_main_set(aesop_main, "btest"); +btest_main_set(aesop_main, "btest", "timer"); diff --git a/code/src/aesop/parser/tests/blocking/pbreak7.ae b/code/src/aesop/parser/tests/blocking/pbreak7.ae index 42869ee..453388b 100644 --- a/code/src/aesop/parser/tests/blocking/pbreak7.ae +++ b/code/src/aesop/parser/tests/blocking/pbreak7.ae @@ -76,7 +76,7 @@ __blocking int aesop_main(int argc, char **argv) run_par1(); return 0; } -btest_main_set(aesop_main, "btest"); +btest_main_set(aesop_main, "btest", "timer"); /* * Local variables: diff --git a/code/src/aesop/parser/tests/blocking/pbreak8.ae b/code/src/aesop/parser/tests/blocking/pbreak8.ae index 8463d64..5fb7841 100644 --- a/code/src/aesop/parser/tests/blocking/pbreak8.ae +++ b/code/src/aesop/parser/tests/blocking/pbreak8.ae @@ -74,7 +74,7 @@ __blocking int aesop_main(int argc, char **argv) run_par1(); return 0; } -btest_main_set(aesop_main, "btest"); +btest_main_set(aesop_main, "btest", "timer"); /* * Local variables: hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. 926c102eec677a923a21dfb1bb0b8c9391658e66
by noreply＠mcs.anl.gov 28 Apr '11

28 Apr '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 926c102eec677a923a21dfb1bb0b8c9391658e66 (commit) via ebe30492134dd61e50f62f5e3604decc6d1cfa57 (commit) from 3c9a4c57bf4d0178d3d504961f16480f6bdef983 (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 926c102eec677a923a21dfb1bb0b8c9391658e66 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Thu Apr 28 21:38:10 2011 -0400 bugfix to default make target all:: doesn't have to explicitly require the aercc genfiles any more; these are built as needed according to the dependency tree fixes #113 commit ebe30492134dd61e50f62f5e3604decc6d1cfa57 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Thu Apr 28 21:22:19 2011 -0400 missing resource and logic bug in test program ----------------------------------------------------------------------- Summary of changes: code/Makefile.in | 2 +- .../tests/blocking/pbreak-before-blocking.ae | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) Diff of changes: diff --git a/code/Makefile.in b/code/Makefile.in index a7d375b..20d08a0 100644 --- a/code/Makefile.in +++ b/code/Makefile.in @@ -557,7 +557,7 @@ $(HSBIN): %: $(srcdir)/%.lhs $(HSSRC) # User targets -all:: $(REMOTE_MODULES_GENFILES) $(PROGRAMS) $(LIBRARIES) +all:: $(PROGRAMS) $(LIBRARIES) $(runTESTS): run%: % @if test -n "$(call testparams,$<)"; then \ diff --git a/code/src/aesop/parser/tests/blocking/pbreak-before-blocking.ae b/code/src/aesop/parser/tests/blocking/pbreak-before-blocking.ae index f38572c..2157697 100644 --- a/code/src/aesop/parser/tests/blocking/pbreak-before-blocking.ae +++ b/code/src/aesop/parser/tests/blocking/pbreak-before-blocking.ae @@ -17,7 +17,15 @@ static __blocking void run_par1(void) if(ret1 != 0) { printf("pbranch cancelled.\n"); - aesop_cancel_branches_wait(); + /* NOTE: In this case we know that another branch is + * already calling aesop_cancel_branches_wait(). If we + * were to call aesop_cancel_branches_wait() here also, + * then the program would deadlock because two + * pbranches would both be waiting for the other to exit + * before continuing. Since we know that the other + * branch is taking care of the cancel we can just break + * out here. + */ pbreak; } @@ -79,7 +87,7 @@ __blocking int aesop_main(int argc, char **argv) run_par1(); return 0; } -btest_main_set(aesop_main, "btest"); +btest_main_set(aesop_main, "btest", "timer"); /* * Local variables: hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. 3c9a4c57bf4d0178d3d504961f16480f6bdef983
by noreply＠mcs.anl.gov 28 Apr '11

28 Apr '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 3c9a4c57bf4d0178d3d504961f16480f6bdef983 (commit) from 5b0c42365b27b99f9cdc266005a2621c48cae4c1 (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 3c9a4c57bf4d0178d3d504961f16480f6bdef983 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Thu Apr 28 21:13:23 2011 -0400 helpful error message on resource/context mismatch ----------------------------------------------------------------------- Summary of changes: code/src/aesop/resource.c | 33 +++++++++++++++++++++++++++++++-- 1 files changed, 31 insertions(+), 2 deletions(-) Diff of changes: diff --git a/code/src/aesop/resource.c b/code/src/aesop/resource.c index 393681a..c8932aa 100644 --- a/code/src/aesop/resource.c +++ b/code/src/aesop/resource.c @@ -231,7 +231,21 @@ void ae_resource_request_poll(ae_context_t context, int resource_id) write_pipe = ae_resource_entries[ridx].poll_data.pipe_fds[1]; } - assert(write_pipe > -1); + if(write_pipe < 0) + { + triton_err(triton_log_default, "Error: context %p is not configured to handle resource with id %d", context, resource_id); + for(i=0; i<ae_resource_count; i++) + { + if(ae_resource_entries[i].id == resource_id) + { + triton_err(triton_log_default, "Consider adding the \"%s\" resource your aesop context.", ae_resource_entries[i].resource->resource_name); + assert(0); + } + } + triton_err(triton_log_default, "Error: resource_id %d is unknown to aesop. Are you using a resource that was not initialized?\n", resource_id); + assert(0); + } + write(write_pipe, &onebyte, 1); return; } @@ -271,7 +285,22 @@ void ae_resource_request_poll(ae_context_t context, int resource_id) target_loop = eloop; } - assert(async); + /* TODO: put this in epoll version too */ + if(!async) + { + triton_err(triton_log_default, "Error: context %p is not configured to handle resource with id %d", context, resource_id); + for(i=0; i<ae_resource_count; i++) + { + if(ae_resource_entries[i].id == resource_id) + { + triton_err(triton_log_default, "Consider adding the \"%s\" resource your aesop context.", ae_resource_entries[i].resource->resource_name); + assert(0); + } + } + triton_err(triton_log_default, "Error: resource_id %d is unknown to aesop. Are you using a resource that was not initialized?\n", resource_id); + assert(0); + } + assert(target_loop); ev_async_send(target_loop, async); hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. 5b0c42365b27b99f9cdc266005a2621c48cae4c1
by noreply＠mcs.anl.gov 28 Apr '11

28 Apr '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 5b0c42365b27b99f9cdc266005a2621c48cae4c1 (commit) from 1fe64ee85b5e2261cd4107b097d3e68e60649ceb (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 5b0c42365b27b99f9cdc266005a2621c48cae4c1 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Thu Apr 28 20:29:19 2011 -0400 add missing include for branch cancel ----------------------------------------------------------------------- Summary of changes: code/src/state/test/rosd-maint.ae | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) Diff of changes: diff --git a/code/src/state/test/rosd-maint.ae b/code/src/state/test/rosd-maint.ae index c83f49a..da9aa78 100644 --- a/code/src/state/test/rosd-maint.ae +++ b/code/src/state/test/rosd-maint.ae @@ -13,6 +13,7 @@ #include "src/common/triton-debug.h" #include "src/aesop/hints.h" #include "src/aesop/aesop.h" +#include "src/aesop/aesop-support.hae" #include "src/remote/encoding.h" #include "src/remote/remote.hae" #include "src/net/triton-message.hae" hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. 1fe64ee85b5e2261cd4107b097d3e68e60649ceb
by noreply＠mcs.anl.gov 28 Apr '11

28 Apr '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 1fe64ee85b5e2261cd4107b097d3e68e60649ceb (commit) via 1bd62a7bc3b94ea8e69ed86a70c6ef9d4e272ab3 (commit) via a36f6ca7f5edef7266fc28ce5a116b86e93e349c (commit) from 9eb55db554a80aa16f44b19dbb58fe99c0945168 (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 1fe64ee85b5e2261cd4107b097d3e68e60649ceb Author: Kevin Harms <harms(a)alcf.anl.gov> Date: Thu Apr 28 15:49:41 2011 -0500 Missing include for cancel branches macro. commit 1bd62a7bc3b94ea8e69ed86a70c6ef9d4e272ab3 Merge: a36f6ca7f5edef7266fc28ce5a116b86e93e349c 9eb55db554a80aa16f44b19dbb58fe99c0945168 Author: Kevin Harms <harms(a)alcf.anl.gov> Date: Thu Apr 28 12:20:49 2011 -0500 Merge branch 'master' of git.mcs.anl.gov:triton commit a36f6ca7f5edef7266fc28ce5a116b86e93e349c Author: Kevin Harms <harms(a)alcf.anl.gov> Date: Thu Apr 28 10:43:19 2011 -0500 Add a macro that handles cancelling of branches in a loop with a small wait. Update various places in the code base to use the new macro. ----------------------------------------------------------------------- Summary of changes: code/src/aesop/aesop-support.hae | 13 ++++++++ code/src/aesop/module.mk.in | 2 + code/src/aesop/parser/tests/blocking/btest-impl.c | 2 +- .../tests/blocking/pbreak-before-blocking.ae | 13 +++----- .../parser/tests/blocking/pbreak-immed-cancel.ae | 3 +- code/src/aesop/parser/tests/blocking/pbreak.ae | 5 ++- code/src/aesop/parser/tests/blocking/pbreak2.ae | 3 +- code/src/aesop/parser/tests/blocking/pbreak3.ae | 3 +- code/src/aesop/parser/tests/blocking/pbreak4.ae | 3 +- code/src/aesop/parser/tests/blocking/pbreak5.ae | 3 +- code/src/aesop/parser/tests/blocking/pbreak6.ae | 3 +- code/src/aesop/parser/tests/blocking/pbreak7.ae | 13 ++++--- code/src/aesop/parser/tests/blocking/pbreak8.ae | 11 +++--- code/src/aesop/resource.h | 3 -- .../common/resources/timer/test/timer-cancel.ae | 20 +----------- code/src/fakess/fakess.ae | 14 ++------ code/src/kv/kv-intern.ae | 3 +- code/src/remote/retry-method.ae | 11 +++--- code/src/remote/service.ae | 33 +++----------------- code/src/state/test/rosd-maint.ae | 4 -- code/src/state/test/rosd-peers.ae | 5 +-- code/src/state/test/rosd-test-funcs.ae | 2 +- 22 files changed, 70 insertions(+), 102 deletions(-) create mode 100644 code/src/aesop/aesop-support.hae Diff of changes: diff --git a/code/src/aesop/aesop-support.hae b/code/src/aesop/aesop-support.hae new file mode 100644 index 0000000..17eecbe --- /dev/null +++ b/code/src/aesop/aesop-support.hae @@ -0,0 +1,13 @@ +#ifndef __AESOP_SUPPORT_HAE__ +#define __AESOP_SUPPORT_HAE__ + +#include "src/aesop/aesop.h" +#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); \ + } + +#endif diff --git a/code/src/aesop/module.mk.in b/code/src/aesop/module.mk.in index b8c53ef..28a9c64 100644 --- a/code/src/aesop/module.mk.in +++ b/code/src/aesop/module.mk.in @@ -1,5 +1,7 @@ DIR := src/aesop +AESOP_HDR += $(DIR)/aesop-support.hae + LIBSRC += $(DIR)/opcache.c \ $(DIR)/aesop.c \ $(DIR)/resource.c \ diff --git a/code/src/aesop/parser/tests/blocking/btest-impl.c b/code/src/aesop/parser/tests/blocking/btest-impl.c index 2dce71f..61e2f13 100644 --- a/code/src/aesop/parser/tests/blocking/btest-impl.c +++ b/code/src/aesop/parser/tests/blocking/btest-impl.c @@ -491,7 +491,7 @@ static void btest_finalize(void) __attribute__((constructor)) void btest_init_register(void); __attribute__((constructor)) void btest_init_register(void) { - triton_init_register("aesop.blocking.test", btest_init, btest_finalize, NULL, "aesop.control"); + triton_init_register("aesop.blocking.test", btest_init, btest_finalize, NULL, "aesop.control", "triton.resource.timer"); } void btest_enable_immediate_cancel(void) diff --git a/code/src/aesop/parser/tests/blocking/pbreak-before-blocking.ae b/code/src/aesop/parser/tests/blocking/pbreak-before-blocking.ae index 458bebc..f38572c 100644 --- a/code/src/aesop/parser/tests/blocking/pbreak-before-blocking.ae +++ b/code/src/aesop/parser/tests/blocking/pbreak-before-blocking.ae @@ -2,6 +2,7 @@ #include "src/aesop/aesop.h" #include "src/aesop/parser/tests/blocking/btest.hae" #include <assert.h> +#include "src/aesop/aesop-support.hae" static __blocking void run_par1(void) { @@ -16,7 +17,7 @@ static __blocking void run_par1(void) if(ret1 != 0) { printf("pbranch cancelled.\n"); - aesop_cancel_branches(); + aesop_cancel_branches_wait(); pbreak; } @@ -34,7 +35,7 @@ static __blocking void run_par1(void) if(ret2 != 0) { printf("Error in branch 2.\n"); - aesop_cancel_branches(); + aesop_cancel_branches_wait(); pbreak; assert(0); } @@ -43,7 +44,7 @@ static __blocking void run_par1(void) if(ret2 != 0) { printf("Error in branch 2.\n"); - aesop_cancel_branches(); + aesop_cancel_branches_wait(); pbreak; } @@ -58,11 +59,7 @@ static __blocking void run_par1(void) pbranch { - while(aesop_count_branches() > 1) - { - aesop_cancel_branches(); - btest_sleep(1); - } + aesop_cancel_branches_wait(); pbreak; assert(0); diff --git a/code/src/aesop/parser/tests/blocking/pbreak-immed-cancel.ae b/code/src/aesop/parser/tests/blocking/pbreak-immed-cancel.ae index 31c4991..cede438 100644 --- a/code/src/aesop/parser/tests/blocking/pbreak-immed-cancel.ae +++ b/code/src/aesop/parser/tests/blocking/pbreak-immed-cancel.ae @@ -1,6 +1,7 @@ #include "src/aesop/aesop.h" #include "src/aesop/parser/tests/blocking/btest.hae" #include <assert.h> +#include "src/aesop/aesop-support.hae" static __blocking void run_pbreak(void) { @@ -42,7 +43,7 @@ static __blocking void run_pbreak(void) { ret4 = btest_sleep(4); assert(ret4 == 0); - aesop_cancel_branches(); + aesop_cancel_branches_wait(); pbreak; } } diff --git a/code/src/aesop/parser/tests/blocking/pbreak.ae b/code/src/aesop/parser/tests/blocking/pbreak.ae index caf1ab4..84a84c3 100644 --- a/code/src/aesop/parser/tests/blocking/pbreak.ae +++ b/code/src/aesop/parser/tests/blocking/pbreak.ae @@ -1,6 +1,7 @@ #include "src/aesop/aesop.h" #include "src/aesop/parser/tests/blocking/btest.hae" #include <assert.h> +#include "src/aesop/aesop-support.hae" static __blocking void run_pbreak(void) { @@ -39,7 +40,7 @@ static __blocking void run_pbreak(void) { ret4 = btest_sleep(4); assert(ret4 == 0); - aesop_cancel_branches(); + aesop_cancel_branches_wait(); pbreak; } } @@ -52,5 +53,5 @@ __blocking int aesop_main(int argc, char **argv) run_pbreak(); return 0; } -btest_main_set(aesop_main, "btest"); +btest_main_set(aesop_main, "btest", "timer"); diff --git a/code/src/aesop/parser/tests/blocking/pbreak2.ae b/code/src/aesop/parser/tests/blocking/pbreak2.ae index a13aff2..5e57d14 100644 --- a/code/src/aesop/parser/tests/blocking/pbreak2.ae +++ b/code/src/aesop/parser/tests/blocking/pbreak2.ae @@ -1,5 +1,6 @@ #include "src/aesop/aesop.h" #include "src/aesop/parser/tests/blocking/btest.hae" +#include "src/aesop/aesop-support.hae" static __blocking void run_pbreak2(void) { @@ -17,7 +18,7 @@ static __blocking void run_pbreak2(void) printf("before pbreak: a == %d!\n", a); if(shared > 2) { - aesop_cancel_branches(); + aesop_cancel_branches_wait(); pbreak; } ret = btest2(&a); diff --git a/code/src/aesop/parser/tests/blocking/pbreak3.ae b/code/src/aesop/parser/tests/blocking/pbreak3.ae index 662158b..e8bb3e9 100644 --- a/code/src/aesop/parser/tests/blocking/pbreak3.ae +++ b/code/src/aesop/parser/tests/blocking/pbreak3.ae @@ -1,5 +1,6 @@ #include "src/aesop/aesop.h" #include "src/aesop/parser/tests/blocking/btest.hae" +#include "src/aesop/aesop-support.hae" static __blocking void run_pbreak3(void) { @@ -17,7 +18,7 @@ static __blocking void run_pbreak3(void) if(a > 3) { printf("hit pbreak!\n"); - aesop_cancel_branches(); + aesop_cancel_branches_wait(); pbreak; } ret = btest2(&a); diff --git a/code/src/aesop/parser/tests/blocking/pbreak4.ae b/code/src/aesop/parser/tests/blocking/pbreak4.ae index 9b833ed..bb01cf5 100644 --- a/code/src/aesop/parser/tests/blocking/pbreak4.ae +++ b/code/src/aesop/parser/tests/blocking/pbreak4.ae @@ -1,5 +1,6 @@ #include "src/aesop/aesop.h" #include "src/aesop/parser/tests/blocking/btest.hae" +#include "src/aesop/aesop-support.hae" static __blocking void run_pbreak4(void) { @@ -20,7 +21,7 @@ static __blocking void run_pbreak4(void) if(a > 1) { printf("hit pbreak!\n"); - aesop_cancel_branches(); + aesop_cancel_branches_wait(); pbreak; } ret = btest3(&a); diff --git a/code/src/aesop/parser/tests/blocking/pbreak5.ae b/code/src/aesop/parser/tests/blocking/pbreak5.ae index 64c68e3..0014d00 100644 --- a/code/src/aesop/parser/tests/blocking/pbreak5.ae +++ b/code/src/aesop/parser/tests/blocking/pbreak5.ae @@ -1,5 +1,6 @@ #include "src/aesop/aesop.h" #include "src/aesop/parser/tests/blocking/btest.hae" +#include "src/aesop/aesop-support.hae" static __blocking void run_pbreak5(void) { @@ -26,7 +27,7 @@ static __blocking void run_pbreak5(void) if(b > 1) { printf("hit pbreak!\n"); - aesop_cancel_branches(); + aesop_cancel_branches_wait(); pbreak; } ret1 = btest3(&b); diff --git a/code/src/aesop/parser/tests/blocking/pbreak6.ae b/code/src/aesop/parser/tests/blocking/pbreak6.ae index 3963b61..f44d8ba 100644 --- a/code/src/aesop/parser/tests/blocking/pbreak6.ae +++ b/code/src/aesop/parser/tests/blocking/pbreak6.ae @@ -1,5 +1,6 @@ #include "src/aesop/aesop.h" #include "src/aesop/parser/tests/blocking/btest.hae" +#include "src/aesop/aesop-support.hae" static __blocking void run_pbreak6(void) { @@ -33,7 +34,7 @@ static __blocking void run_pbreak6(void) if(b > 1) { printf("hit pbreak!\n"); - aesop_cancel_branches(); + aesop_cancel_branches_wait(); pbreak; } ret1 = btest3(&b); diff --git a/code/src/aesop/parser/tests/blocking/pbreak7.ae b/code/src/aesop/parser/tests/blocking/pbreak7.ae index b0f8fbb..42869ee 100644 --- a/code/src/aesop/parser/tests/blocking/pbreak7.ae +++ b/code/src/aesop/parser/tests/blocking/pbreak7.ae @@ -1,6 +1,7 @@ #include "src/aesop/aesop.h" #include "src/aesop/parser/tests/blocking/btest.hae" #include <assert.h> +#include "src/aesop/aesop-support.hae" static __blocking void run_par1(void) { @@ -15,7 +16,7 @@ static __blocking void run_par1(void) if(ret1 != 0) { printf("Error in branch 1.\n"); - aesop_cancel_branches(); + aesop_cancel_branches_wait(); pbreak; } @@ -23,7 +24,7 @@ static __blocking void run_par1(void) if(ret1 != 0) { printf("Error in branch 1.\n"); - aesop_cancel_branches(); + aesop_cancel_branches_wait(); pbreak; } } @@ -34,7 +35,7 @@ static __blocking void run_par1(void) if(ret2 != 0) { printf("Error in branch 2.\n"); - aesop_cancel_branches(); + aesop_cancel_branches_wait(); pbreak; } @@ -42,7 +43,7 @@ static __blocking void run_par1(void) if(ret2 != 0) { printf("Error in branch 2.\n"); - aesop_cancel_branches(); + aesop_cancel_branches_wait(); pbreak; } } @@ -53,7 +54,7 @@ static __blocking void run_par1(void) if(ret3 != 0) { printf("Error in branch 3.\n"); - aesop_cancel_branches(); + aesop_cancel_branches_wait(); pbreak; } @@ -61,7 +62,7 @@ static __blocking void run_par1(void) if(ret3 != 0) { printf("Error in branch 3.\n"); - aesop_cancel_branches(); + aesop_cancel_branches_wait(); pbreak; } } diff --git a/code/src/aesop/parser/tests/blocking/pbreak8.ae b/code/src/aesop/parser/tests/blocking/pbreak8.ae index 149c665..8463d64 100644 --- a/code/src/aesop/parser/tests/blocking/pbreak8.ae +++ b/code/src/aesop/parser/tests/blocking/pbreak8.ae @@ -1,6 +1,7 @@ #include "src/aesop/aesop.h" #include "src/aesop/parser/tests/blocking/btest.hae" #include <assert.h> +#include "src/aesop/aesop-support.hae" static __blocking void run_par1(void) { @@ -15,7 +16,7 @@ static __blocking void run_par1(void) if(ret1 != 0) { printf("Error in branch 1.\n"); - aesop_cancel_branches(); + aesop_cancel_branches_wait(); pbreak; } @@ -23,7 +24,7 @@ static __blocking void run_par1(void) if(ret1 != 0) { printf("Error in branch 1.\n"); - aesop_cancel_branches(); + aesop_cancel_branches_wait(); } } @@ -33,7 +34,7 @@ static __blocking void run_par1(void) if(ret2 != 0) { printf("Error in branch 2.\n"); - aesop_cancel_branches(); + aesop_cancel_branches_wait(); pbreak; } @@ -41,7 +42,7 @@ static __blocking void run_par1(void) if(ret2 != 0) { printf("Error in branch 2.\n"); - aesop_cancel_branches(); + aesop_cancel_branches_wait(); } } @@ -51,7 +52,7 @@ static __blocking void run_par1(void) if(ret3 != 0) { printf("Error in branch 3.\n"); - aesop_cancel_branches(); + aesop_cancel_branches_wait(); pbreak; } pbreak; diff --git a/code/src/aesop/resource.h b/code/src/aesop/resource.h index cae7208..d7d880e 100644 --- a/code/src/aesop/resource.h +++ b/code/src/aesop/resource.h @@ -103,9 +103,6 @@ void ae_get_stack(struct ae_ctl *ctl, ae_string_t *stack, int *inout_count); #ifdef AESOP_PARSER #define aesop_cancel_branches() ae_cancel_branches(__ae_ctl->parent ? &__ae_ctl->parent->gen : NULL) #define aesop_count_branches() ae_count_branches(__ae_ctl->parent ? &__ae_ctl->parent->gen : NULL) -#define aesop_cancel_branches_wait() while(aesop_count_branches() > 1) { \ - aesop_cancel_branches(); \ - triton_timer(2); } #else static inline ae_ret_t aesop_cancel_branches(void) { return AE_NOSYS; } static inline int aesop_count_branches(void) { return -1; } diff --git a/code/src/common/resources/timer/test/timer-cancel.ae b/code/src/common/resources/timer/test/timer-cancel.ae index a70adbd..a58ef7c 100644 --- a/code/src/common/resources/timer/test/timer-cancel.ae +++ b/code/src/common/resources/timer/test/timer-cancel.ae @@ -2,19 +2,7 @@ #include <stdio.h> #include "src/aesop/aesop.h" #include "src/common/resources/timer/timer.hae" - -#if 0 -static __blocking void stop_branches(void) -{ - while(aesop_count_branches() > 1) - { - aesop_cancel_branches(); - - /* sleep for a bit to allow cancelation */ - triton_timer(10); - } -} -#endif +#include "src/aesop/aesop-support.hae" static __blocking int dotimer(void) { @@ -35,11 +23,7 @@ static __blocking int dotimer(void) /* shut down the other timer */ printf("canceling other branch\n"); - while(aesop_count_branches() > 1) - { - aesop_cancel_branches(); - triton_timer(10); - } + aesop_cancel_branches_wait(); printf("cancel done\n"); } diff --git a/code/src/fakess/fakess.ae b/code/src/fakess/fakess.ae index 59f0e50..b25de24 100644 --- a/code/src/fakess/fakess.ae +++ b/code/src/fakess/fakess.ae @@ -18,6 +18,8 @@ #include "src/common/resources/timer/timer.hae" +#include "src/aesop/aesop-support.hae" + // #define TRITON_FAKESS_TOKEN 64 /** @@ -715,11 +717,7 @@ __blocking triton_ret_t triton_fakess_engine_start(void) * pbranch */ triton_mutex_unlock(&fakess_mutex); - while(aesop_count_branches() > 1) - { - aesop_cancel_branches(); - triton_timer(2); - } + aesop_cancel_branches_wait(); if(fakess_ret != TRITON_ERR_CANCELED && fakess_ret != TRITON_SUCCESS) { @@ -744,11 +742,7 @@ __blocking triton_ret_t triton_fakess_engine_start(void) triton_mutex_unlock(&fakess_mutex); /* stop the other branch */ - while(aesop_count_branches() > 1) - { - aesop_cancel_branches(); - triton_timer(2); - } + aesop_cancel_branches_wait(); } } diff --git a/code/src/kv/kv-intern.ae b/code/src/kv/kv-intern.ae index 2d15b44..ebf3a46 100644 --- a/code/src/kv/kv-intern.ae +++ b/code/src/kv/kv-intern.ae @@ -15,6 +15,7 @@ #include "src/replicated-osd/rosd_module.h" #include "src/remote/core_module.h" #include "src/remote/core_stubs.hae" +#include "src/aesop/aesop-support.hae" __blocking triton_ret_t triton_kv_init_internal(const char * mapfile) { @@ -230,7 +231,7 @@ __blocking triton_ret_t triton_kv_server_stop_internal(void) ret = remote_triton_core_server_shutdown(AER_DEFAULT_CTX, mapping->addr, in, &out); if(ret != TRITON_SUCCESS) { - aesop_cancel_branches(); + aesop_cancel_branches_wait(); } } } diff --git a/code/src/remote/retry-method.ae b/code/src/remote/retry-method.ae index f3c6291..218b21b 100644 --- a/code/src/remote/retry-method.ae +++ b/code/src/remote/retry-method.ae @@ -8,6 +8,7 @@ #include "src/common/traffic-cop.hae" #include "src/aesop/hints.h" #include "src/zeroconf/zeroconf.h" +#include "src/aesop/aesop-support.hae" /** * This file implements the default remote context, which uses @@ -262,7 +263,7 @@ static __blocking triton_ret_t retry_send_response( if(ret != TRITON_ERR_CANCELED) { /* cancel the traffic cop */ - aesop_cancel_branches(); + aesop_cancel_branches_wait(); } } @@ -283,7 +284,7 @@ static __blocking triton_ret_t retry_send_response( triton_warn(triton_log_default, "response cancelled, will _not_ retry."); } /* Timed out sending response. Cancel it. */ - aesop_cancel_branches(); + aesop_cancel_branches_wait(); } } } @@ -547,7 +548,7 @@ static __blocking triton_ret_t retry_sendrecv( /* In this path, either the receive succeeded or failed. We want * to cancel the traffic_cop in either case. */ - aesop_cancel_branches(); + aesop_cancel_branches_wait(); } } @@ -559,7 +560,7 @@ static __blocking triton_ret_t retry_sendrecv( /* if the send failed (not canceled), then we don't want to wait * for the timeout. Just cancel and retry. */ - aesop_cancel_branches(); + aesop_cancel_branches_wait(); } } pbranch @@ -579,7 +580,7 @@ static __blocking triton_ret_t retry_sendrecv( triton_warn(triton_log_default, "remote function cancelled, will _not_ retry."); } /* request/response timed-out. Cancel them! */ - aesop_cancel_branches(); + aesop_cancel_branches_wait(); } } } diff --git a/code/src/remote/service.ae b/code/src/remote/service.ae index 6f6e154..7b4613b 100644 --- a/code/src/remote/service.ae +++ b/code/src/remote/service.ae @@ -10,6 +10,7 @@ #include "src/aesop/hints.h" #include "src/common/resources/scheduling/sched.hae" #include "src/common/resources/timer/timer.hae" +#include "src/aesop/aesop-support.hae" triton_debug_mask_t remote_service_dbg_mask; @@ -48,7 +49,6 @@ static int service_id_equal(const void *k, struct triton_hash_link *l) static uint64_t request_message_size; static uint32_t max_requests; static uint32_t inprogress_wait_time; -static uint32_t inprogress_timeout; static int service_initialized = 0; @@ -99,16 +99,6 @@ static triton_ret_t inprogress_wait_time_updater(const char *k, const char *v) return TRITON_SUCCESS; } -static triton_ret_t inprogress_timeout_updater(const char *k, const char *v) -{ - assert(!strcmp(k, "triton.remote.service.inprogress_timeout")); - triton_mutex_lock(&aer_service_mutex); - inprogress_timeout = atoi(v); - triton_mutex_unlock(&aer_service_mutex); - - return TRITON_SUCCESS; -} - /* the constructor attribute allows this init function to be called implicitly by the program * before main is called. The integer priority specifies the order for when the constructor * should be called. In the case of real services, their priorities should be greater than 3. @@ -143,10 +133,6 @@ triton_ret_t aer_service_init(void) "Time to sleep (secs) on exit for in-progress operations before checking for completion again"); triton_error_assert(ret); - ret = triton_zeroconf_register("triton.remote.service.inprogress_timeout", "1000", inprogress_timeout_updater, - "Time to wait (secs) on exit for cancelled unexpected receives before trying to cancel again"); - triton_error_assert(ret); - if(service_table == NULL) { service_table = triton_hash_init(service_id_equal, triton_hash_64bit_hash, 8192); @@ -426,16 +412,7 @@ __blocking void aer_service_engine_start(aer_remote_ctx_t rctx) } /* no more ops in progress! cancel waiting receives! */ - aesop_cancel_branches(); - - /* wait for receives that haven't been fully cancelled. - * TODO: if the receives don't cancel this loop will never end... - */ - while(aesop_count_branches() > 1) - { - triton_timer(inprogress_timeout); - aesop_cancel_branches(); - } + aesop_cancel_branches_wait(); } } @@ -499,7 +476,7 @@ __blocking triton_ret_t aer_service_requests(aer_remote_ctx_t ctx, int request_c if(ret[i] != TRITON_SUCCESS) { /* TODO: report error */ - aesop_cancel_branches(); + aesop_cancel_branches_wait(); pbreak; } @@ -508,7 +485,7 @@ __blocking triton_ret_t aer_service_requests(aer_remote_ctx_t ctx, int request_c { aer_message_destroy(ctx, &inmessage); /* TODO: report error */ - aesop_cancel_branches(); + aesop_cancel_branches_wait(); pbreak; } @@ -516,7 +493,7 @@ __blocking triton_ret_t aer_service_requests(aer_remote_ctx_t ctx, int request_c if(ret[i] != TRITON_SUCCESS) { /* TODO: handle error */ - aesop_cancel_branches(); + aesop_cancel_branches_wait(); pbreak; } diff --git a/code/src/state/test/rosd-maint.ae b/code/src/state/test/rosd-maint.ae index d0422d5..c83f49a 100644 --- a/code/src/state/test/rosd-maint.ae +++ b/code/src/state/test/rosd-maint.ae @@ -47,10 +47,6 @@ #define SVR_POLL_TIMEOUT 1000 #define CLIENT_POLL_TIMEOUT 1000 -#define CANCEL while(aesop_count_branches() > 1) { \ - aesop_cancel_branches(); \ - triton_timer(2); } - int nobjects = 0; int nconcurrent = 0; char db_path[PATH_MAX]; diff --git a/code/src/state/test/rosd-peers.ae b/code/src/state/test/rosd-peers.ae index e1a59eb..39b3c82 100644 --- a/code/src/state/test/rosd-peers.ae +++ b/code/src/state/test/rosd-peers.ae @@ -32,6 +32,7 @@ #include "src/common/triton-init.h" #include "src/versioned-osd/prototype/versioned-osd.hae" +#include "src/aesop/aesop-support.hae" /* include server-side rosd skeletons */ #include "src/replicated-osd/rosd_module.h" @@ -46,10 +47,6 @@ #define SVR_POLL_TIMEOUT 1000 #define CLIENT_POLL_TIMEOUT 1000 -#define CANCEL while(aesop_count_branches() > 1) { \ - aesop_cancel_branches(); \ - triton_timer(2); } - int nobjects = 0; int nconcurrent = 0; char db_path[PATH_MAX]; diff --git a/code/src/state/test/rosd-test-funcs.ae b/code/src/state/test/rosd-test-funcs.ae index fcebea0..d662690 100644 --- a/code/src/state/test/rosd-test-funcs.ae +++ b/code/src/state/test/rosd-test-funcs.ae @@ -73,7 +73,7 @@ __blocking void monitor_state() { triton_timer(1000); } - CANCEL; + aesop_cancel_branches_wait(); } } hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. 9eb55db554a80aa16f44b19dbb58fe99c0945168
by noreply＠mcs.anl.gov 28 Apr '11

28 Apr '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 9eb55db554a80aa16f44b19dbb58fe99c0945168 (commit) via f0fc27f692110bb4957bc6771d8a1fd37f3af678 (commit) from 26502960c0bcafdbd2ecbab43024bd029d4e8dd0 (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 9eb55db554a80aa16f44b19dbb58fe99c0945168 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Thu Apr 28 10:16:31 2011 -0400 fix typo in depend-aer.sh commit f0fc27f692110bb4957bc6771d8a1fd37f3af678 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Thu Apr 28 10:11:43 2011 -0400 remove duplicate .aer in dummy dependency ----------------------------------------------------------------------- Summary of changes: code/maint/depend-aer.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Diff of changes: diff --git a/code/maint/depend-aer.sh b/code/maint/depend-aer.sh index 02f2118..07c70e4 100755 --- a/code/maint/depend-aer.sh +++ b/code/maint/depend-aer.sh @@ -16,4 +16,4 @@ shift # -x c tells gcc to pretend like the input file is a c file regardless of # filename extension. This is useful for cases where we want gcc to # generate dependencies on raw .ae files. -exec $CC -x c -M -MM -MG "$@" | sed -e "s@^$.*$\.o:@$DIR\1.dummy:$DIR\1.aer @" +exec $CC -x c -M -MM -MG "$@" | sed -e "s@^$.*$\.o:@${DIR}${RMOD}.dummy:@" hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. 26502960c0bcafdbd2ecbab43024bd029d4e8dd0
by noreply＠mcs.anl.gov 28 Apr '11

28 Apr '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 26502960c0bcafdbd2ecbab43024bd029d4e8dd0 (commit) from f371086d3ea5a6778af7543c7f2b3c7297749be8 (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 26502960c0bcafdbd2ecbab43024bd029d4e8dd0 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Thu Apr 28 09:31:59 2011 -0400 intermediate dummy files for aer compilation - follow suggestion from Dries to introduce an intermediate dummy file when building aer files to prevent multi-target race conditions - fix multiple typos in src/aesop/parser/tests/remote/module.mk.in - add depend-aer.sh, which should have been included in previous commit ref #107 ----------------------------------------------------------------------- Summary of changes: code/Makefile.in | 16 ++++++++--- code/maint/aercc.in | 2 + code/maint/{depend-hae.sh => depend-aer.sh} | 4 ++- code/src/aesop/parser/tests/remote/module.mk.in | 34 +++------------------- code/src/remote/module.mk.in | 8 +----- code/src/replicated-osd/module.mk.in | 8 +----- code/src/state/module.mk.in | 8 +----- 7 files changed, 25 insertions(+), 55 deletions(-) copy code/maint/{depend-hae.sh => depend-aer.sh} (85%) Diff of changes: diff --git a/code/Makefile.in b/code/Makefile.in index 395be69..a7d375b 100644 --- a/code/Makefile.in +++ b/code/Makefile.in @@ -360,6 +360,7 @@ REMOTE_MODULES = $(REMOTE_LIB_MODULES) $(REMOTE_TESTLIB_MODULES) REMOTE_MODULES_GENFILES = $(foreach mod,$(REMOTE_MODULES),$(mod)_stubs.hae $(mod)_module.h $(mod)_module.o) REMOTE_MODULES_DEPFILES = $(foreach mod,$(REMOTE_MODULES),$(mod).d) +REMOTE_MODULES_DUMMIES = $(foreach mod,$(REMOTE_MODULES),$(mod).dummy) DEPENDS=$(TESTDEPS) $(GENLIBDEPS) $(LIBDEPS) $(REMOTE_MODULES_DEPFILES) $(AEDEPS) $(AESOP_TRHDR_DEPS) $(TESTLIBDEPS) @@ -506,6 +507,16 @@ $(AEDEPS): %.ae.d: %.ae $(Q) " DEP $@" $(E)CC=$(call MCC_C,$*) $(srcdir)/maint/depend-ae.sh $(call dirname,$*) $(LIBCFLAGS) $(CFLAGS) $(call MODCFLAGS_C,$*) $< > $@ +# rule to build remote modules (actual file names depend on dummies, see +# module.mk.in for directories containing .aer files) +%.dummy: $(HSBIN) + $(Q) " AERCC $*" + $(E)$(builddir)/maint/aercc -m $(call RMOD_SERVICE,$*) \ + -d $(call RMOD_REGDIR,$*) \ + $(patsubst %,$(srcdir)/%,$(call RMOD_FILES,$*)) \ + -c $(call MCC_AE,$*) $(VA) $(DA) $(AEPRETTY) \ + -- $(CFLAGS) $(LIBCFLAGS) $(CWARNS) $(call MODCFLAGS_AE,$*) + # Generate header files (%.h) from AE header files # NOTE: this is used by resource .c files that need to include the .h @@ -521,9 +532,6 @@ $(AESOP_TRHDR_DEPS): %.h.d: %.hae $(Q) " DEP $@" $(E)CC=$(call MCC_C,$*) $(srcdir)/maint/depend-hae.sh $(call dirname,$*) $(LIBCFLAGS) $(CFLAGS) $(call MODCFLAGS_C,$*) $< > $@ -# have to build parsers before generating any remote genfiles or objects -$(REMOTE_MODULES_GENFILES) $(REMOTE_OBJS): $(HSBIN) - # TODO: we need a better solution here. The problem is that the # auto-dependencies often include generated headers. If we make the .d # files themselves depend on those same files, then we have to generate all @@ -619,7 +627,7 @@ clean:: $(E)rm -f $(AEOBJS) $(LIBOBJS) $(GENLIBOBJS) $(AETEST) $(AEPROGRAM) $(TEST) $(PROGRAM) \ $(AESOP_TRHDR) $(TESTLIBOBJS) \ $(LIBRARIES) $(TEST_LIBRARIES) $(DEPENDS) $(TEST_RESULTS) $(TEST_OUT) \ - $(REMOTE_MOD_GENFILES) $(REMOTE_OBJS) $(INTERM) + $(REMOTE_MOD_GENFILES) $(REMOTE_OBJS) $(INTERM) $(REMOTE_MODULES_DUMMIES) parserclean:: $(Q) " PARSER CLEAN" diff --git a/code/maint/aercc.in b/code/maint/aercc.in index 8c8c841..6cf4e13 100644 --- a/code/maint/aercc.in +++ b/code/maint/aercc.in @@ -194,6 +194,8 @@ doCompile ${verbose} ${compiler} ${modcout} ${modobj} ${COMPILEROPTS} exitIfFailed $? rm -f ${clean} +touch ${fullservicename}.dummy + exit 0 # Done! diff --git a/code/maint/depend-hae.sh b/code/maint/depend-aer.sh similarity index 85% copy from code/maint/depend-hae.sh copy to code/maint/depend-aer.sh index 83f1ebf..02f2118 100755 --- a/code/maint/depend-hae.sh +++ b/code/maint/depend-aer.sh @@ -4,6 +4,8 @@ shift if [ -n "$DIR" ] ; then DIR="$DIR"/ fi +RMOD="$1" +shift # Explanation of some arguments: # -MG tells gcc to ignore errors from missing header files, which is @@ -14,4 +16,4 @@ fi # -x c tells gcc to pretend like the input file is a c file regardless of # filename extension. This is useful for cases where we want gcc to # generate dependencies on raw .ae files. -exec $CC -x c -M -MM -MG "$@" | sed -e "s@^$.*$\.o:@$DIR\1.h: @" +exec $CC -x c -M -MM -MG "$@" | sed -e "s@^$.*$\.o:@$DIR\1.dummy:$DIR\1.aer @" diff --git a/code/src/aesop/parser/tests/remote/module.mk.in b/code/src/aesop/parser/tests/remote/module.mk.in index 8760264..08272b7 100644 --- a/code/src/aesop/parser/tests/remote/module.mk.in +++ b/code/src/aesop/parser/tests/remote/module.mk.in @@ -8,13 +8,7 @@ FULLMODNAME1 := $(DIR_TESTREMOTE)/$(MODNAME1) # specifies which aer files get included in the module REMOTE_MODSRC_$(DIR_TESTREMOTE)/test_remote_mock := $(DIR_TESTREMOTE)/test-remote-mock.aer -$(FULLMODNAME1)_stubs.hae $(FULLMODNAME1)_module.h $(FULLMODNAME1)_module.o $(DIR_TESTREMOTE)/test-remote-mock.o: $(DIR_TESTREMOTE)/test-remote-mock.aer - $(Q) " AERCC $(FULLMODNAME1)" - $(E)$(builddir)/maint/aercc -m $(call RMOD_SERVICE,$(FULLMODNAME1)) \ - -d $(call RMOD_REGDIR,$(FULLMODNAME1)) \ - $(patsubst %,$(srcdir)/%,$(call RMOD_FILES,$(FULLMODNAME1))) \ - -c $(call MCC_AE,$(FULLMODNAME1)) $(VA) $(DA) $(AEPRETTY) \ - -- $(CFLAGS) $(LIBCFLAGS) $(CWARNS) $(call MODCFLAGS_AE,$(FULLMODNAME1)) +$(FULLMODNAME1)_stubs.hae $(FULLMODNAME1)_module.h $(FULLMODNAME1)_module.o $(DIR_TESTREMOTE)/test-remote-mock.o: $(FULLMODNAME1).dummy $(FULLMODNAME1).d: $(DIR_TESTREMOTE)/test-remote-mock.aer $(Q) " DEP $@" @@ -25,13 +19,7 @@ REMOTE_MODSRC_$(DIR_TESTREMOTE)/test_remote_mock_buf := $(DIR_TESTREMOTE)/test-r MODNAME2 := test_remote_mock_buf FULLMODNAME2 := $(DIR_TESTREMOTE)/$(MODNAME2) -$(FULLMODNAME2)_stubs.hae $(FULLMODNAME2)_module.h $(FULLMODNAME2)_module.o $(DIR_TESTREMOTE)/test-remote-mock-buf.o: $(DIR_TESTREMOTE)/test-remote-mock-embedded-buffers.aer - $(Q) " AERCC $(FULLMODNAME2)" - $(E)$(builddir)/maint/aercc -m $(call RMOD_SERVICE,$(FULLMODNAME2)) \ - -d $(call RMOD_REGDIR,$(FULLMODNAME2)) \ - $(patsubst %,$(srcdir)/%,$(call RMOD_FILES,$(FULLMODNAME2))) \ - -c $(call MCC_AE,$(FULLMODNAME2)) $(VA) $(DA) $(AEPRETTY) \ - -- $(CFLAGS) $(LIBCFLAGS) $(CWARNS) $(call MODCFLAGS_AE,$(FULLMODNAME2)) +$(FULLMODNAME2)_stubs.hae $(FULLMODNAME2)_module.h $(FULLMODNAME2)_module.o $(DIR_TESTREMOTE)/test-remote-mock-embedded-buffers.o: $(FULLMODNAME2).dummy $(FULLMODNAME2).d: $(DIR_TESTREMOTE)/test-remote-mock-embedded-buffers.aer $(Q) " DEP $@" @@ -44,7 +32,7 @@ REMOTE_MODSRC_$(DIR_TESTREMOTE)/test_remote_mpi := $(DIR_TESTREMOTE)/test-remote MODNAME3 := test_remote_mpi FULLMODNAME3 := $(DIR_TESTREMOTE)/$(MODNAME3) -$(FULLMODNAME3)_stubs.hae $(FULLMODNAME3)_module.h $(FULLMODNAME3)_module.o $(DIR_TESTREMOTE)/test-remote-mock-mpi.o: $(DIR_TESTREMOTE)/test-remote-mpi.aer +$(FULLMODNAME3)_stubs.hae $(FULLMODNAME3)_module.h $(FULLMODNAME3)_module.o $(DIR_TESTREMOTE)/test-remote-mpi.o: $(FULLMODNAME3).dummy $(Q) " AERCC $(FULLMODNAME3)" $(E)$(builddir)/maint/aercc -m $(call RMOD_SERVICE,$(FULLMODNAME3)) \ -d $(call RMOD_REGDIR,$(FULLMODNAME3)) \ @@ -61,13 +49,7 @@ REMOTE_MODSRC_$(DIR_TESTREMOTE)/test_remote_fault := $(DIR_TESTREMOTE)/test-remo MODNAME4 := test_remote_fault FULLMODNAME4 := $(DIR_TESTREMOTE)/$(MODNAME4) -$(FULLMODNAME4)_stubs.hae $(FULLMODNAME4)_module.h $(FULLMODNAME4)_module.o $(DIR_TESTREMOTE)/test-remote-mock-fault.o: $(DIR_TESTREMOTE)/test-remote-fault.aer - $(Q) " AERCC $(FULLMODNAME4)" - $(E)$(builddir)/maint/aercc -m $(call RMOD_SERVICE,$(FULLMODNAME4)) \ - -d $(call RMOD_REGDIR,$(FULLMODNAME4)) \ - $(patsubst %,$(srcdir)/%,$(call RMOD_FILES,$(FULLMODNAME4))) \ - -c $(call MCC_AE,$(FULLMODNAME4)) $(VA) $(DA) $(AEPRETTY) \ - -- $(CFLAGS) $(LIBCFLAGS) $(CWARNS) $(call MODCFLAGS_AE,$(FULLMODNAME4)) +$(FULLMODNAME4)_stubs.hae $(FULLMODNAME4)_module.h $(FULLMODNAME4)_module.o $(DIR_TESTREMOTE)/test-remote-fault-injector.o: $(FULLMODNAME4).dummy $(FULLMODNAME4).d: $(DIR_TESTREMOTE)/test-remote-fault.aer $(Q) " DEP $@" @@ -78,13 +60,7 @@ REMOTE_MODSRC_$(DIR_TESTREMOTE)/test_remote_service_stop := $(DIR_TESTREMOTE)/te MODNAME5 := test_remote_service_stop FULLMODNAME5 := $(DIR_TESTREMOTE)/$(MODNAME5) -$(FULLMODNAME5)_stubs.hae $(FULLMODNAME5)_module.h $(FULLMODNAME5)_module.o $(DIR_TESTREMOTE)/test-remote-service-stop.o: $(DIR_TESTREMOTE)/test-remote-service-stop.aer - $(Q) " AERCC $(FULLMODNAME5)" - $(E)$(builddir)/maint/aercc -m $(call RMOD_SERVICE,$(FULLMODNAME5)) \ - -d $(call RMOD_REGDIR,$(FULLMODNAME5)) \ - $(patsubst %,$(srcdir)/%,$(call RMOD_FILES,$(FULLMODNAME5))) \ - -c $(call MCC_AE,$(FULLMODNAME5)) $(VA) $(DA) $(AEPRETTY) \ - -- $(CFLAGS) $(LIBCFLAGS) $(CWARNS) $(call MODCFLAGS_AE,$(FULLMODNAME5)) +$(FULLMODNAME5)_stubs.hae $(FULLMODNAME5)_module.h $(FULLMODNAME5)_module.o $(DIR_TESTREMOTE)/test-remote-service-stop.o: $(FULLMODNAME5).dummy $(FULLMODNAME5).d: $(DIR_TESTREMOTE)/test-remote-service-stop.aer $(Q) " DEP $@" diff --git a/code/src/remote/module.mk.in b/code/src/remote/module.mk.in index cbeee1e..ba5129d 100644 --- a/code/src/remote/module.mk.in +++ b/code/src/remote/module.mk.in @@ -16,13 +16,7 @@ REMOTE_MODSRC_$(DIR_REMOTE)/core := $(DIR_REMOTE)/core-functions.aer MODNAME_CORE := core FULLMODNAME_CORE := $(DIR_REMOTE)/$(MODNAME_CORE) -$(FULLMODNAME_CORE)_stubs.hae $(FULLMODNAME_CORE)_module.h $(FULLMODNAME_CORE)_module.o $(DIR_REMOTE)/core-functions.o: $(DIR_REMOTE)/core-functions.aer - $(Q) " AERCC $(FULLMODNAME_CORE)" - $(E)$(builddir)/maint/aercc -m $(call RMOD_SERVICE,$(FULLMODNAME_CORE)) \ - -d $(call RMOD_REGDIR,$(FULLMODNAME_CORE)) \ - $(patsubst %,$(srcdir)/%,$(call RMOD_FILES,$(FULLMODNAME_CORE))) \ - -c $(call MCC_AE,$(FULLMODNAME_CORE)) $(VA) $(DA) $(AEPRETTY) \ - -- $(CFLAGS) $(LIBCFLAGS) $(CWARNS) $(call MODCFLAGS_AE,$(FULLMODNAME_CORE)) +$(FULLMODNAME_CORE)_stubs.hae $(FULLMODNAME_CORE)_module.h $(FULLMODNAME_CORE)_module.o $(DIR_REMOTE)/core-functions.o: $(FULLMODNAME_CORE).dummy $(FULLMODNAME_CORE).d: $(DIR_CORE)/core-functions.aer $(Q) " DEP $@" diff --git a/code/src/replicated-osd/module.mk.in b/code/src/replicated-osd/module.mk.in index d42c6eb..7993a44 100644 --- a/code/src/replicated-osd/module.mk.in +++ b/code/src/replicated-osd/module.mk.in @@ -16,13 +16,7 @@ REMOTE_LIBSRC += $(DIR_ROSD)/replicated-osd.aer MODCFLAGS_$(DIR_ROSD)/replicated-osd = $(MPICFLAGS) MODCC_$(DIR_ROSD)/replicated-osd = $(MPICC) -$(FULLMODNAME_ROSD)_stubs.hae $(FULLMODNAME_ROSD)_module.h $(FULLMODNAME_ROSD)_module.o $(DIR_ROSD)/replicated-osd.o: $(DIR_ROSD)/replicated-osd.aer - $(Q) " AERCC $(FULLMODNAME_ROSD)" - $(E)$(builddir)/maint/aercc -m $(call RMOD_SERVICE,$(FULLMODNAME_ROSD)) \ - -d $(call RMOD_REGDIR,$(FULLMODNAME_ROSD)) \ - $(patsubst %,$(srcdir)/%,$(call RMOD_FILES,$(FULLMODNAME_ROSD))) \ - -c $(call MCC_AE,$(FULLMODNAME_ROSD)) $(VA) $(DA) $(AEPRETTY) \ - -- $(CFLAGS) $(LIBCFLAGS) $(CWARNS) $(call MODCFLAGS_AE,$(FULLMODNAME_ROSD)) +$(FULLMODNAME_ROSD)_stubs.hae $(FULLMODNAME_ROSD)_module.h $(FULLMODNAME_ROSD)_module.o $(DIR_ROSD)/replicated-osd.o: $(FULLMODNAME_ROSD).dummy $(FULLMODNAME_ROSD).d: $(DIR_ROSD)/replicated-osd.aer $(Q) " DEP $@" diff --git a/code/src/state/module.mk.in b/code/src/state/module.mk.in index 461c441..4fb9c9c 100644 --- a/code/src/state/module.mk.in +++ b/code/src/state/module.mk.in @@ -15,13 +15,7 @@ REMOTE_MODSRC_$(DIR_STATE)/sc := $(DIR_STATE)/state-client.aer MODCFLAGS_$(DIR_STATE)/state-client = $(MPICFLAGS) MODCC_$(DIR_STATE)/state-client = $(MPICC) -$(FULLMODNAME_STATE)_stubs.hae $(FULLMODNAME_STATE)_module.h $(FULLMODNAME_STATE)_module.o $(DIR_STATE)/state-client.o: $(DIR_STATE)/state-client.aer - $(Q) " AERCC $(FULLMODNAME_STATE)" - $(E)$(builddir)/maint/aercc -m $(call RMOD_SERVICE,$(FULLMODNAME_STATE)) \ - -d $(call RMOD_REGDIR_STATE,$(FULLMODNAME_STATE)) \ - $(patsubst %,$(srcdir)/%,$(call RMOD_FILES,$(FULLMODNAME_STATE))) \ - -c $(call MCC_AE,$(FULLMODNAME_STATE)) $(VA) $(DA) $(AEPRETTY) \ - -- $(CFLAGS) $(LIBCFLAGS) $(CWARNS) $(call MODCFLAGS_AE,$(FULLMODNAME_STATE)) +$(FULLMODNAME_STATE)_stubs.hae $(FULLMODNAME_STATE)_module.h $(FULLMODNAME_STATE)_module.o $(DIR_STATE)/state-client.o: $(FULLMODNAME_STATE).dummy $(FULLMODNAME_STATE).d: $(DIR_STATE)/state-client.aer $(Q) " DEP $@" hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. f371086d3ea5a6778af7543c7f2b3c7297749be8
by noreply＠mcs.anl.gov 27 Apr '11

27 Apr '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 f371086d3ea5a6778af7543c7f2b3c7297749be8 (commit) from c57f6ec5563546093c0f6317f99cf9166368118d (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 f371086d3ea5a6778af7543c7f2b3c7297749be8 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Thu Apr 28 00:04:44 2011 -0400 dependencies for another class of .c files ----------------------------------------------------------------------- Summary of changes: code/Makefile.in | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) Diff of changes: diff --git a/code/Makefile.in b/code/Makefile.in index 6bc8493..395be69 100644 --- a/code/Makefile.in +++ b/code/Makefile.in @@ -348,6 +348,7 @@ AEDEPS=$(patsubst %.o,%.ae.d,$(AEOBJS)) # The object files for the test library generated from .c files TESTLIBOBJS=$(patsubst %.c,%.o,$(TESTLIBSRC)) +TESTLIBDEPS=$(patsubst %.c,%.d,$(TESTLIBSRC)) HSBIN=$(patsubst %.lhs,%,$(HSBINSRC)) HSOBJ=$(patsubst %.lhs,%.o,$(filter %.lhs,$(HSSRC))) \ @@ -360,7 +361,7 @@ REMOTE_MODULES = $(REMOTE_LIB_MODULES) $(REMOTE_TESTLIB_MODULES) REMOTE_MODULES_GENFILES = $(foreach mod,$(REMOTE_MODULES),$(mod)_stubs.hae $(mod)_module.h $(mod)_module.o) REMOTE_MODULES_DEPFILES = $(foreach mod,$(REMOTE_MODULES),$(mod).d) -DEPENDS=$(TESTDEPS) $(GENLIBDEPS) $(LIBDEPS) $(REMOTE_MODULES_DEPFILES) $(AEDEPS) $(AESOP_TRHDR_DEPS) +DEPENDS=$(TESTDEPS) $(GENLIBDEPS) $(LIBDEPS) $(REMOTE_MODULES_DEPFILES) $(AEDEPS) $(AESOP_TRHDR_DEPS) $(TESTLIBDEPS) REMOTE_LIB_OBJS := $(patsubst %.aer,%.o, $(foreach mod,$(REMOTE_LIB_MODULES),$(REMOTE_MODSRC_$(mod)))) $(foreach mod,$(REMOTE_LIB_MODULES),$(mod)_module.o) REMOTE_TESTLIB_OBJS := $(patsubst %.aer,%.o, $(foreach mod,$(REMOTE_TESTLIB_MODULES),$(REMOTE_MODSRC_$(mod)))) $(foreach mod,$(REMOTE_TESTLIB_MODULES),$(mod)_module.o) @@ -446,7 +447,7 @@ $(GENLIBOBJS) $(LIBOBJS) $(TESTOBJS): %.o: %.c $(call MODCFLAGS_C,$*) $< # Auto-generated dependencies for .c files -$(LIBDEPS) $(GENLIBDEPS) $(TESTDEPS): %.d: %.c +$(LIBDEPS) $(GENLIBDEPS) $(TESTDEPS) $(TESTLIBDEPS): %.d: %.c $(Q) " DEP $@" $(E)CC=$(call MCC_C,$*) $(srcdir)/maint/depend.sh $(call dirname,$*) $(LIBCFLAGS) $(CFLAGS) $(call MODCFLAGS_C,$*) $< > $@ @@ -507,8 +508,8 @@ $(AEDEPS): %.ae.d: %.ae # Generate header files (%.h) from AE header files -# TODO: is this rule ever used? Clean out if not. -# +# NOTE: this is used by resource .c files that need to include the .h +# version of the .hae file that defines the resource interface $(AESOP_TRHDR): %.h: %.hae $(HSBIN) $(Q) " AECC $*.hae" hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. c57f6ec5563546093c0f6317f99cf9166368118d
by noreply＠mcs.anl.gov 27 Apr '11

27 Apr '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 c57f6ec5563546093c0f6317f99cf9166368118d (commit) from 0072bd5353bd547241da5f5e4f538d440e3aaf8a (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 c57f6ec5563546093c0f6317f99cf9166368118d Author: Phil Carns <carns(a)mcs.anl.gov> Date: Wed Apr 27 23:00:01 2011 -0400 typos: stubs.h should be stubs.hae ----------------------------------------------------------------------- Summary of changes: code/Makefile.in | 2 +- code/src/aesop/parser/tests/remote/module.mk.in | 10 +++++----- code/src/remote/module.mk.in | 2 +- code/src/replicated-osd/module.mk.in | 2 +- code/src/state/module.mk.in | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) Diff of changes: diff --git a/code/Makefile.in b/code/Makefile.in index 4e360d3..6bc8493 100644 --- a/code/Makefile.in +++ b/code/Makefile.in @@ -357,7 +357,7 @@ HSINT=$(patsubst %.lhs,%.hi,$(filter %.lhs,$(HSSRC))) \ REMOTE_MODULES = $(REMOTE_LIB_MODULES) $(REMOTE_TESTLIB_MODULES) -REMOTE_MODULES_GENFILES = $(foreach mod,$(REMOTE_MODULES),$(mod)_stubs.h $(mod)_module.h $(mod)_module.o) +REMOTE_MODULES_GENFILES = $(foreach mod,$(REMOTE_MODULES),$(mod)_stubs.hae $(mod)_module.h $(mod)_module.o) REMOTE_MODULES_DEPFILES = $(foreach mod,$(REMOTE_MODULES),$(mod).d) DEPENDS=$(TESTDEPS) $(GENLIBDEPS) $(LIBDEPS) $(REMOTE_MODULES_DEPFILES) $(AEDEPS) $(AESOP_TRHDR_DEPS) diff --git a/code/src/aesop/parser/tests/remote/module.mk.in b/code/src/aesop/parser/tests/remote/module.mk.in index 8171145..8760264 100644 --- a/code/src/aesop/parser/tests/remote/module.mk.in +++ b/code/src/aesop/parser/tests/remote/module.mk.in @@ -8,7 +8,7 @@ FULLMODNAME1 := $(DIR_TESTREMOTE)/$(MODNAME1) # specifies which aer files get included in the module REMOTE_MODSRC_$(DIR_TESTREMOTE)/test_remote_mock := $(DIR_TESTREMOTE)/test-remote-mock.aer -$(FULLMODNAME1)_stubs.h $(FULLMODNAME1)_module.h $(FULLMODNAME1)_module.o $(DIR_TESTREMOTE)/test-remote-mock.o: $(DIR_TESTREMOTE)/test-remote-mock.aer +$(FULLMODNAME1)_stubs.hae $(FULLMODNAME1)_module.h $(FULLMODNAME1)_module.o $(DIR_TESTREMOTE)/test-remote-mock.o: $(DIR_TESTREMOTE)/test-remote-mock.aer $(Q) " AERCC $(FULLMODNAME1)" $(E)$(builddir)/maint/aercc -m $(call RMOD_SERVICE,$(FULLMODNAME1)) \ -d $(call RMOD_REGDIR,$(FULLMODNAME1)) \ @@ -25,7 +25,7 @@ REMOTE_MODSRC_$(DIR_TESTREMOTE)/test_remote_mock_buf := $(DIR_TESTREMOTE)/test-r MODNAME2 := test_remote_mock_buf FULLMODNAME2 := $(DIR_TESTREMOTE)/$(MODNAME2) -$(FULLMODNAME2)_stubs.h $(FULLMODNAME2)_module.h $(FULLMODNAME2)_module.o $(DIR_TESTREMOTE)/test-remote-mock-buf.o: $(DIR_TESTREMOTE)/test-remote-mock-embedded-buffers.aer +$(FULLMODNAME2)_stubs.hae $(FULLMODNAME2)_module.h $(FULLMODNAME2)_module.o $(DIR_TESTREMOTE)/test-remote-mock-buf.o: $(DIR_TESTREMOTE)/test-remote-mock-embedded-buffers.aer $(Q) " AERCC $(FULLMODNAME2)" $(E)$(builddir)/maint/aercc -m $(call RMOD_SERVICE,$(FULLMODNAME2)) \ -d $(call RMOD_REGDIR,$(FULLMODNAME2)) \ @@ -44,7 +44,7 @@ REMOTE_MODSRC_$(DIR_TESTREMOTE)/test_remote_mpi := $(DIR_TESTREMOTE)/test-remote MODNAME3 := test_remote_mpi FULLMODNAME3 := $(DIR_TESTREMOTE)/$(MODNAME3) -$(FULLMODNAME3)_stubs.h $(FULLMODNAME3)_module.h $(FULLMODNAME3)_module.o $(DIR_TESTREMOTE)/test-remote-mock-mpi.o: $(DIR_TESTREMOTE)/test-remote-mpi.aer +$(FULLMODNAME3)_stubs.hae $(FULLMODNAME3)_module.h $(FULLMODNAME3)_module.o $(DIR_TESTREMOTE)/test-remote-mock-mpi.o: $(DIR_TESTREMOTE)/test-remote-mpi.aer $(Q) " AERCC $(FULLMODNAME3)" $(E)$(builddir)/maint/aercc -m $(call RMOD_SERVICE,$(FULLMODNAME3)) \ -d $(call RMOD_REGDIR,$(FULLMODNAME3)) \ @@ -61,7 +61,7 @@ REMOTE_MODSRC_$(DIR_TESTREMOTE)/test_remote_fault := $(DIR_TESTREMOTE)/test-remo MODNAME4 := test_remote_fault FULLMODNAME4 := $(DIR_TESTREMOTE)/$(MODNAME4) -$(FULLMODNAME4)_stubs.h $(FULLMODNAME4)_module.h $(FULLMODNAME4)_module.o $(DIR_TESTREMOTE)/test-remote-mock-fault.o: $(DIR_TESTREMOTE)/test-remote-fault.aer +$(FULLMODNAME4)_stubs.hae $(FULLMODNAME4)_module.h $(FULLMODNAME4)_module.o $(DIR_TESTREMOTE)/test-remote-mock-fault.o: $(DIR_TESTREMOTE)/test-remote-fault.aer $(Q) " AERCC $(FULLMODNAME4)" $(E)$(builddir)/maint/aercc -m $(call RMOD_SERVICE,$(FULLMODNAME4)) \ -d $(call RMOD_REGDIR,$(FULLMODNAME4)) \ @@ -78,7 +78,7 @@ REMOTE_MODSRC_$(DIR_TESTREMOTE)/test_remote_service_stop := $(DIR_TESTREMOTE)/te MODNAME5 := test_remote_service_stop FULLMODNAME5 := $(DIR_TESTREMOTE)/$(MODNAME5) -$(FULLMODNAME5)_stubs.h $(FULLMODNAME5)_module.h $(FULLMODNAME5)_module.o $(DIR_TESTREMOTE)/test-remote-service-stop.o: $(DIR_TESTREMOTE)/test-remote-service-stop.aer +$(FULLMODNAME5)_stubs.hae $(FULLMODNAME5)_module.h $(FULLMODNAME5)_module.o $(DIR_TESTREMOTE)/test-remote-service-stop.o: $(DIR_TESTREMOTE)/test-remote-service-stop.aer $(Q) " AERCC $(FULLMODNAME5)" $(E)$(builddir)/maint/aercc -m $(call RMOD_SERVICE,$(FULLMODNAME5)) \ -d $(call RMOD_REGDIR,$(FULLMODNAME5)) \ diff --git a/code/src/remote/module.mk.in b/code/src/remote/module.mk.in index a016cf6..cbeee1e 100644 --- a/code/src/remote/module.mk.in +++ b/code/src/remote/module.mk.in @@ -16,7 +16,7 @@ REMOTE_MODSRC_$(DIR_REMOTE)/core := $(DIR_REMOTE)/core-functions.aer MODNAME_CORE := core FULLMODNAME_CORE := $(DIR_REMOTE)/$(MODNAME_CORE) -$(FULLMODNAME_CORE)_stubs.h $(FULLMODNAME_CORE)_module.h $(FULLMODNAME_CORE)_module.o $(DIR_REMOTE)/core-functions.o: $(DIR_REMOTE)/core-functions.aer +$(FULLMODNAME_CORE)_stubs.hae $(FULLMODNAME_CORE)_module.h $(FULLMODNAME_CORE)_module.o $(DIR_REMOTE)/core-functions.o: $(DIR_REMOTE)/core-functions.aer $(Q) " AERCC $(FULLMODNAME_CORE)" $(E)$(builddir)/maint/aercc -m $(call RMOD_SERVICE,$(FULLMODNAME_CORE)) \ -d $(call RMOD_REGDIR,$(FULLMODNAME_CORE)) \ diff --git a/code/src/replicated-osd/module.mk.in b/code/src/replicated-osd/module.mk.in index 24dd057..d42c6eb 100644 --- a/code/src/replicated-osd/module.mk.in +++ b/code/src/replicated-osd/module.mk.in @@ -16,7 +16,7 @@ REMOTE_LIBSRC += $(DIR_ROSD)/replicated-osd.aer MODCFLAGS_$(DIR_ROSD)/replicated-osd = $(MPICFLAGS) MODCC_$(DIR_ROSD)/replicated-osd = $(MPICC) -$(FULLMODNAME_ROSD)_stubs.h $(FULLMODNAME_ROSD)_module.h $(FULLMODNAME_ROSD)_module.o $(DIR_ROSD)/replicated-osd.o: $(DIR_ROSD)/replicated-osd.aer +$(FULLMODNAME_ROSD)_stubs.hae $(FULLMODNAME_ROSD)_module.h $(FULLMODNAME_ROSD)_module.o $(DIR_ROSD)/replicated-osd.o: $(DIR_ROSD)/replicated-osd.aer $(Q) " AERCC $(FULLMODNAME_ROSD)" $(E)$(builddir)/maint/aercc -m $(call RMOD_SERVICE,$(FULLMODNAME_ROSD)) \ -d $(call RMOD_REGDIR,$(FULLMODNAME_ROSD)) \ diff --git a/code/src/state/module.mk.in b/code/src/state/module.mk.in index 3b40946..461c441 100644 --- a/code/src/state/module.mk.in +++ b/code/src/state/module.mk.in @@ -15,7 +15,7 @@ REMOTE_MODSRC_$(DIR_STATE)/sc := $(DIR_STATE)/state-client.aer MODCFLAGS_$(DIR_STATE)/state-client = $(MPICFLAGS) MODCC_$(DIR_STATE)/state-client = $(MPICC) -$(FULLMODNAME_STATE)_stubs.h $(FULLMODNAME_STATE)_module.h $(FULLMODNAME_STATE)_module.o $(DIR_STATE)/state-client.o: $(DIR_STATE)/state-client.aer +$(FULLMODNAME_STATE)_stubs.hae $(FULLMODNAME_STATE)_module.h $(FULLMODNAME_STATE)_module.o $(DIR_STATE)/state-client.o: $(DIR_STATE)/state-client.aer $(Q) " AERCC $(FULLMODNAME_STATE)" $(E)$(builddir)/maint/aercc -m $(call RMOD_SERVICE,$(FULLMODNAME_STATE)) \ -d $(call RMOD_REGDIR_STATE,$(FULLMODNAME_STATE)) \ hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. 0072bd5353bd547241da5f5e4f538d440e3aaf8a
by noreply＠mcs.anl.gov 27 Apr '11

27 Apr '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 0072bd5353bd547241da5f5e4f538d440e3aaf8a (commit) via f923ca5f8cf09d511d7fff7d6fa1f45dbd10f068 (commit) via 1e42633dc13cd573b5f7b73aa1d9614b408942fc (commit) via 4f334d01acf6875b744386a5dbc41b7b24679708 (commit) via df86645ffc9c8b0ff794004b6deb071b99ad4f1d (commit) from ce15cb309ac5f5835d581c10cd6b17fdfe26e62b (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 0072bd5353bd547241da5f5e4f538d440e3aaf8a Author: Phil Carns <carns(a)mcs.anl.gov> Date: Wed Apr 27 22:42:25 2011 -0400 minor comments commit f923ca5f8cf09d511d7fff7d6fa1f45dbd10f068 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Wed Apr 27 22:38:28 2011 -0400 manual dependency generation rules for each .aer ref #107 commit 1e42633dc13cd573b5f7b73aa1d9614b408942fc Author: Phil Carns <carns(a)mcs.anl.gov> Date: Wed Apr 27 22:37:39 2011 -0400 bug fis: remote deps defined after first use ref #107 commit 4f334d01acf6875b744386a5dbc41b7b24679708 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Wed Apr 27 22:18:48 2011 -0400 dependency on ae parser binaries for .aer files commit df86645ffc9c8b0ff794004b6deb071b99ad4f1d Author: Phil Carns <carns(a)mcs.anl.gov> Date: Wed Apr 27 22:12:38 2011 -0400 re-apply reverted commit ----------------------------------------------------------------------- Summary of changes: code/Makefile.in | 41 ++++----- code/maint/aercc.in | 2 +- code/src/aesop/parser/tests/remote/module.mk.in | 102 +++++++++++++++++++---- code/src/remote/module.mk.in | 39 ++++++--- code/src/replicated-osd/module.mk.in | 33 ++++++-- code/src/state/module.mk.in | 30 +++++-- 6 files changed, 178 insertions(+), 69 deletions(-) Diff of changes: diff --git a/code/Makefile.in b/code/Makefile.in index b657c41..4e360d3 100644 --- a/code/Makefile.in +++ b/code/Makefile.in @@ -349,8 +349,6 @@ AEDEPS=$(patsubst %.o,%.ae.d,$(AEOBJS)) # The object files for the test library generated from .c files TESTLIBOBJS=$(patsubst %.c,%.o,$(TESTLIBSRC)) -DEPENDS=$(TESTDEPS) $(GENLIBDEPS) $(LIBDEPS) $(REMOTE_MODULES_DEPFILES) $(AEDEPS) $(AESOP_TRHDR_DEPS) - HSBIN=$(patsubst %.lhs,%,$(HSBINSRC)) HSOBJ=$(patsubst %.lhs,%.o,$(filter %.lhs,$(HSSRC))) \ $(patsubst %.hs,%.o,$(filter %.hs,$(HSSRC))) @@ -362,6 +360,8 @@ REMOTE_MODULES = $(REMOTE_LIB_MODULES) $(REMOTE_TESTLIB_MODULES) REMOTE_MODULES_GENFILES = $(foreach mod,$(REMOTE_MODULES),$(mod)_stubs.h $(mod)_module.h $(mod)_module.o) REMOTE_MODULES_DEPFILES = $(foreach mod,$(REMOTE_MODULES),$(mod).d) +DEPENDS=$(TESTDEPS) $(GENLIBDEPS) $(LIBDEPS) $(REMOTE_MODULES_DEPFILES) $(AEDEPS) $(AESOP_TRHDR_DEPS) + REMOTE_LIB_OBJS := $(patsubst %.aer,%.o, $(foreach mod,$(REMOTE_LIB_MODULES),$(REMOTE_MODSRC_$(mod)))) $(foreach mod,$(REMOTE_LIB_MODULES),$(mod)_module.o) REMOTE_TESTLIB_OBJS := $(patsubst %.aer,%.o, $(foreach mod,$(REMOTE_TESTLIB_MODULES),$(REMOTE_MODSRC_$(mod)))) $(foreach mod,$(REMOTE_TESTLIB_MODULES),$(mod)_module.o) REMOTE_OBJS = $(REMOTE_LIB_OBJS) $(REMOTE_TESTLIB_OBJS) @@ -416,16 +416,6 @@ $(AETEST): %: %.o $(LIBRARIES) $(TEST_LIBRARIES) -L$(builddir)/lib -ltriton-test -ltriton \ $(call MODLDFLAGS_AE,$*) $(call MODLIBS_AE,$*) $(LIBS) -# TODO: this is sort of a hack. The <filename>.o is generated from a -# <filename>.ear file as part of the rule that generated the -# <modulename>_stubs.h file from <filename>.aer. Make can sometimes get -# confused, though, because there is no explicit rule with <filename.o> -# as the target for those files, but the .o is needed to build executables -# in some cases. The following line forces all generated remote module -# files to be created as a pre-req for the <filename>.o to prevent that -# problem for now. -$(REMOTE_TESTOBJS): %.o: $(REMOTE_MODULES_GENFILES) - $(REMOTE_TEST): %: %.o $(LIBRARIES) $(TEST_LIBRARIES) $(Q) " LD $@" $(E)$(call MCC_AER,$*) \ @@ -517,6 +507,7 @@ $(AEDEPS): %.ae.d: %.ae # Generate header files (%.h) from AE header files +# TODO: is this rule ever used? Clean out if not. # $(AESOP_TRHDR): %.h: %.hae $(HSBIN) @@ -529,17 +520,21 @@ $(AESOP_TRHDR_DEPS): %.h.d: %.hae $(Q) " DEP $@" $(E)CC=$(call MCC_C,$*) $(srcdir)/maint/depend-hae.sh $(call dirname,$*) $(LIBCFLAGS) $(CFLAGS) $(call MODCFLAGS_C,$*) $< > $@ - -# AE rule compiles remote *.aer files to object files -# -# NOTE: although it is not listed as a target, this rule also builds the -# <filename>.o file as well. -%_stubs.h %_module.h %_module.o: $(HSBIN) $(GENLIBFILES) $(AESOP_TRHDR) - $(Q) " AERCC $*" - $(E)$(builddir)/maint/aercc -m $(call RMOD_SERVICE,$*) -d $(call RMOD_REGDIR,$*) \ - $(patsubst %,$(srcdir)/%,$(call RMOD_FILES,$*)) \ - -c $(call MCC_AE,$*) $(VA) $(DA) $(AEPRETTY) \ - -- $(CFLAGS) $(LIBCFLAGS) $(CWARNS) $(call MODCFLAGS_AE,$*) +# have to build parsers before generating any remote genfiles or objects +$(REMOTE_MODULES_GENFILES) $(REMOTE_OBJS): $(HSBIN) + +# TODO: we need a better solution here. The problem is that the +# auto-dependencies often include generated headers. If we make the .d +# files themselves depend on those same files, then we have to generate all +# headers to produce dependency files before doing anything else. This +# takes a long time. For now I'm adding this brute force rule to regen all +# dependency information if any non-generated headers change. Rebuilding +# all dependency files is faster than compiling one superfluous .aer file. +DEP_PREREQS := +DEP_PREREQS += $(shell find $(srcdir)/src -name "*.haer") +DEP_PREREQS += $(shell find $(srcdir)/src -name "*.hae") +DEP_PREREQS += $(shell find $(srcdir)/src -name "*.h") +%.d: $(DEP_PREREQS) # Compile parsers from haskell source using GHC diff --git a/code/maint/aercc.in b/code/maint/aercc.in index 3ea59d1..8c8c841 100644 --- a/code/maint/aercc.in +++ b/code/maint/aercc.in @@ -187,7 +187,7 @@ done modobj=${fullservicename}_module.o # make dependency file -echo "${modobj} ${objfiles}: ${INPUTFILES}" > ${fullservicename}.d +#echo "${modobj} ${objfiles}: ${INPUTFILES}" > ${fullservicename}.d # compile generated _module.s doCompile ${verbose} ${compiler} ${modcout} ${modobj} ${COMPILEROPTS} diff --git a/code/src/aesop/parser/tests/remote/module.mk.in b/code/src/aesop/parser/tests/remote/module.mk.in index 5f869c1..8171145 100644 --- a/code/src/aesop/parser/tests/remote/module.mk.in +++ b/code/src/aesop/parser/tests/remote/module.mk.in @@ -1,30 +1,100 @@ -DIR := src/aesop/parser/tests/remote +DIR_TESTREMOTE := src/aesop/parser/tests/remote # define the test_remote module -REMOTE_TESTLIB_MODULES += $(DIR)/test_remote_mock +REMOTE_TESTLIB_MODULES += $(DIR_TESTREMOTE)/test_remote_mock +MODNAME1 := test_remote_mock +FULLMODNAME1 := $(DIR_TESTREMOTE)/$(MODNAME1) # specifies which aer files get included in the module -REMOTE_MODSRC_$(DIR)/test_remote_mock := $(DIR)/test-remote-mock.aer +REMOTE_MODSRC_$(DIR_TESTREMOTE)/test_remote_mock := $(DIR_TESTREMOTE)/test-remote-mock.aer -REMOTE_TESTLIB_MODULES += $(DIR)/test_remote_mock_buf -REMOTE_MODSRC_$(DIR)/test_remote_mock_buf := $(DIR)/test-remote-mock-embedded-buffers.aer +$(FULLMODNAME1)_stubs.h $(FULLMODNAME1)_module.h $(FULLMODNAME1)_module.o $(DIR_TESTREMOTE)/test-remote-mock.o: $(DIR_TESTREMOTE)/test-remote-mock.aer + $(Q) " AERCC $(FULLMODNAME1)" + $(E)$(builddir)/maint/aercc -m $(call RMOD_SERVICE,$(FULLMODNAME1)) \ + -d $(call RMOD_REGDIR,$(FULLMODNAME1)) \ + $(patsubst %,$(srcdir)/%,$(call RMOD_FILES,$(FULLMODNAME1))) \ + -c $(call MCC_AE,$(FULLMODNAME1)) $(VA) $(DA) $(AEPRETTY) \ + -- $(CFLAGS) $(LIBCFLAGS) $(CWARNS) $(call MODCFLAGS_AE,$(FULLMODNAME1)) + +$(FULLMODNAME1).d: $(DIR_TESTREMOTE)/test-remote-mock.aer + $(Q) " DEP $@" + $(E)CC=$(call MCC_AE,$(FULLMODNAME1)) $(srcdir)/maint/depend-aer.sh $(DIR_TESTREMOTE) $(MODNAME1) $(LIBCFLAGS) $(CFLAGS) $(call MODCFLAGS_AE,$FULLMODNAME1) $< > $@ + +REMOTE_TESTLIB_MODULES += $(DIR_TESTREMOTE)/test_remote_mock_buf +REMOTE_MODSRC_$(DIR_TESTREMOTE)/test_remote_mock_buf := $(DIR_TESTREMOTE)/test-remote-mock-embedded-buffers.aer +MODNAME2 := test_remote_mock_buf +FULLMODNAME2 := $(DIR_TESTREMOTE)/$(MODNAME2) + +$(FULLMODNAME2)_stubs.h $(FULLMODNAME2)_module.h $(FULLMODNAME2)_module.o $(DIR_TESTREMOTE)/test-remote-mock-buf.o: $(DIR_TESTREMOTE)/test-remote-mock-embedded-buffers.aer + $(Q) " AERCC $(FULLMODNAME2)" + $(E)$(builddir)/maint/aercc -m $(call RMOD_SERVICE,$(FULLMODNAME2)) \ + -d $(call RMOD_REGDIR,$(FULLMODNAME2)) \ + $(patsubst %,$(srcdir)/%,$(call RMOD_FILES,$(FULLMODNAME2))) \ + -c $(call MCC_AE,$(FULLMODNAME2)) $(VA) $(DA) $(AEPRETTY) \ + -- $(CFLAGS) $(LIBCFLAGS) $(CWARNS) $(call MODCFLAGS_AE,$(FULLMODNAME2)) + +$(FULLMODNAME2).d: $(DIR_TESTREMOTE)/test-remote-mock-embedded-buffers.aer + $(Q) " DEP $@" + $(E)CC=$(call MCC_AE,$(FULLMODNAME2)) $(srcdir)/maint/depend-aer.sh $(DIR_TESTREMOTE) $(MODNAME2) $(LIBCFLAGS) $(CFLAGS) $(call MODCFLAGS_AE,$FULLMODNAME2) $< > $@ ifneq (,$(BUILD_MPI)) -REMOTE_TESTLIB_MODULES += $(DIR)/test_remote_mpi -REMOTE_MODSRC_$(DIR)/test_remote_mpi := $(DIR)/test-remote-mpi.aer +REMOTE_TESTLIB_MODULES += $(DIR_TESTREMOTE)/test_remote_mpi +REMOTE_MODSRC_$(DIR_TESTREMOTE)/test_remote_mpi := $(DIR_TESTREMOTE)/test-remote-mpi.aer +MODNAME3 := test_remote_mpi +FULLMODNAME3 := $(DIR_TESTREMOTE)/$(MODNAME3) + +$(FULLMODNAME3)_stubs.h $(FULLMODNAME3)_module.h $(FULLMODNAME3)_module.o $(DIR_TESTREMOTE)/test-remote-mock-mpi.o: $(DIR_TESTREMOTE)/test-remote-mpi.aer + $(Q) " AERCC $(FULLMODNAME3)" + $(E)$(builddir)/maint/aercc -m $(call RMOD_SERVICE,$(FULLMODNAME3)) \ + -d $(call RMOD_REGDIR,$(FULLMODNAME3)) \ + $(patsubst %,$(srcdir)/%,$(call RMOD_FILES,$(FULLMODNAME3))) \ + -c $(call MCC_AE,$(FULLMODNAME3)) $(VA) $(DA) $(AEPRETTY) \ + -- $(CFLAGS) $(LIBCFLAGS) $(CWARNS) $(call MODCFLAGS_AE,$(FULLMODNAME3)) + +$(FULLMODNAME3).d: $(DIR_TESTREMOTE)/test-remote-mpi.aer + $(Q) " DEP $@" + $(E)CC=$(call MCC_AE,$(FULLMODNAME3)) $(srcdir)/maint/depend-aer.sh $(DIR_TESTREMOTE) $(MODNAME3) $(LIBCFLAGS) $(CFLAGS) $(call MODCFLAGS_AE,$FULLMODNAME3) $< > $@ + +REMOTE_TESTLIB_MODULES += $(DIR_TESTREMOTE)/test_remote_fault +REMOTE_MODSRC_$(DIR_TESTREMOTE)/test_remote_fault := $(DIR_TESTREMOTE)/test-remote-fault-injector.aer +MODNAME4 := test_remote_fault +FULLMODNAME4 := $(DIR_TESTREMOTE)/$(MODNAME4) + +$(FULLMODNAME4)_stubs.h $(FULLMODNAME4)_module.h $(FULLMODNAME4)_module.o $(DIR_TESTREMOTE)/test-remote-mock-fault.o: $(DIR_TESTREMOTE)/test-remote-fault.aer + $(Q) " AERCC $(FULLMODNAME4)" + $(E)$(builddir)/maint/aercc -m $(call RMOD_SERVICE,$(FULLMODNAME4)) \ + -d $(call RMOD_REGDIR,$(FULLMODNAME4)) \ + $(patsubst %,$(srcdir)/%,$(call RMOD_FILES,$(FULLMODNAME4))) \ + -c $(call MCC_AE,$(FULLMODNAME4)) $(VA) $(DA) $(AEPRETTY) \ + -- $(CFLAGS) $(LIBCFLAGS) $(CWARNS) $(call MODCFLAGS_AE,$(FULLMODNAME4)) + +$(FULLMODNAME4).d: $(DIR_TESTREMOTE)/test-remote-fault.aer + $(Q) " DEP $@" + $(E)CC=$(call MCC_AE,$(FULLMODNAME4)) $(srcdir)/maint/depend-aer.sh $(DIR_TESTREMOTE) $(MODNAME4) $(LIBCFLAGS) $(CFLAGS) $(call MODCFLAGS_AE,$FULLMODNAME4) $< > $@ + +REMOTE_TESTLIB_MODULES += $(DIR_TESTREMOTE)/test_remote_service_stop +REMOTE_MODSRC_$(DIR_TESTREMOTE)/test_remote_service_stop := $(DIR_TESTREMOTE)/test-remote-service-stop.aer +MODNAME5 := test_remote_service_stop +FULLMODNAME5 := $(DIR_TESTREMOTE)/$(MODNAME5) -REMOTE_TESTLIB_MODULES += $(DIR)/test_remote_fault -REMOTE_MODSRC_$(DIR)/test_remote_fault := $(DIR)/test-remote-fault-injector.aer +$(FULLMODNAME5)_stubs.h $(FULLMODNAME5)_module.h $(FULLMODNAME5)_module.o $(DIR_TESTREMOTE)/test-remote-service-stop.o: $(DIR_TESTREMOTE)/test-remote-service-stop.aer + $(Q) " AERCC $(FULLMODNAME5)" + $(E)$(builddir)/maint/aercc -m $(call RMOD_SERVICE,$(FULLMODNAME5)) \ + -d $(call RMOD_REGDIR,$(FULLMODNAME5)) \ + $(patsubst %,$(srcdir)/%,$(call RMOD_FILES,$(FULLMODNAME5))) \ + -c $(call MCC_AE,$(FULLMODNAME5)) $(VA) $(DA) $(AEPRETTY) \ + -- $(CFLAGS) $(LIBCFLAGS) $(CWARNS) $(call MODCFLAGS_AE,$(FULLMODNAME5)) -REMOTE_TESTLIB_MODULES += $(DIR)/test_remote_service_stop -REMOTE_MODSRC_$(DIR)/test_remote_service_stop := $(DIR)/test-remote-service-stop.aer +$(FULLMODNAME5).d: $(DIR_TESTREMOTE)/test-remote-service-stop.aer + $(Q) " DEP $@" + $(E)CC=$(call MCC_AE,$(FULLMODNAME5)) $(srcdir)/maint/depend-aer.sh $(DIR_TESTREMOTE) $(MODNAME5) $(LIBCFLAGS) $(CFLAGS) $(call MODCFLAGS_AE,$FULLMODNAME5) $< > $@ -REMOTE_TESTSRC += $(DIR)/test-remote-mock.aer \ - $(DIR)/test-remote-mock-embedded-buffers.aer \ - $(DIR)/test-remote-mpi.aer \ - $(DIR)/test-remote-fault-injector.aer \ - $(DIR)/test-remote-service-stop.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 endif # BUILD_MPI diff --git a/code/src/remote/module.mk.in b/code/src/remote/module.mk.in index 914e443..a016cf6 100644 --- a/code/src/remote/module.mk.in +++ b/code/src/remote/module.mk.in @@ -1,15 +1,30 @@ -DIR := src/remote +DIR_REMOTE := src/remote -AESOP_HDR += $(DIR)/message.hae \ - $(DIR)/service.hae \ - $(DIR)/message-method.hae \ - $(DIR)/remote.hae -# $(DIR)/client-server.hae +AESOP_HDR += $(DIR_REMOTE)/message.hae \ + $(DIR_REMOTE)/service.hae \ + $(DIR_REMOTE)/message-method.hae \ + $(DIR_REMOTE)/remote.hae +# $(DIR_REMOTE)/client-server.hae -AELIBSRC += $(DIR)/message.ae \ - $(DIR)/service.ae \ - $(DIR)/retry-method.ae -# $(DIR)/client-server-exec.ae +AELIBSRC += $(DIR_REMOTE)/message.ae \ + $(DIR_REMOTE)/service.ae \ + $(DIR_REMOTE)/retry-method.ae +# $(DIR_REMOTE)/client-server-exec.ae + +REMOTE_LIB_MODULES += $(DIR_REMOTE)/core +REMOTE_MODSRC_$(DIR_REMOTE)/core := $(DIR_REMOTE)/core-functions.aer +MODNAME_CORE := core +FULLMODNAME_CORE := $(DIR_REMOTE)/$(MODNAME_CORE) + +$(FULLMODNAME_CORE)_stubs.h $(FULLMODNAME_CORE)_module.h $(FULLMODNAME_CORE)_module.o $(DIR_REMOTE)/core-functions.o: $(DIR_REMOTE)/core-functions.aer + $(Q) " AERCC $(FULLMODNAME_CORE)" + $(E)$(builddir)/maint/aercc -m $(call RMOD_SERVICE,$(FULLMODNAME_CORE)) \ + -d $(call RMOD_REGDIR,$(FULLMODNAME_CORE)) \ + $(patsubst %,$(srcdir)/%,$(call RMOD_FILES,$(FULLMODNAME_CORE))) \ + -c $(call MCC_AE,$(FULLMODNAME_CORE)) $(VA) $(DA) $(AEPRETTY) \ + -- $(CFLAGS) $(LIBCFLAGS) $(CWARNS) $(call MODCFLAGS_AE,$(FULLMODNAME_CORE)) + +$(FULLMODNAME_CORE).d: $(DIR_CORE)/core-functions.aer + $(Q) " DEP $@" + $(E)CC=$(call MCC_AE,$(FULLMODNAME_CORE)) $(srcdir)/maint/depend-aer.sh $(DIR_CORE) $(MODNAME_CORE) $(LIBCFLAGS) $(CFLAGS) $(call MODCFLAGS_AE,$FULLMODNAME_CORE) $< > $@ -REMOTE_LIB_MODULES += $(DIR)/core -REMOTE_MODSRC_$(DIR)/core := $(DIR)/core-functions.aer diff --git a/code/src/replicated-osd/module.mk.in b/code/src/replicated-osd/module.mk.in index 819bee4..24dd057 100644 --- a/code/src/replicated-osd/module.mk.in +++ b/code/src/replicated-osd/module.mk.in @@ -1,16 +1,31 @@ -DIR := src/replicated-osd +DIR_ROSD := src/replicated-osd +MODNAME_ROSD := rosd +FULLMODNAME_ROSD := $(DIR_ROSD)/$(MODNAME_ROSD) -AESOP_HDR += $(DIR)/rosd-trans-nr-cache.hae -AELIBSRC += $(DIR)/rosd-trans-nr-cache.ae +AESOP_HDR += $(DIR_ROSD)/rosd-trans-nr-cache.hae +AELIBSRC += $(DIR_ROSD)/rosd-trans-nr-cache.ae ifneq (,$(BUILD_MPI)) -LIBSRC += $(DIR)/rosd-utils.c +LIBSRC += $(DIR_ROSD)/rosd-utils.c -REMOTE_LIB_MODULES += $(DIR)/rosd -REMOTE_MODSRC_$(DIR)/rosd := $(DIR)/replicated-osd.aer +REMOTE_LIB_MODULES += $(DIR_ROSD)/$(MODNAME_ROSD) +REMOTE_MODSRC_$(DIR_ROSD)/$(MODNAME_ROSD) := $(DIR_ROSD)/replicated-osd.aer -REMOTE_LIBSRC += $(DIR)/replicated-osd.aer +REMOTE_LIBSRC += $(DIR_ROSD)/replicated-osd.aer + +MODCFLAGS_$(DIR_ROSD)/replicated-osd = $(MPICFLAGS) +MODCC_$(DIR_ROSD)/replicated-osd = $(MPICC) + +$(FULLMODNAME_ROSD)_stubs.h $(FULLMODNAME_ROSD)_module.h $(FULLMODNAME_ROSD)_module.o $(DIR_ROSD)/replicated-osd.o: $(DIR_ROSD)/replicated-osd.aer + $(Q) " AERCC $(FULLMODNAME_ROSD)" + $(E)$(builddir)/maint/aercc -m $(call RMOD_SERVICE,$(FULLMODNAME_ROSD)) \ + -d $(call RMOD_REGDIR,$(FULLMODNAME_ROSD)) \ + $(patsubst %,$(srcdir)/%,$(call RMOD_FILES,$(FULLMODNAME_ROSD))) \ + -c $(call MCC_AE,$(FULLMODNAME_ROSD)) $(VA) $(DA) $(AEPRETTY) \ + -- $(CFLAGS) $(LIBCFLAGS) $(CWARNS) $(call MODCFLAGS_AE,$(FULLMODNAME_ROSD)) + +$(FULLMODNAME_ROSD).d: $(DIR_ROSD)/replicated-osd.aer + $(Q) " DEP $@" + $(E)CC=$(call MCC_AE,$(FULLMODNAME_ROSD)) $(srcdir)/maint/depend-aer.sh $(DIR_ROSD) $(MODNAME_ROSD) $(LIBCFLAGS) $(CFLAGS) $(call MODCFLAGS_AE,$FULLMODNAME_ROSD) $< > $@ -MODCFLAGS_$(DIR)/replicated-osd = $(MPICFLAGS) -MODCC_$(DIR)/replicated-osd = $(MPICC) endif # BUILD_MPI diff --git a/code/src/state/module.mk.in b/code/src/state/module.mk.in index 1c2c07a..3b40946 100644 --- a/code/src/state/module.mk.in +++ b/code/src/state/module.mk.in @@ -1,16 +1,30 @@ -DIR := src/state +DIR_STATE:= src/state +MODNAME_STATE := sc +FULLMODNAME_STATE := $(DIR_STATE)/$(MODNAME_STATE) ifeq ($(BUILD_MPI),1) -AELIBSRC += $(DIR)/state.ae +AELIBSRC += $(DIR_STATE)/state.ae -MODCFLAGS_$(DIR)/state = $(MPICFLAGS) -MODCC_$(DIR)/state = $(MPICC) +MODCFLAGS_$(DIR_STATE)/state = $(MPICFLAGS) +MODCC_$(DIR_STATE)/state = $(MPICC) -REMOTE_TESTLIB_MODULES += $(DIR)/sc -REMOTE_MODSRC_$(DIR)/sc := $(DIR)/state-client.aer +REMOTE_TESTLIB_MODULES += $(DIR_STATE)/sc +REMOTE_MODSRC_$(DIR_STATE)/sc := $(DIR_STATE)/state-client.aer -MODCFLAGS_$(DIR)/state-client = $(MPICFLAGS) -MODCC_$(DIR)/state-client = $(MPICC) +MODCFLAGS_$(DIR_STATE)/state-client = $(MPICFLAGS) +MODCC_$(DIR_STATE)/state-client = $(MPICC) + +$(FULLMODNAME_STATE)_stubs.h $(FULLMODNAME_STATE)_module.h $(FULLMODNAME_STATE)_module.o $(DIR_STATE)/state-client.o: $(DIR_STATE)/state-client.aer + $(Q) " AERCC $(FULLMODNAME_STATE)" + $(E)$(builddir)/maint/aercc -m $(call RMOD_SERVICE,$(FULLMODNAME_STATE)) \ + -d $(call RMOD_REGDIR_STATE,$(FULLMODNAME_STATE)) \ + $(patsubst %,$(srcdir)/%,$(call RMOD_FILES,$(FULLMODNAME_STATE))) \ + -c $(call MCC_AE,$(FULLMODNAME_STATE)) $(VA) $(DA) $(AEPRETTY) \ + -- $(CFLAGS) $(LIBCFLAGS) $(CWARNS) $(call MODCFLAGS_AE,$(FULLMODNAME_STATE)) + +$(FULLMODNAME_STATE).d: $(DIR_STATE)/state-client.aer + $(Q) " DEP $@" + $(E)CC=$(call MCC_AE,$(FULLMODNAME_STATE)) $(srcdir)/maint/depend-aer.sh $(DIR_STATE) $(MODNAME_STATE) $(LIBCFLAGS) $(CFLAGS) $(call MODCFLAGS_AE,$FULLMODNAME_STATE) $< > $@ endif # BUILD_MPI hooks/post-receive -- Triton Repository

1 0