December 2012 - Triton-commits - mailman3.cels.anl.gov

branch, master, updated. a77c22fe8c7bb81db6796978b103802706c33764
by noreply＠mcs.anl.gov 05 Dec '12

05 Dec '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 "". The branch, master has been updated via a77c22fe8c7bb81db6796978b103802706c33764 (commit) from 85bed2132f36e3f7a0f71d03422798ce5c6ac949 (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 a77c22fe8c7bb81db6796978b103802706c33764 Author: Dries Kimpe <dkimpe(a)mcs.anl.gov> Date: Wed Nov 14 18:55:25 2012 -0700 Add rule to build 'draft' version of docs ----------------------------------------------------------------------- Summary of changes: code/Makefile.in | 10 ++++++++-- code/doc/resilience/module.mk.in | 3 +++ .../doc/resilience/simulation-2012-10/module.mk.in | 3 +++ 3 files changed, 14 insertions(+), 2 deletions(-) Diff of changes: diff --git a/code/Makefile.in b/code/Makefile.in index ebffebf..152271a 100644 --- a/code/Makefile.in +++ b/code/Makefile.in @@ -148,6 +148,9 @@ TEST_RESULTS := DOCSRC := BOOKSRC := +# other targets 'doc' will depend on +OTHERDOC := + # Eliminate all default suffixes. We want explicit control. .SUFFIXES: @@ -738,8 +741,11 @@ $(builddir)/doc/resilience/simulation-2012-10/figs: $(abs_srcdir)/doc/resilience #%.pdf: %.txt # $(srcdir)/maint/asciidoc/asciidoc/a2x.py --dblatex-opts "-P latex.output.revhistory=0" -a data-uri -a icons -a toc -a max-width=55em $< -docs: $(DOCPDF) $(BOOKPDF) -doc: $(DOCPDF) $(BOOKPDF) +.phony: doc docs + +docs: doc +doc: $(DOCPDF) $(BOOKPDF) $(OTHERDOC) + docshtml: $(DOCHTML) $(BOOKHTML) dochtml: $(DOCHTML) $(BOOKHTML) diff --git a/code/doc/resilience/module.mk.in b/code/doc/resilience/module.mk.in index a312df1..eb5688e 100644 --- a/code/doc/resilience/module.mk.in +++ b/code/doc/resilience/module.mk.in @@ -14,3 +14,6 @@ BOOKSRC += $(DIR)/resilience-book.txt doc/resilience/resilience-book.pdf: $(DOCSRC) doc/resilience/resilience-book.html: $(DOCSRC) + +OTHERDOC += doc/resilience/resilience-book.draft.pdf + diff --git a/code/doc/resilience/simulation-2012-10/module.mk.in b/code/doc/resilience/simulation-2012-10/module.mk.in index 27a67ea..d739faa 100644 --- a/code/doc/resilience/simulation-2012-10/module.mk.in +++ b/code/doc/resilience/simulation-2012-10/module.mk.in @@ -2,3 +2,6 @@ DIR := doc/resilience/simulation-2012-10 DOCSRC += \ $(DIR)/simulation-2012-10.txt + +OTHERDOC += $(DIR)/simulation-2012-10.draft.pdf + hooks/post-receive --

1 0

branch, ticket-227, updated. 9402a4fe854dfd2fadd74b15aab6a1838f426055
by noreply＠mcs.anl.gov 03 Dec '12

03 Dec '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 "". The branch, ticket-227 has been updated via 9402a4fe854dfd2fadd74b15aab6a1838f426055 (commit) from ca6afeac0f0f09e95f91b498fc8c3027bbdca4b6 (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 9402a4fe854dfd2fadd74b15aab6a1838f426055 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Mon Dec 3 20:22:47 2012 -0500 adjust aesop_main_set macros to match aesop/devel ----------------------------------------------------------------------- Summary of changes: code/src/aesop/examples/rpc-invoke.ae | 2 +- .../tests/remote/test-remote-buffer-response.aer | 2 +- .../parser/tests/remote/test-remote-error-wrap.aer | 2 +- .../tests/remote/test-remote-fault-injector.aer | 2 +- .../aesop/parser/tests/remote/test-remote-list.aer | 2 +- .../aesop/parser/tests/remote/test-remote-mock.aer | 2 +- .../aesop/parser/tests/remote/test-remote-mpi.aer | 2 +- code/src/common/resources/signal/tests/simple.ae | 2 +- code/src/mapping/tests/hostmap1.ae | 2 +- code/src/net/tests/mpi-one-sided.ae | 2 +- code/src/net/tests/ssm-one-sided.ae | 2 +- code/src/net/tests/ssm-sr-test.ae | 2 +- code/src/placement/tests/hostmap2.ae | 2 +- code/src/placement/tests/hostmap3.ae | 2 +- code/src/remote/tests/test-client-server.aer | 2 +- code/src/socket/tests/echo-server.ae | 2 +- code/src/state/tests/engine1.ae | 2 +- code/src/state/tests/local.ae | 3 +-- code/src/state/tests/post-global.ae | 3 +-- code/src/state/tests/rpc-list.ae | 3 +-- code/src/transactional-osd/tests/tosd-bench-idb.ae | 1 - .../transactional-osd/tests/tosd-multi-object.ae | 1 - code/src/transactional-osd/tests/tosd-niid.ae | 4 +--- 23 files changed, 21 insertions(+), 28 deletions(-) Diff of changes: diff --git a/code/src/aesop/examples/rpc-invoke.ae b/code/src/aesop/examples/rpc-invoke.ae index b05f73c..09b4f25 100644 --- a/code/src/aesop/examples/rpc-invoke.ae +++ b/code/src/aesop/examples/rpc-invoke.ae @@ -92,5 +92,5 @@ __blocking int aesop_main(int argc, char **argv) return 0; } -btest_main_set(aesop_main, "btest", "timer"); +btest_main_set(aesop_main); diff --git a/code/src/aesop/parser/tests/remote/test-remote-buffer-response.aer b/code/src/aesop/parser/tests/remote/test-remote-buffer-response.aer index f844f4a..94f8d97 100644 --- a/code/src/aesop/parser/tests/remote/test-remote-buffer-response.aer +++ b/code/src/aesop/parser/tests/remote/test-remote-buffer-response.aer @@ -98,7 +98,7 @@ __blocking int aesop_main(int argc, char **argv) return 0; } -aesop_main_set_with_init(NULL, "triton.client", aesop_main, "mpi", "sched", "timer"); +aesop_main_set(aesop_main); /* diff --git a/code/src/aesop/parser/tests/remote/test-remote-error-wrap.aer b/code/src/aesop/parser/tests/remote/test-remote-error-wrap.aer index 0ffed4e..f25d40f 100644 --- a/code/src/aesop/parser/tests/remote/test-remote-error-wrap.aer +++ b/code/src/aesop/parser/tests/remote/test-remote-error-wrap.aer @@ -109,7 +109,7 @@ __blocking int aesop_main(int argc, char **argv) return 0; } -aesop_main_set_with_init(NULL, "triton.client", aesop_main); +aesop_main_set(aesop_main); /* diff --git a/code/src/aesop/parser/tests/remote/test-remote-fault-injector.aer b/code/src/aesop/parser/tests/remote/test-remote-fault-injector.aer index de6dd14..f578e3a 100644 --- a/code/src/aesop/parser/tests/remote/test-remote-fault-injector.aer +++ b/code/src/aesop/parser/tests/remote/test-remote-fault-injector.aer @@ -221,7 +221,7 @@ static triton_ret_t init_zeroconf_params(int argc, char** argv) return(TRITON_SUCCESS); } -aesop_main_set_with_init(init_zeroconf_params, "triton.client", aesop_main, "mpi", "sched", "timer"); +aesop_main_set_with_init(init_zeroconf_params, aesop_main); /* diff --git a/code/src/aesop/parser/tests/remote/test-remote-list.aer b/code/src/aesop/parser/tests/remote/test-remote-list.aer index 894e2b4..ef00cb5 100644 --- a/code/src/aesop/parser/tests/remote/test-remote-list.aer +++ b/code/src/aesop/parser/tests/remote/test-remote-list.aer @@ -250,7 +250,7 @@ __blocking int aesop_main(int argc, char **argv) return 0; } -aesop_main_set_with_init(NULL, "triton.client", aesop_main); +aesop_main_set(aesop_main); /* diff --git a/code/src/aesop/parser/tests/remote/test-remote-mock.aer b/code/src/aesop/parser/tests/remote/test-remote-mock.aer index 9faa811..163ef17 100644 --- a/code/src/aesop/parser/tests/remote/test-remote-mock.aer +++ b/code/src/aesop/parser/tests/remote/test-remote-mock.aer @@ -207,7 +207,7 @@ __blocking int aesop_main(int argc, char **argv) return 0; } -aesop_main_set_with_init(NULL, "triton.client", aesop_main, "sched", "timer"); +aesop_main_set(aesop_main); /* * Local variables: diff --git a/code/src/aesop/parser/tests/remote/test-remote-mpi.aer b/code/src/aesop/parser/tests/remote/test-remote-mpi.aer index 9b860b5..4927169 100644 --- a/code/src/aesop/parser/tests/remote/test-remote-mpi.aer +++ b/code/src/aesop/parser/tests/remote/test-remote-mpi.aer @@ -171,7 +171,7 @@ __blocking int aesop_main(int argc, char **argv) return 0; } -aesop_main_set_with_init(NULL, "triton.client", aesop_main, "mpi", "sched", "timer"); +aesop_main_set(aesop_main); /* diff --git a/code/src/common/resources/signal/tests/simple.ae b/code/src/common/resources/signal/tests/simple.ae index 28242de..6f940a6 100644 --- a/code/src/common/resources/signal/tests/simple.ae +++ b/code/src/common/resources/signal/tests/simple.ae @@ -93,6 +93,6 @@ __blocking int aesop_main(int argc, char **argv) return ret; } -aesop_main_set_with_init (NULL, "triton.core", aesop_main); +aesop_main_set(aesop_main); diff --git a/code/src/mapping/tests/hostmap1.ae b/code/src/mapping/tests/hostmap1.ae index 1e5d88d..286c0ca 100644 --- a/code/src/mapping/tests/hostmap1.ae +++ b/code/src/mapping/tests/hostmap1.ae @@ -77,7 +77,7 @@ __blocking int aesop_main(int argc, char **argv) return 0; } -aesop_main_set_with_init(NULL, "triton.net.mpi", aesop_main); +aesop_main_set(aesop_main); /* * Local variables: diff --git a/code/src/net/tests/mpi-one-sided.ae b/code/src/net/tests/mpi-one-sided.ae index 1469e0e..55df79a 100644 --- a/code/src/net/tests/mpi-one-sided.ae +++ b/code/src/net/tests/mpi-one-sided.ae @@ -1021,4 +1021,4 @@ __blocking int entry_point(int argc, char** argv) return 0; } -aesop_main_set_with_init(NULL, "triton.client", entry_point); +aesop_main_set(entry_point); diff --git a/code/src/net/tests/ssm-one-sided.ae b/code/src/net/tests/ssm-one-sided.ae index 181afa4..635b1f9 100644 --- a/code/src/net/tests/ssm-one-sided.ae +++ b/code/src/net/tests/ssm-one-sided.ae @@ -1158,4 +1158,4 @@ __blocking int entry_point(int argc, char** argv) return 0; } -aesop_main_set_with_init(NULL, "triton.client", entry_point); +aesop_main_set(entry_point); diff --git a/code/src/net/tests/ssm-sr-test.ae b/code/src/net/tests/ssm-sr-test.ae index 31619f3..05fb450 100644 --- a/code/src/net/tests/ssm-sr-test.ae +++ b/code/src/net/tests/ssm-sr-test.ae @@ -244,4 +244,4 @@ __blocking int entry_point(int argc, char** argv) return 0; } -aesop_main_set_with_init(NULL, "triton.client", entry_point); +aesop_main_set(entry_point); diff --git a/code/src/placement/tests/hostmap2.ae b/code/src/placement/tests/hostmap2.ae index 2674469..f45ae20 100644 --- a/code/src/placement/tests/hostmap2.ae +++ b/code/src/placement/tests/hostmap2.ae @@ -99,7 +99,7 @@ __blocking int aesop_main(int argc, char **argv) return 0; } -aesop_main_set_with_init(NULL, "triton.client", aesop_main); +aesop_main_set(aesop_main); /* * Local variables: diff --git a/code/src/placement/tests/hostmap3.ae b/code/src/placement/tests/hostmap3.ae index 6d65f6a..d604fd8 100644 --- a/code/src/placement/tests/hostmap3.ae +++ b/code/src/placement/tests/hostmap3.ae @@ -113,7 +113,7 @@ __blocking int aesop_main(int argc, char **argv) return 0; } -aesop_main_set_with_init(NULL, "triton.client", aesop_main); +aesop_main_set(aesop_main); /* * Local variables: diff --git a/code/src/remote/tests/test-client-server.aer b/code/src/remote/tests/test-client-server.aer index 84c16ce..d4d7aaf 100644 --- a/code/src/remote/tests/test-client-server.aer +++ b/code/src/remote/tests/test-client-server.aer @@ -94,5 +94,5 @@ static __blocking int mymain(int argc, char **argv) return 0; } -aesop_main_set(mymain, "mpi", "sched", "timer"); +aesop_main_set(mymain); diff --git a/code/src/socket/tests/echo-server.ae b/code/src/socket/tests/echo-server.ae index 64eb80b..bc7fd48 100644 --- a/code/src/socket/tests/echo-server.ae +++ b/code/src/socket/tests/echo-server.ae @@ -224,7 +224,7 @@ static __blocking int dotest(int argc, char** argv) return 0; } -aesop_main_set_with_init(NULL, "triton.echo-server", dotest, "timer", "aesocket", "file"); +aesop_main_set(dotest); /* * Local variables: diff --git a/code/src/state/tests/engine1.ae b/code/src/state/tests/engine1.ae index 35dea3b..a1bb1ce 100644 --- a/code/src/state/tests/engine1.ae +++ b/code/src/state/tests/engine1.ae @@ -139,7 +139,7 @@ __blocking int aesop_main(int argc, char **argv) return 0; } -aesop_main_set_with_init(NULL, "triton.keyval", aesop_main, "mpi", "timer", "sched"); +aesop_main_set(aesop_main); /* * Local Variables: diff --git a/code/src/state/tests/local.ae b/code/src/state/tests/local.ae index db98c05..945fc71 100644 --- a/code/src/state/tests/local.ae +++ b/code/src/state/tests/local.ae @@ -77,8 +77,7 @@ __blocking int aesop_main(int argc, char **argv) printf("done\n"); return 0; } -aesop_main_set_with_init(NULL, "triton.state", aesop_main, - "sched", "timer"); +aesop_main_set(aesop_main); /* * Local variables: diff --git a/code/src/state/tests/post-global.ae b/code/src/state/tests/post-global.ae index 0cbad66..614065e 100644 --- a/code/src/state/tests/post-global.ae +++ b/code/src/state/tests/post-global.ae @@ -157,8 +157,7 @@ __blocking int aesop_main(int argc, char **argv) return 0; } -aesop_main_set_with_init(NULL, "triton.client", aesop_main, - "sched", "timer", "mpi"); +aesop_main_set_with_init(aesop_main); /* * Local Variables: diff --git a/code/src/state/tests/rpc-list.ae b/code/src/state/tests/rpc-list.ae index 903bd3f..1dce6fb 100644 --- a/code/src/state/tests/rpc-list.ae +++ b/code/src/state/tests/rpc-list.ae @@ -211,8 +211,7 @@ __blocking int aesop_main(int argc, char **argv) return(0); } -aesop_main_set_with_init(NULL, "triton.client", aesop_main, - "sched", "timer", "mpi"); +aesop_main_set(aesop_main); /* * Local Variables: diff --git a/code/src/transactional-osd/tests/tosd-bench-idb.ae b/code/src/transactional-osd/tests/tosd-bench-idb.ae index c864b4a..6419885 100644 --- a/code/src/transactional-osd/tests/tosd-bench-idb.ae +++ b/code/src/transactional-osd/tests/tosd-bench-idb.ae @@ -281,7 +281,6 @@ static triton_ret_t init_tosd_zeroconf_params(int argc, char** argv) } aesop_main_set_with_init(init_tosd_zeroconf_params, - "triton.tosd", aesop_main); /* diff --git a/code/src/transactional-osd/tests/tosd-multi-object.ae b/code/src/transactional-osd/tests/tosd-multi-object.ae index 7f5e0cc..fd5be79 100644 --- a/code/src/transactional-osd/tests/tosd-multi-object.ae +++ b/code/src/transactional-osd/tests/tosd-multi-object.ae @@ -132,7 +132,6 @@ static triton_ret_t init_tosd_zeroconf_params(int argc, char** argv) * "bdb", "file","sched"); */ aesop_main_set_with_init(init_tosd_zeroconf_params, - "triton.tosd", do_tosd_test); /* diff --git a/code/src/transactional-osd/tests/tosd-niid.ae b/code/src/transactional-osd/tests/tosd-niid.ae index a799aed..7d86f6e 100644 --- a/code/src/transactional-osd/tests/tosd-niid.ae +++ b/code/src/transactional-osd/tests/tosd-niid.ae @@ -138,9 +138,7 @@ static triton_ret_t init_tosd_zeroconf_params(int argc, char** argv) } aesop_main_set_with_init(init_tosd_zeroconf_params, - "triton.tosd", - do_tosd_test, - "bdb", "file", "sched"); + do_tosd_test); /* * Local variables: hooks/post-receive --

1 0

branch, master, updated. 2efc5597848ee1f6443470c91d194dc500322d04
by noreply＠mcs.anl.gov 03 Dec '12

03 Dec '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 "". The branch, master has been updated via 2efc5597848ee1f6443470c91d194dc500322d04 (commit) from fb44fa4c01197c2ef2b952e55f5c1615c098bf46 (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 2efc5597848ee1f6443470c91d194dc500322d04 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Mon Dec 3 16:39:09 2012 -0500 added RobR note to outline ----------------------------------------------------------------------- Summary of changes: papers/sim-placement/notes.txt | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) Diff of changes: diff --git a/papers/sim-placement/notes.txt b/papers/sim-placement/notes.txt index 9fd482a..f1e8451 100644 --- a/papers/sim-placement/notes.txt +++ b/papers/sim-placement/notes.txt @@ -57,6 +57,8 @@ proposal 1): study of object placement strategies - application performance - recovery time - rebuild time + NOTE: talk about recovery/rebuild first, then talk about application + performance for some mapping of application model to the storage model - vary two things: - placement algorithm / distance metric (some sampling of 1d, 3d, hash, etc.) - object id selection mechanism (random, or chosen to avoid master hooks/post-receive --

1 0

branch, ticket-227, updated. ca6afeac0f0f09e95f91b498fc8c3027bbdca4b6
by noreply＠mcs.anl.gov 03 Dec '12

03 Dec '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 "". The branch, ticket-227 has been updated via ca6afeac0f0f09e95f91b498fc8c3027bbdca4b6 (commit) from f69c3ea83c2b61787ad1da1bb2110244d9c0217c (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 ca6afeac0f0f09e95f91b498fc8c3027bbdca4b6 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Mon Dec 3 13:49:26 2012 -0500 remove aesop_cancel_branches_wait() macro ----------------------------------------------------------------------- Summary of changes: code/src/aesop/aesop-support.hae | 22 -------------------- code/src/aesop/module.mk.in | 2 - .../aesop/parser/tests/blocking/parallelfor4.ae | 3 +- .../resources/scheduling/tests/sched-cancel.ae | 3 +- code/src/common/resources/signal/tests/simple.ae | 7 ++--- .../block-read-modify-write/block-rmw-client.ae | 1 - .../block-read-modify-write/block-rmw-server.ae | 3 +- .../examples/parallel-histogram/phist-client.ae | 3 +- .../examples/parallel-histogram/phist-server.ae | 3 +- code/src/fakess/fakess.ae | 1 - code/src/kv/kv-intern.ae | 5 +-- code/src/net/tests/mpi-one-sided.ae | 1 - code/src/net/tests/ssm-one-sided.ae | 1 - code/src/net/tests/ssm-sr-test.ae | 1 - code/src/rebuild/rebuild.ae | 5 +-- code/src/rebuild/tests/recover-objects.ae | 3 +- code/src/remote/core-client.ae | 17 +++++++-------- code/src/remote/retry-method.ae | 9 +++---- code/src/remote/service.ae | 9 +++---- code/src/replicated-osd/rosd-client.ae | 22 +++++++++---------- code/src/replicated-osd/rosd-test-harness.ae | 4 +-- code/src/replicated-osd/rosd.aer | 13 +++++------ code/src/replicated-osd/tests/rosd-conditional.ae | 3 +- .../src/replicated-osd/tests/rosd-read-failover.ae | 3 +- .../replicated-osd/tests/rosd-traffic-cop-stall.ae | 3 +- code/src/state/sc.aer | 1 - code/src/state/status.ae | 1 - code/src/state/tests/engine1.ae | 3 +- code/src/state/tests/post-global.ae | 5 +-- code/src/state/tests/rosd-recover.ae | 3 +- code/src/state/tests/rpc-list.ae | 3 +- code/src/state/tests/state-client-test.ae | 3 +- 32 files changed, 55 insertions(+), 111 deletions(-) delete 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 deleted file mode 100644 index 83a69f3..0000000 --- a/code/src/aesop/aesop-support.hae +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef __AESOP_SUPPORT_HAE__ -#define __AESOP_SUPPORT_HAE__ - -#error TRITON AESOP_SUPPORT - -#include "src/aesop/aesop.h" -#include "src/aesop/resource.h" -#include "src/common/resources/timer/timer.hae" - -#define aesop_cancel_branches_wait() \ - { \ - triton_ret_t __ae_cancel_branches_wait_ret; \ - do { \ - aesop_cancel_branches(); \ - if (aesop_count_branches() < 2) { \ - break; \ - } \ - __ae_cancel_branches_wait_ret = aesop_timer(2); \ - } while (__ae_cancel_branches_wait_ret == TRITON_SUCCESS); \ - } - -#endif diff --git a/code/src/aesop/module.mk.in b/code/src/aesop/module.mk.in index 0df19ec..79a99ae 100644 --- a/code/src/aesop/module.mk.in +++ b/code/src/aesop/module.mk.in @@ -1,7 +1,5 @@ DIR := src/aesop -# AESOP_HDR += $(DIR)/aesop-support.hae - # AESOP_SRC := $(DIR)/opcache.c \ $(DIR)/aesop.c \ $(DIR)/resource.c \ diff --git a/code/src/aesop/parser/tests/blocking/parallelfor4.ae b/code/src/aesop/parser/tests/blocking/parallelfor4.ae index d1eeffd..533235e 100644 --- a/code/src/aesop/parser/tests/blocking/parallelfor4.ae +++ b/code/src/aesop/parser/tests/blocking/parallelfor4.ae @@ -8,7 +8,6 @@ #include "src/aesop/parser/tests/blocking/btest.hae" #include <aesop/triton-list.h> #include "src/common/resources/scheduling/sched.hae" -#include <aesop/aesop-support.hae> struct e { @@ -69,7 +68,7 @@ static __blocking void run_parfor( { printf("Running last pbranch.\n"); btest_sleep(1); - aesop_cancel_branches_wait(); + aesop_cancel_branches(); } } diff --git a/code/src/common/resources/scheduling/tests/sched-cancel.ae b/code/src/common/resources/scheduling/tests/sched-cancel.ae index d5721c9..6855a89 100644 --- a/code/src/common/resources/scheduling/tests/sched-cancel.ae +++ b/code/src/common/resources/scheduling/tests/sched-cancel.ae @@ -1,7 +1,6 @@ #include "src/common/resources/scheduling/sched.hae" #include <aesop/timer.hae> -#include <aesop/aesop-support.hae> struct limit_obj { @@ -33,7 +32,7 @@ static __blocking int dostuff(void) { aesop_timer(1000); printf("about to cancel...\n"); - aesop_cancel_branches_wait(); + aesop_cancel_branches(); } } diff --git a/code/src/common/resources/signal/tests/simple.ae b/code/src/common/resources/signal/tests/simple.ae index 11dad7f..28242de 100644 --- a/code/src/common/resources/signal/tests/simple.ae +++ b/code/src/common/resources/signal/tests/simple.ae @@ -1,7 +1,6 @@ #include <aesop/aesop.h> #include <aesop/timer.hae> #include "src/common/resources/signal/signal.hae" -#include <aesop/aesop-support.hae> #include <signal.h> #include <sys/types.h> @@ -20,7 +19,7 @@ __blocking int signalself () printf ("Waiting for SIGINT...\n"); triton_signal_wait (SIGINT); printf ("Received SIGINT\n"); - //aesop_cancel_branches_wait(); + //aesop_cancel_branches(); } pbranch @@ -62,7 +61,7 @@ __blocking int test_cancel () printf ("Signal wait cancelled :-)\n"); ret = 1; } - //aesop_cancel_branches_wait(); + //aesop_cancel_branches(); } pbranch @@ -71,7 +70,7 @@ __blocking int test_cancel () aesop_timer (500); printf ("Cancelling triton_signal_wait()...\n"); - //aesop_cancel_branches_wait (); + //aesop_cancel_branches (); } } return ret; diff --git a/code/src/examples/block-read-modify-write/block-rmw-client.ae b/code/src/examples/block-read-modify-write/block-rmw-client.ae index bd3d777..0469aed 100644 --- a/code/src/examples/block-read-modify-write/block-rmw-client.ae +++ b/code/src/examples/block-read-modify-write/block-rmw-client.ae @@ -11,7 +11,6 @@ #include <zkr_mutex.h> #include <aesop/aesop.h> -#include <aesop/aesop-support.hae> #include <aesop/aethread.hae> #include <aesop/timer.hae> diff --git a/code/src/examples/block-read-modify-write/block-rmw-server.ae b/code/src/examples/block-read-modify-write/block-rmw-server.ae index 1a90c98..92daf66 100644 --- a/code/src/examples/block-read-modify-write/block-rmw-server.ae +++ b/code/src/examples/block-read-modify-write/block-rmw-server.ae @@ -6,7 +6,6 @@ #include <unistd.h> #include <aesop/aesop.h> -#include <aesop/aesop-support.hae> #include "src/common/triton-error.h" #include "src/remote/service.hae" #include "src/remote/message.hae" @@ -103,7 +102,7 @@ __blocking triton_ret_t server_main (int nservers, pbranch { aer_service_engine_start(AER_DEFAULT_CTX); - aesop_cancel_branches_wait(); + aesop_cancel_branches(); } pbranch { diff --git a/code/src/examples/parallel-histogram/phist-client.ae b/code/src/examples/parallel-histogram/phist-client.ae index eab5489..cccca70 100644 --- a/code/src/examples/parallel-histogram/phist-client.ae +++ b/code/src/examples/parallel-histogram/phist-client.ae @@ -11,7 +11,6 @@ #include <zoo_lock.h> #include <aesop/aesop.h> -#include <aesop/aesop-support.hae> #include <aesop/aethread.hae> #include <aesop/timer.hae> @@ -308,7 +307,7 @@ __blocking triton_ret_t client_main (int nservers, workload(params, client_rank, nclients, nservers, &samples, value_count, value, zkmutex, &rates, &times, nodes, &timing1, &timing2); - aesop_cancel_branches_wait(); + aesop_cancel_branches(); } } diff --git a/code/src/examples/parallel-histogram/phist-server.ae b/code/src/examples/parallel-histogram/phist-server.ae index 0980e8a..7506825 100644 --- a/code/src/examples/parallel-histogram/phist-server.ae +++ b/code/src/examples/parallel-histogram/phist-server.ae @@ -6,7 +6,6 @@ #include <unistd.h> #include <aesop/aesop.h> -#include <aesop/aesop-support.hae> #include "src/common/triton-error.h" #include "src/remote/service.hae" #include "src/remote/message.hae" @@ -119,7 +118,7 @@ __blocking triton_ret_t server_main (int nservers, pbranch { aer_service_engine_start(AER_DEFAULT_CTX); - aesop_cancel_branches_wait(); + aesop_cancel_branches(); } pbranch { diff --git a/code/src/fakess/fakess.ae b/code/src/fakess/fakess.ae index 11e76e7..5e40df0 100644 --- a/code/src/fakess/fakess.ae +++ b/code/src/fakess/fakess.ae @@ -8,7 +8,6 @@ #include <aesop/triton-hash.h> #include <aesop/timer.hae> -#include <aesop/aesop-support.hae> #include "src/common/triton-init.h" #include "src/common/triton-log.h" diff --git a/code/src/kv/kv-intern.ae b/code/src/kv/kv-intern.ae index a174732..0034528 100644 --- a/code/src/kv/kv-intern.ae +++ b/code/src/kv/kv-intern.ae @@ -20,7 +20,6 @@ #include "src/replicated-osd/rosd_module.h" #include "src/remote/core_module.h" #include "src/remote/core-client.hae" -#include <aesop/aesop-support.hae> #include "src/common/triton-bootstrap.hae" __blocking triton_ret_t triton_kv_init_internal(const char * mapfile, int is_server) @@ -180,7 +179,7 @@ __blocking triton_ret_t triton_kv_server_stop_internal(void) ret = client_triton_core_server_shutdown(mapping->addr); if(ret != TRITON_SUCCESS) { - aesop_cancel_branches_wait(); + aesop_cancel_branches(); } } } @@ -235,7 +234,7 @@ __blocking triton_ret_t triton_kv_server_start_internal(void) /* run service engine to process requests */ aer_service_engine_start(AER_DEFAULT_CTX); /* once service engine stops we should stop state component as well */ - aesop_cancel_branches_wait(); + aesop_cancel_branches(); } pbranch { diff --git a/code/src/net/tests/mpi-one-sided.ae b/code/src/net/tests/mpi-one-sided.ae index e2fc9d9..1469e0e 100644 --- a/code/src/net/tests/mpi-one-sided.ae +++ b/code/src/net/tests/mpi-one-sided.ae @@ -10,7 +10,6 @@ #include <stdarg.h> #include <ctype.h> #include <unistd.h> -#include <aesop/aesop-support.hae> #define MIN(a,b) ((a)<=(b)?(a):(b)) diff --git a/code/src/net/tests/ssm-one-sided.ae b/code/src/net/tests/ssm-one-sided.ae index 4a6b35b..181afa4 100644 --- a/code/src/net/tests/ssm-one-sided.ae +++ b/code/src/net/tests/ssm-one-sided.ae @@ -11,7 +11,6 @@ #include <stdarg.h> #include <ctype.h> #include <unistd.h> -#include <aesop/aesop-support.hae> #include <stdlib.h> diff --git a/code/src/net/tests/ssm-sr-test.ae b/code/src/net/tests/ssm-sr-test.ae index 6a5d6cc..31619f3 100644 --- a/code/src/net/tests/ssm-sr-test.ae +++ b/code/src/net/tests/ssm-sr-test.ae @@ -11,7 +11,6 @@ #include <stdarg.h> #include <ctype.h> #include <unistd.h> -#include <aesop/aesop-support.hae> #include <stdlib.h> diff --git a/code/src/rebuild/rebuild.ae b/code/src/rebuild/rebuild.ae index f15a7fb..96058e4 100644 --- a/code/src/rebuild/rebuild.ae +++ b/code/src/rebuild/rebuild.ae @@ -13,7 +13,6 @@ #include "src/transactional-osd/transactional-osd.hae" #include "src/rebuild/rb_stubs.hae" #include "src/common/traffic-cop.hae" -#include <aesop/aesop-support.hae> #include "src/common/triton-debug.h" #include "src/zeroconf/zeroconf.h" @@ -624,13 +623,13 @@ __blocking triton_ret_t client_triton_rebuild_get_oids( triton_addr_to_string(addr, &addr_str); triton_warn(triton_log_default, "remote_triton_rebuild_get_oids() timeout to node %s\n", triton_string_get(&addr_str)); triton_string_destroy(&addr_str); - aesop_cancel_branches_wait(); + aesop_cancel_branches(); } } pbranch { tret = remote_triton_rebuild_get_oids(AER_DEFAULT_CTX, addr, &req, list); - aesop_cancel_branches_wait(); + aesop_cancel_branches(); } } retry = traffic_cop_rpc_control_no_obj(&niid, addr, &tret); diff --git a/code/src/rebuild/tests/recover-objects.ae b/code/src/rebuild/tests/recover-objects.ae index 76d3233..42cea1f 100644 --- a/code/src/rebuild/tests/recover-objects.ae +++ b/code/src/rebuild/tests/recover-objects.ae @@ -19,7 +19,6 @@ #include "src/replicated-osd/rosd_module.h" #include "src/remote/core_module.h" #include "src/remote/core-client.hae" -#include <aesop/aesop-support.hae> #include "src/state/sc_stubs.hae" #include "src/state/sc_module.h" #include "src/rebuild/rb_module.h" @@ -326,7 +325,7 @@ static __blocking triton_ret_t rosd_server_fn(int nservers, int nclients, void* { /* run service engine to process requests */ aer_service_engine_start(AER_DEFAULT_CTX); - aesop_cancel_branches_wait(); + aesop_cancel_branches(); } pbranch { diff --git a/code/src/remote/core-client.ae b/code/src/remote/core-client.ae index 84d11c3..378b242 100644 --- a/code/src/remote/core-client.ae +++ b/code/src/remote/core-client.ae @@ -1,6 +1,5 @@ #include "src/remote/core-client.hae" #include "src/common/traffic-cop.hae" -#include <aesop/aesop-support.hae> __blocking triton_ret_t client_triton_core_server_shutdown(triton_addr_t addr) { @@ -18,12 +17,12 @@ __blocking triton_ret_t client_triton_core_server_shutdown(triton_addr_t addr) triton_ret_t timer_ret; timer_ret = traffic_cop_rpc_timer(niid); if(timer_ret == TRITON_SUCCESS) - aesop_cancel_branches_wait(); + aesop_cancel_branches(); } pbranch { tret = remote_triton_core_server_shutdown(AER_DEFAULT_CTX, addr, NULL, NULL); - aesop_cancel_branches_wait(); + aesop_cancel_branches(); } } retry = traffic_cop_rpc_control_no_obj(&niid, addr, &tret); @@ -49,12 +48,12 @@ __blocking triton_ret_t client_triton_core_noop_by_oid(uint128_t oid) triton_ret_t timer_ret; timer_ret = traffic_cop_rpc_timer(niid); if(timer_ret == TRITON_SUCCESS) - aesop_cancel_branches_wait(); + aesop_cancel_branches(); } pbranch { tret = remote_triton_core_noop(AER_DEFAULT_CTX, addr, NULL, NULL); - aesop_cancel_branches_wait(); + aesop_cancel_branches(); } } retry = traffic_cop_rpc_control(&niid, oid, &addr, &tret); @@ -80,12 +79,12 @@ __blocking triton_ret_t client_triton_core_noop(triton_addr_t addr) triton_ret_t timer_ret; timer_ret = traffic_cop_rpc_timer(niid); if(timer_ret == TRITON_SUCCESS) - aesop_cancel_branches_wait(); + aesop_cancel_branches(); } pbranch { tret = remote_triton_core_noop(AER_DEFAULT_CTX, addr, NULL, NULL); - aesop_cancel_branches_wait(); + aesop_cancel_branches(); } } retry = traffic_cop_rpc_control_no_obj(&niid, addr, &tret); @@ -118,12 +117,12 @@ __blocking triton_ret_t client_triton_inject_send_failures(triton_addr_t addr, triton_ret_t timer_ret; timer_ret = traffic_cop_rpc_timer(niid); if(timer_ret == TRITON_SUCCESS) - aesop_cancel_branches_wait(); + aesop_cancel_branches(); } pbranch { tret = remote_triton_inject_send_failures(AER_DEFAULT_CTX, addr, &req, NULL); - aesop_cancel_branches_wait(); + aesop_cancel_branches(); } } retry = traffic_cop_rpc_control_no_obj(&niid, addr, &tret); diff --git a/code/src/remote/retry-method.ae b/code/src/remote/retry-method.ae index ac0b945..35678a2 100644 --- a/code/src/remote/retry-method.ae +++ b/code/src/remote/retry-method.ae @@ -8,7 +8,6 @@ #include "src/common/traffic-cop.hae" #include <aesop/hints.h> #include "src/zeroconf/zeroconf.h" -#include <aesop/aesop-support.hae> /** * This file implements the default remote context, which uses @@ -273,7 +272,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_wait(); + aesop_cancel_branches(); } } pbranch @@ -283,7 +282,7 @@ static __blocking triton_ret_t retry_send_response( if(ret != TRITON_ERR_CANCELED) { /* cancel the traffic cop */ - aesop_cancel_branches_wait(); + aesop_cancel_branches(); } } @@ -518,7 +517,7 @@ static __blocking triton_ret_t retry_sendrecv( &recv->buffer.size); if(recv_ret != TRITON_SUCCESS) { - aesop_cancel_branches_wait(); + aesop_cancel_branches(); } } @@ -527,7 +526,7 @@ static __blocking triton_ret_t retry_sendrecv( send_ret = remote_send_encoded_buffer(dest, rctx->unexp_group, tag, &send->buffer); if(send_ret != TRITON_SUCCESS) { - aesop_cancel_branches_wait(); + aesop_cancel_branches(); } } diff --git a/code/src/remote/service.ae b/code/src/remote/service.ae index 4959ba4..eb730f1 100644 --- a/code/src/remote/service.ae +++ b/code/src/remote/service.ae @@ -10,7 +10,6 @@ #include <aesop/hints.h> #include "src/common/resources/scheduling/sched.hae" #include <aesop/timer.hae> -#include <aesop/aesop-support.hae> triton_debug_mask_t remote_service_dbg_mask; @@ -416,7 +415,7 @@ __blocking void aer_service_engine_start(aer_remote_ctx_t rctx) } /* no more ops in progress! cancel waiting receives! */ - aesop_cancel_branches_wait(); + aesop_cancel_branches(); } } @@ -480,7 +479,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_wait(); + aesop_cancel_branches(); pbreak; } @@ -489,7 +488,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_wait(); + aesop_cancel_branches(); pbreak; } @@ -497,7 +496,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_wait(); + aesop_cancel_branches(); pbreak; } diff --git a/code/src/replicated-osd/rosd-client.ae b/code/src/replicated-osd/rosd-client.ae index b108b74..0eadbd5 100644 --- a/code/src/replicated-osd/rosd-client.ae +++ b/code/src/replicated-osd/rosd-client.ae @@ -1,6 +1,4 @@ -#include <aesop/aesop-support.hae> - #include "src/common/traffic-cop.hae" #include "src/replicated-osd/rosd-client.hae" #include "src/state/state.hae" @@ -38,13 +36,13 @@ __blocking triton_ret_t client_rosd_read( if(timer_ret == TRITON_SUCCESS) { triton_warn(triton_log_default, "remote_rosd_read() RPC timeout.\n"); - aesop_cancel_branches_wait(); + aesop_cancel_branches(); } } pbranch { tret = remote_rosd_read(AER_DEFAULT_CTX, addr, &req, resp); - aesop_cancel_branches_wait(); + aesop_cancel_branches(); } } retry = traffic_cop_rpc_control(&niid, oid, &addr, &tret); @@ -84,13 +82,13 @@ __blocking triton_ret_t client_rosd_write( if(timer_ret == TRITON_SUCCESS) { triton_warn(triton_log_default, "remote_rosd_write() RPC timeout.\n"); - aesop_cancel_branches_wait(); + aesop_cancel_branches(); } } pbranch { tret = remote_rosd_write(AER_DEFAULT_CTX, addr, &req, NULL); - aesop_cancel_branches_wait(); + aesop_cancel_branches(); } } retry = traffic_cop_rpc_control(&niid, oid, &addr, &tret); @@ -128,13 +126,13 @@ __blocking triton_ret_t client_rosd_create( if(timer_ret == TRITON_SUCCESS) { triton_warn(triton_log_default, "remote_rosd_create() RPC timeout.\n"); - aesop_cancel_branches_wait(); + aesop_cancel_branches(); } } pbranch { tret = remote_rosd_create(AER_DEFAULT_CTX, addr, &req, NULL); - aesop_cancel_branches_wait(); + aesop_cancel_branches(); } } retry = traffic_cop_rpc_control(&req.niid, oid, &addr, &tret); @@ -170,13 +168,13 @@ __blocking triton_ret_t client_rosd_remove( if(timer_ret == TRITON_SUCCESS) { triton_warn(triton_log_default, "remote_rosd_remove() RPC timeout.\n"); - aesop_cancel_branches_wait(); + aesop_cancel_branches(); } } pbranch { tret = remote_rosd_remove(AER_DEFAULT_CTX, addr, &req, NULL); - aesop_cancel_branches_wait(); + aesop_cancel_branches(); } } @@ -307,13 +305,13 @@ __blocking triton_ret_t client_rosd_range( if(timer_ret == TRITON_SUCCESS) { triton_warn(triton_log_default, "remote_rosd_range() RPC timeout.\n"); - aesop_cancel_branches_wait(); + aesop_cancel_branches(); } } pbranch { tret = remote_rosd_range(AER_DEFAULT_CTX, addr, &req, resp); - aesop_cancel_branches_wait(); + aesop_cancel_branches(); } } retry = traffic_cop_rpc_control_no_obj(&niid, addr, &tret); diff --git a/code/src/replicated-osd/rosd-test-harness.ae b/code/src/replicated-osd/rosd-test-harness.ae index bdbfd48..53b0a9d 100644 --- a/code/src/replicated-osd/rosd-test-harness.ae +++ b/code/src/replicated-osd/rosd-test-harness.ae @@ -6,8 +6,6 @@ #include <limits.h> #include <unistd.h> -#include <aesop/aesop-support.hae> - #include "src/common/triton-init.h" #include "src/replicated-osd/rosd-test-harness.hae" #include "src/mapping/mapping.hae" @@ -507,7 +505,7 @@ __blocking triton_ret_t rosd_test_harness_server_fn(int nservers, int nclients, /* run service engine to process requests */ assert(AER_DEFAULT_CTX); aer_service_engine_start(AER_DEFAULT_CTX); - aesop_cancel_branches_wait(); + aesop_cancel_branches(); } pbranch { diff --git a/code/src/replicated-osd/rosd.aer b/code/src/replicated-osd/rosd.aer index f13d66a..b40c26b 100644 --- a/code/src/replicated-osd/rosd.aer +++ b/code/src/replicated-osd/rosd.aer @@ -27,7 +27,6 @@ #include <aesop/timer.hae> #include "src/zeroconf/zeroconf.h" #include <aesop/hints.h> -#include <aesop/aesop-support.hae> #include "src/common/triton-debug.h" #include "src/mapping/mapping.hae" #include "src/placement/placement.hae" @@ -1408,12 +1407,12 @@ static __blocking triton_ret_t client_rosd_s2s_create( triton_ret_t timer_ret; timer_ret = traffic_cop_rpc_timer(niid); if(timer_ret == TRITON_SUCCESS) - aesop_cancel_branches_wait(); + aesop_cancel_branches(); } pbranch { tret = remote_rosd_s2s_create(AER_DEFAULT_CTX, addr, &req, NULL); - aesop_cancel_branches_wait(); + aesop_cancel_branches(); } } retry = traffic_cop_rpc_control_s2s(&internal_niid, oid, @@ -1467,12 +1466,12 @@ static __blocking triton_ret_t client_rosd_s2s_write( triton_ret_t timer_ret; timer_ret = traffic_cop_rpc_timer(niid); if(timer_ret == TRITON_SUCCESS) - aesop_cancel_branches_wait(); + aesop_cancel_branches(); } pbranch { tret = remote_rosd_s2s_write(AER_DEFAULT_CTX, addr, &req, NULL); - aesop_cancel_branches_wait(); + aesop_cancel_branches(); } } retry = traffic_cop_rpc_control_s2s(&internal_niid, oid, replication_factor, @@ -1521,12 +1520,12 @@ static __blocking triton_ret_t client_rosd_s2s_remove( triton_ret_t timer_ret; timer_ret = traffic_cop_rpc_timer(niid); if(timer_ret == TRITON_SUCCESS) - aesop_cancel_branches_wait(); + aesop_cancel_branches(); } pbranch { tret = remote_rosd_s2s_remove(AER_DEFAULT_CTX, addr, &req, NULL); - aesop_cancel_branches_wait(); + aesop_cancel_branches(); } } retry = traffic_cop_rpc_control_s2s(&internal_niid, oid, replication_factor, diff --git a/code/src/replicated-osd/tests/rosd-conditional.ae b/code/src/replicated-osd/tests/rosd-conditional.ae index 8b68149..13cfe20 100644 --- a/code/src/replicated-osd/tests/rosd-conditional.ae +++ b/code/src/replicated-osd/tests/rosd-conditional.ae @@ -20,7 +20,6 @@ #include "src/replicated-osd/rosd_module.h" #include "src/remote/core_module.h" #include "src/remote/core-client.hae" -#include <aesop/aesop-support.hae> #include "src/state/sc_stubs.hae" #include "src/state/sc_module.h" #include "src/state/state.hae" @@ -306,7 +305,7 @@ static __blocking triton_ret_t rosd_server_fn(int nservers, int nclients, void* { /* run service engine to process requests */ aer_service_engine_start(AER_DEFAULT_CTX); - aesop_cancel_branches_wait(); + aesop_cancel_branches(); } pbranch { diff --git a/code/src/replicated-osd/tests/rosd-read-failover.ae b/code/src/replicated-osd/tests/rosd-read-failover.ae index cad01be..927f48e 100644 --- a/code/src/replicated-osd/tests/rosd-read-failover.ae +++ b/code/src/replicated-osd/tests/rosd-read-failover.ae @@ -19,7 +19,6 @@ #include "src/replicated-osd/rosd_module.h" #include "src/remote/core_module.h" #include "src/remote/core-client.hae" -#include <aesop/aesop-support.hae> #include "src/state/sc_stubs.hae" #include "src/state/sc_module.h" #include "src/state/state.hae" @@ -423,7 +422,7 @@ static __blocking triton_ret_t rosd_server_fn(int nservers, int nclients, void* { /* run service engine to process requests */ aer_service_engine_start(AER_DEFAULT_CTX); - aesop_cancel_branches_wait(); + aesop_cancel_branches(); } pbranch { diff --git a/code/src/replicated-osd/tests/rosd-traffic-cop-stall.ae b/code/src/replicated-osd/tests/rosd-traffic-cop-stall.ae index e78d7f0..72b7fe0 100644 --- a/code/src/replicated-osd/tests/rosd-traffic-cop-stall.ae +++ b/code/src/replicated-osd/tests/rosd-traffic-cop-stall.ae @@ -19,7 +19,6 @@ #include "src/replicated-osd/rosd_module.h" #include "src/remote/core_module.h" #include "src/remote/core-client.hae" -#include <aesop/aesop-support.hae> #include "src/state/sc_stubs.hae" #include "src/state/sc_module.h" #include "src/state/state.hae" @@ -300,7 +299,7 @@ static __blocking triton_ret_t rosd_server_fn(int nservers, int nclients, void* { /* run service engine to process requests */ aer_service_engine_start(AER_DEFAULT_CTX); - aesop_cancel_branches_wait(); + aesop_cancel_branches(); } pbranch { diff --git a/code/src/state/sc.aer b/code/src/state/sc.aer index 4ae547d..15fe056 100644 --- a/code/src/state/sc.aer +++ b/code/src/state/sc.aer @@ -2,7 +2,6 @@ #include "triton-config.h" #include <aesop/aesop.h> -#include <aesop/aesop-support.hae> #include <aesop/triton-base.h> #include "src/common/triton-init.h" diff --git a/code/src/state/status.ae b/code/src/state/status.ae index 0de1b09..7203c91 100644 --- a/code/src/state/status.ae +++ b/code/src/state/status.ae @@ -11,7 +11,6 @@ #include "src/remote/service.hae" #include "src/zeroconf/zeroconf.h" #include "src/rebuild/rebuild.hae" -#include <aesop/aesop-support.hae> #include "src/state/sc_stubs.hae" #include "src/common/traffic-cop.hae" #include <aesop/triton-list.h> diff --git a/code/src/state/tests/engine1.ae b/code/src/state/tests/engine1.ae index 59794ce..35dea3b 100644 --- a/code/src/state/tests/engine1.ae +++ b/code/src/state/tests/engine1.ae @@ -17,7 +17,6 @@ #include "src/mapping/mapping.hae" #include "src/common/triton-bootstrap.hae" #include "src/common/traffic-cop.hae" -#include <aesop/aesop-support.hae> #include <sys/types.h> #include <unistd.h> @@ -86,7 +85,7 @@ static __blocking int doserver(int srank) pbranch { aesop_timer(6000); - aesop_cancel_branches_wait(); + aesop_cancel_branches(); } } diff --git a/code/src/state/tests/post-global.ae b/code/src/state/tests/post-global.ae index 1437f29..0cbad66 100644 --- a/code/src/state/tests/post-global.ae +++ b/code/src/state/tests/post-global.ae @@ -22,7 +22,6 @@ #include "src/remote/client-server-exec.hae" #include "src/common/traffic-cop.hae" #include "src/remote/service.hae" -#include <aesop/aesop-support.hae> #include "src/remote/core_module.h" int numprocs, rank; @@ -38,7 +37,7 @@ static __blocking void sender() pbranch { aer_service_engine_start(AER_DEFAULT_CTX); - aesop_cancel_branches_wait(); + aesop_cancel_branches(); } pbranch { @@ -77,7 +76,7 @@ static __blocking void receiver() pbranch { aer_service_engine_start(AER_DEFAULT_CTX); - aesop_cancel_branches_wait(); + aesop_cancel_branches(); } pbranch { diff --git a/code/src/state/tests/rosd-recover.ae b/code/src/state/tests/rosd-recover.ae index 8d7807f..968df88 100644 --- a/code/src/state/tests/rosd-recover.ae +++ b/code/src/state/tests/rosd-recover.ae @@ -13,7 +13,6 @@ #include "src/common/triton-debug.h" #include <aesop/hints.h> #include <aesop/aesop.h> -#include <aesop/aesop-support.hae> #include "src/remote/encoding.h" #include "src/remote/remote.hae" #include "src/remote/client-server-exec.hae" @@ -99,7 +98,7 @@ __blocking void do_remote_server(void) { /* run service engine to process requests */ aer_service_engine_start(AER_DEFAULT_CTX); - aesop_cancel_branches_wait(); + aesop_cancel_branches(); } pbranch { diff --git a/code/src/state/tests/rpc-list.ae b/code/src/state/tests/rpc-list.ae index 5fa4a7b..903bd3f 100644 --- a/code/src/state/tests/rpc-list.ae +++ b/code/src/state/tests/rpc-list.ae @@ -13,7 +13,6 @@ #include <unistd.h> #include <aesop/aesop.h> -#include <aesop/aesop-support.hae> #include "src/common/triton-buffer.h" #include "src/common/traffic-cop.hae" #include <aesop/timer.hae> @@ -137,7 +136,7 @@ static __blocking int doserver(const char* filename) pbranch { aer_service_engine_start(AER_DEFAULT_CTX); - aesop_cancel_branches_wait(); + aesop_cancel_branches(); } pbranch { diff --git a/code/src/state/tests/state-client-test.ae b/code/src/state/tests/state-client-test.ae index 47bc3e4..3599ddb 100644 --- a/code/src/state/tests/state-client-test.ae +++ b/code/src/state/tests/state-client-test.ae @@ -5,7 +5,6 @@ #include "src/common/triton-debug.h" #include <aesop/hints.h> #include <aesop/aesop.h> -#include <aesop/aesop-support.hae> #include "src/remote/client-server-exec.hae" #include "src/mapping/mapping.hae" #include "src/zeroconf/zeroconf.h" @@ -188,7 +187,7 @@ __blocking triton_ret_t state_test_harness_server_fn(int nservers, int nclients, { /* run service engine to process requests */ aer_service_engine_start(AER_DEFAULT_CTX); - aesop_cancel_branches_wait(); + aesop_cancel_branches(); } pbranch { hooks/post-receive --

1 0