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

Triton Repository branch, master, updated. 50d735c87cffbb143d9de13d9dd0b5d5505d6a61
by noreply＠mcs.anl.gov 11 Jun '11

11 Jun '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 50d735c87cffbb143d9de13d9dd0b5d5505d6a61 (commit) from bb009305c8b3f4808a7f84e24a09cdc8bd421108 (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 50d735c87cffbb143d9de13d9dd0b5d5505d6a61 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Sat Jun 11 22:49:19 2011 -0400 thread safety for aesocket resource - this might be a temporary organization until we do something fancier - for now, the post and cancel calls just manipulate queues and let the poll function interact with libev in the context of the thread that is running the event loop ----------------------------------------------------------------------- Summary of changes: code/src/common/resources/aesocket/aesocket.c | 126 ++++++++++++++++++------- 1 files changed, 90 insertions(+), 36 deletions(-) Diff of changes: diff --git a/code/src/common/resources/aesocket/aesocket.c b/code/src/common/resources/aesocket/aesocket.c index 1c18de6..c603833 100644 --- a/code/src/common/resources/aesocket/aesocket.c +++ b/code/src/common/resources/aesocket/aesocket.c @@ -18,11 +18,17 @@ static ae_opcache_t aesocket_opcache = NULL; static int triton_aesocket_resource_id; +static ae_ops_t posted_oplist; +static ae_ops_t inflight_oplist; +static ae_ops_t cancelled_oplist; + struct aesocket_op { ae_op_id_t op_id; struct ae_op op; triton_ret_t tret; + int fd; + int flags; ev_io io; }; @@ -32,15 +38,19 @@ static void aesocket_fd_ready( EV_P_ ev_io * io, int revents) { - // mutex might be required here struct ae_op *op = (struct ae_op *) io->data; struct aesocket_op *socket_op = ae_op_entry(io->data, struct aesocket_op, op); - struct ev_loop *eloop = ae_resource_get_eloop(op->ctx); + + triton_mutex_lock(&aesocket_mutex); + ae_ops_del(op); + triton_mutex_unlock(&aesocket_mutex); + ev_io_stop(eloop, io); ae_opcache_complete_op(aesocket_opcache, op, triton_ret_t, TRITON_SUCCESS); ae_resource_request_poll(op->ctx, triton_aesocket_resource_id); + return; } ae_define_post(triton_ret_t, triton_aesocket_ready, int fd, @@ -64,24 +74,18 @@ ae_define_post(triton_ret_t, triton_aesocket_ready, int fd, socket_op->op_id = ae_id_gen(triton_aesocket_resource_id, (uint64_t) (op->cache_id)); socket_op->tret = TRITON_SUCCESS; - - *__ae_op_id = socket_op->op_id; - - int flags = (mode & AESOCKET_READ ? EV_READ : 0) + socket_op->fd = fd; + socket_op->flags = (mode & AESOCKET_READ ? EV_READ : 0) | (mode & AESOCKET_WRITE ? EV_WRITE : 0); - assert(flags && "Need to specify one of AESOCKET_READ|AESOCKET_WRITE"); - - struct ev_loop *eloop = ae_resource_get_eloop(op->ctx); - - ev_io_init(&socket_op->io, aesocket_fd_ready, fd, flags); - socket_op->io.data = op; - - // Is lock needed here? (to protect eloop?) + assert(socket_op->flags && "Need to specify one of AESOCKET_READ|AESOCKET_WRITE"); + + *__ae_op_id = socket_op->op_id; - // how to prevent method from calling callback immediately? (or is this - // OK) - ev_io_start(eloop, &socket_op->io); + triton_mutex_lock(&aesocket_mutex); + ae_ops_enqueue(op, &posted_oplist); + triton_mutex_unlock(&aesocket_mutex); + ae_resource_request_poll(op->ctx, triton_aesocket_resource_id); return TRITON_SUCCESS; } @@ -89,9 +93,49 @@ ae_define_post(triton_ret_t, triton_aesocket_ready, int fd, static triton_ret_t triton_aesocket_poll( ae_context_t context) { + + struct ae_op *op; + struct aesocket_op *socket_op; + struct ev_loop *eloop; + + triton_mutex_lock(&aesocket_mutex); + + /* scan queue of newly posted ops */ + while((op = ae_ops_dequeue(&posted_oplist))) + { + socket_op = ae_op_entry(op, struct aesocket_op, op); + eloop = ae_resource_get_eloop(op->ctx); + ev_io_init(&socket_op->io, aesocket_fd_ready, socket_op->fd, + socket_op->flags); + socket_op->io.data = op; + ev_io_start(eloop, &socket_op->io); + + ae_ops_enqueue(op, &inflight_oplist); + } + + /* scan queue of ops to cancel */ + while((op = ae_ops_dequeue(&cancelled_oplist))) + { + socket_op = ae_op_entry(op, struct aesocket_op, op); + eloop = ae_resource_get_eloop(op->ctx); + + ev_io_stop(eloop, &socket_op->io); + if (ev_is_pending(&socket_op->io)) + { + /* The operation is completed but callback was not called yet. */ + ev_clear_pending(eloop, &socket_op->io); + } + /* calls callback and return op entry to the cache */ + ae_opcache_complete_op(aesocket_opcache, op, triton_ret_t, + TRITON_ERR_CANCELED); + } + + triton_mutex_unlock(&aesocket_mutex); + return TRITON_SUCCESS; } +/* TODO: test this function */ static triton_ret_t triton_aesocket_cancel( ae_context_t triton_ctx, ae_op_id_t op_id) @@ -111,30 +155,36 @@ static triton_ret_t triton_aesocket_cancel( op = ae_opcache_lookup(aesocket_opcache, (int) cache_id); socket_op = ae_op_entry(op, struct aesocket_op, op); - - //ae_ops_del(op); - - /* trigger callback immediately; no need to wait for a poll cycle */ ctx = op->ctx; - struct ev_loop *eloop = ae_resource_get_eloop(op->ctx); - ev_io_stop(eloop, &socket_op->io); - - if (ev_is_pending(&socket_op->io)) + if(ae_ops_exists(&posted_oplist, &op->link)) { - // The operation is completed but callback was not called yet. - ev_clear_pending(eloop, &socket_op->io); + /* this op hasn't been processed by the poll function yet; pull it + * out of the queue + */ + ae_ops_del(op); + triton_mutex_unlock(&aesocket_mutex); + ae_opcache_complete_op(aesocket_opcache, op, triton_ret_t, + TRITON_ERR_CANCELED); + ae_resource_request_poll(ctx, triton_aesocket_resource_id); + } + else if(ae_ops_exists(&inflight_oplist, &op->link)) + { + /* libev is already watching this. Move to cancelled list and + * request a poll to clean it up + */ + ae_ops_del(op); + ae_ops_enqueue(op, &cancelled_oplist); + triton_mutex_unlock(&aesocket_mutex); + ae_resource_request_poll(ctx, triton_aesocket_resource_id); + } + else + { + triton_mutex_unlock(&aesocket_mutex); + /* already cancelled */ } - triton_mutex_unlock(&aesocket_mutex); - - // calls callback and return op entry to the cache - ae_opcache_complete_op(aesocket_opcache, op, triton_ret_t, - TRITON_ERR_CANCELED); - - ae_resource_request_poll(ctx, triton_aesocket_resource_id); - - return TRITON_SUCCESS; + return(TRITON_SUCCESS); } struct ae_resource triton_aesocket_resource = { @@ -161,6 +211,10 @@ triton_ret_t triton_aesocket_init( triton_ret_t tret; int ret; + ae_ops_init(&posted_oplist); + ae_ops_init(&cancelled_oplist); + ae_ops_init(&inflight_oplist); + tret = AE_OPCACHE_INIT(struct aesocket_op, op, AESOCKET_DEFAULT_SIZE, hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. bb009305c8b3f4808a7f84e24a09cdc8bd421108
by noreply＠mcs.anl.gov 10 Jun '11

10 Jun '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 bb009305c8b3f4808a7f84e24a09cdc8bd421108 (commit) via 8bf73c1a44350d1ba63d53b76721d183ab2e702e (commit) from f09748451dcf3ac8ee805d29b7ecce665b299306 (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 bb009305c8b3f4808a7f84e24a09cdc8bd421108 Merge: 8bf73c1a44350d1ba63d53b76721d183ab2e702e f09748451dcf3ac8ee805d29b7ecce665b299306 Author: Kevin Harms <harms(a)alcf.anl.gov> Date: Fri Jun 10 22:28:35 2011 +0000 Merge. commit 8bf73c1a44350d1ba63d53b76721d183ab2e702e Author: Kevin Harms <harms(a)alcf.anl.gov> Date: Fri Jun 10 22:27:00 2011 +0000 Add memory usage tracking to the test echo server. ----------------------------------------------------------------------- Summary of changes: code/src/socket/test/echo-server.ae | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) Diff of changes: diff --git a/code/src/socket/test/echo-server.ae b/code/src/socket/test/echo-server.ae index b440875..fee2a08 100644 --- a/code/src/socket/test/echo-server.ae +++ b/code/src/socket/test/echo-server.ae @@ -11,6 +11,7 @@ #include <arpa/inet.h> #include <fcntl.h> #include <unistd.h> +#include <signal.h> #include <netinet/tcp.h> int done = 0; @@ -269,6 +270,25 @@ static __blocking int dotest( return 0; } +static void handler(int sig) +{ + FILE* status; + char buf[128]; + + status = fopen("/proc/self/status", "r"); + if(status) + { + while(fgets(buf, 128, status)) + { + if(strncmp(buf, "VmPeak", strlen("VmPeak")) == 0) + { + printf("%s", buf); + break; + } + } + } + exit(0); +} int main( int argc, @@ -279,6 +299,14 @@ int main( ae_hints_t hints; ae_op_id_t op_id; + struct sigaction new_action; + new_action.sa_handler = handler; + sigemptyset(&new_action.sa_mask); + new_action.sa_flags = SA_RESETHAND; + sigaction(SIGTERM, &new_action, NULL); + sigaction(SIGINT, &new_action, NULL); + sigaction(SIGQUIT, &new_action, NULL); + triton_init("triton.vosd.file", "triton.resource.timer", "triton.resource.aesocket"); hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. f09748451dcf3ac8ee805d29b7ecce665b299306
by noreply＠mcs.anl.gov 10 Jun '11

10 Jun '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 f09748451dcf3ac8ee805d29b7ecce665b299306 (commit) from 47625c76fee63e05c4beebcd2ff8ae4f695e3c1f (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 f09748451dcf3ac8ee805d29b7ecce665b299306 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Fri Jun 10 12:14:55 2011 -0400 fix open flags for read test ----------------------------------------------------------------------- Summary of changes: code/src/socket/test/echo-server.ae | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Diff of changes: diff --git a/code/src/socket/test/echo-server.ae b/code/src/socket/test/echo-server.ae index 29df6b2..b440875 100644 --- a/code/src/socket/test/echo-server.ae +++ b/code/src/socket/test/echo-server.ae @@ -110,7 +110,7 @@ static __blocking void handleConnection( case TEST_READ: ret = file_open(&file_fd, req.filename, - (O_CREAT|O_TRUNC|O_WRONLY), + (O_RDONLY), 0644); if (ret == TRITON_SUCCESS) { hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. 47625c76fee63e05c4beebcd2ff8ae4f695e3c1f
by noreply＠mcs.anl.gov 09 Jun '11

09 Jun '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 47625c76fee63e05c4beebcd2ff8ae4f695e3c1f (commit) from 76fd387f1e82b60d1310905210d8b0fd4e4c3bdf (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 47625c76fee63e05c4beebcd2ff8ae4f695e3c1f Author: Phil Carns <carns(a)mcs.anl.gov> Date: Fri Jun 10 00:10:31 2011 -0400 use TCP_NODELAY in socket test ----------------------------------------------------------------------- Summary of changes: code/src/socket/test/echo-server.ae | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) Diff of changes: diff --git a/code/src/socket/test/echo-server.ae b/code/src/socket/test/echo-server.ae index 9a8d46c..29df6b2 100644 --- a/code/src/socket/test/echo-server.ae +++ b/code/src/socket/test/echo-server.ae @@ -11,6 +11,7 @@ #include <arpa/inet.h> #include <fcntl.h> #include <unistd.h> +#include <netinet/tcp.h> int done = 0; int cb_ret; @@ -211,6 +212,7 @@ static __blocking int dotest( triton_ret_t ret; int newsocket; int value = 1; + int rc; listensocket = socket(AF_INET, SOCK_STREAM, 0); @@ -257,6 +259,10 @@ static __blocking int dotest( break; } + rc = setsockopt(newsocket, IPPROTO_TCP, TCP_NODELAY, &value, + sizeof(value)); + assert(rc == 0); + handleConnection(newsocket); } hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. 76fd387f1e82b60d1310905210d8b0fd4e4c3bdf
by noreply＠mcs.anl.gov 08 Jun '11

08 Jun '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 76fd387f1e82b60d1310905210d8b0fd4e4c3bdf (commit) from 5134a2a83e4f38d8fcf54aed17663b7f45dbf6d0 (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 76fd387f1e82b60d1310905210d8b0fd4e4c3bdf Author: Kevin Harms <harms(a)bblogin1.mcs.anl.gov> Date: Wed Jun 8 12:40:11 2011 -0500 Add aesocket resrouce to the list of components initialized. ----------------------------------------------------------------------- Summary of changes: code/src/common/triton-init-registry.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) Diff of changes: diff --git a/code/src/common/triton-init-registry.c b/code/src/common/triton-init-registry.c index 7c3002e..35fde92 100644 --- a/code/src/common/triton-init-registry.c +++ b/code/src/common/triton-init-registry.c @@ -33,6 +33,7 @@ void triton_bdb_init_register(void); void triton_rosd_init_register(void); void triton_kv_init_register(void); void triton_logical_register(void); +void triton_aesocket_init_register(void); void triton_init_register_components(void); @@ -62,4 +63,5 @@ void triton_init_register_components(void) triton_rosd_init_register(); triton_kv_init_register(); triton_logical_register(); + triton_aesocket_init_register(); } hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. 5134a2a83e4f38d8fcf54aed17663b7f45dbf6d0
by noreply＠mcs.anl.gov 08 Jun '11

08 Jun '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 5134a2a83e4f38d8fcf54aed17663b7f45dbf6d0 (commit) via dc0e5753eb278857e88aea368500d1c8fed0297c (commit) from 2ed72cc03cbfd1e27808e15ee69b38053e8bfabf (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 5134a2a83e4f38d8fcf54aed17663b7f45dbf6d0 Merge: dc0e5753eb278857e88aea368500d1c8fed0297c 2ed72cc03cbfd1e27808e15ee69b38053e8bfabf Author: Kevin Harms <harms(a)bblogin1.mcs.anl.gov> Date: Wed Jun 8 12:30:18 2011 -0500 Merge branch 'master' of git.mcs.anl.gov:triton commit dc0e5753eb278857e88aea368500d1c8fed0297c Author: Kevin Harms <harms(a)bblogin2.mcs.anl.gov> Date: Wed Jun 8 12:29:35 2011 -0500 Fix echo-server.ae to use standard triton style initialization. ----------------------------------------------------------------------- Summary of changes: code/src/socket/test/echo-server.ae | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) Diff of changes: diff --git a/code/src/socket/test/echo-server.ae b/code/src/socket/test/echo-server.ae index 120154b..9a8d46c 100644 --- a/code/src/socket/test/echo-server.ae +++ b/code/src/socket/test/echo-server.ae @@ -4,6 +4,7 @@ #include "src/common/resources/timer/timer.hae" #include "src/socket/test/echo-server.h" #include "src/versioned-osd/prototype/file-resource/file-resource.hae" +#include "src/common/triton-debug.h" #include <sys/types.h> #include <sys/socket.h> @@ -33,11 +34,11 @@ static __blocking void handleConnection( int written; struct test_request req; struct test_response resp; - int end_loop = 1; + int end_loop = 0; int file_fd; int error_code; - resp.error_code = 0; + resp.error_code = 42; // printf("New connection (fd %i)!\n", fd); @@ -181,7 +182,6 @@ static __blocking void handleConnection( else { triton_error_print(ret, "error on file_open"); - break; } ret = triton_write(fd, &resp, sizeof(resp), &written); if (ret != TRITON_SUCCESS) @@ -273,9 +273,11 @@ int main( ae_hints_t hints; ae_op_id_t op_id; - triton_aesocket_init(); - triton_timer_init(); - ae_context_create(&ctx, "timer", "aesocket"); + triton_init("triton.vosd.file", + "triton.resource.timer", + "triton.resource.aesocket"); + + ae_context_create(&ctx, "timer", "aesocket", "file"); ae_hints_init(&hints); ret = ae_post_blocking(dotest, done_callback, NULL, &hints, ctx, &op_id, @@ -292,8 +294,8 @@ int main( ae_hints_destroy(&hints); ae_context_destroy(ctx); - triton_timer_finalize(); - triton_aesocket_finalize(); + + triton_finalize(); return cb_ret; } hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. 2ed72cc03cbfd1e27808e15ee69b38053e8bfabf
by noreply＠mcs.anl.gov 08 Jun '11

08 Jun '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 2ed72cc03cbfd1e27808e15ee69b38053e8bfabf (commit) via e92912ec61754fbf8413527df4ad4fd1417b5ba4 (commit) from 63f20572abd145532575f796b58dcbcc39788cbb (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 2ed72cc03cbfd1e27808e15ee69b38053e8bfabf Author: Phil Carns <carns(a)mcs.anl.gov> Date: Wed Jun 8 11:19:24 2011 -0400 workaround for old versions of GNU Make commit e92912ec61754fbf8413527df4ad4fd1417b5ba4 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Wed Jun 8 11:18:51 2011 -0400 workaround for old sha.h headers that need size_t ----------------------------------------------------------------------- Summary of changes: code/Makefile.in | 5 ++++- code/src/placement/placement-nearest.ae | 1 + 2 files changed, 5 insertions(+), 1 deletions(-) Diff of changes: diff --git a/code/Makefile.in b/code/Makefile.in index 3c98655..9461824 100644 --- a/code/Makefile.in +++ b/code/Makefile.in @@ -251,7 +251,10 @@ canonname = $(patsubst $(srcdir)/%,%,$(call dirname,$(1))) canonfname = $(patsubst $(srcdir)/%,%,$(1)) -bname = $(lastword $(subst /, ,$(1))) +# the "lastword" function is more concise, but not available on +# older versions of GNU Make +# bname = $(lastword $(subst /, ,$(1))) +bname = $(word $(words $(subst /, ,$(1))),$(subst /, ,$(1))) canondirname = $(subst /,_,$(1)) diff --git a/code/src/placement/placement-nearest.ae b/code/src/placement/placement-nearest.ae index 6c712f7..21ff8c3 100644 --- a/code/src/placement/placement-nearest.ae +++ b/code/src/placement/placement-nearest.ae @@ -1,6 +1,7 @@ #include <limits.h> +#include <unistd.h> #include <openssl/sha.h> #include "src/common/triton-uint128.h" hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. 63f20572abd145532575f796b58dcbcc39788cbb
by noreply＠mcs.anl.gov 08 Jun '11

08 Jun '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 63f20572abd145532575f796b58dcbcc39788cbb (commit) from 46711e149006026a8d366ed680edc948e481edba (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 63f20572abd145532575f796b58dcbcc39788cbb Author: Phil Carns <carns(a)mcs.anl.gov> Date: Wed Jun 8 11:01:04 2011 -0400 fix another makefile typo ----------------------------------------------------------------------- Summary of changes: code/src/remote/module.mk.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Diff of changes: diff --git a/code/src/remote/module.mk.in b/code/src/remote/module.mk.in index ba5129d..07734dc 100644 --- a/code/src/remote/module.mk.in +++ b/code/src/remote/module.mk.in @@ -18,7 +18,7 @@ FULLMODNAME_CORE := $(DIR_REMOTE)/$(MODNAME_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 +$(FULLMODNAME_CORE).d: $(DIR_REMOTE)/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) $< > $@ + $(E)CC=$(call MCC_AE,$(FULLMODNAME_CORE)) $(srcdir)/maint/depend-aer.sh $(DIR_REMOTE) $(MODNAME_CORE) $(LIBCFLAGS) $(CFLAGS) $(call MODCFLAGS_AE,$FULLMODNAME_CORE) $< > $@ hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. 46711e149006026a8d366ed680edc948e481edba
by noreply＠mcs.anl.gov 08 Jun '11

08 Jun '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 46711e149006026a8d366ed680edc948e481edba (commit) from 65705d0f7277fb84e2e2da41fa1c5b01b242b042 (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 46711e149006026a8d366ed680edc948e481edba Author: Phil Carns <carns(a)mcs.anl.gov> Date: Wed Jun 8 10:48:40 2011 -0400 fix typo in makefile ----------------------------------------------------------------------- Summary of changes: code/src/aesop/parser/tests/remote/module.mk.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Diff of changes: diff --git a/code/src/aesop/parser/tests/remote/module.mk.in b/code/src/aesop/parser/tests/remote/module.mk.in index cb17bf0..d3731ea 100644 --- a/code/src/aesop/parser/tests/remote/module.mk.in +++ b/code/src/aesop/parser/tests/remote/module.mk.in @@ -51,7 +51,7 @@ FULLMODNAME4 := $(DIR_TESTREMOTE)/$(MODNAME4) $(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 +$(FULLMODNAME4).d: $(DIR_TESTREMOTE)/test-remote-fault-injector.aer $(Q) " DEP $@" $(E)CC=$(call MCC_AE,$(FULLMODNAME4)) $(srcdir)/maint/depend-aer.sh $(DIR_TESTREMOTE) $(MODNAME4) $(LIBCFLAGS) $(CFLAGS) $(call MODCFLAGS_AE,$FULLMODNAME4) $< > $@ hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. 65705d0f7277fb84e2e2da41fa1c5b01b242b042
by noreply＠mcs.anl.gov 07 Jun '11

07 Jun '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 65705d0f7277fb84e2e2da41fa1c5b01b242b042 (commit) via e317047f6166375605bfb0ab8da5229d61a8bce8 (commit) via 123ed70c15962805eb5f0b7602ce2f07e8864873 (commit) from 491f2184433fb34964441896eeb46438a8a32b0e (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 65705d0f7277fb84e2e2da41fa1c5b01b242b042 Author: Justin Wozniak <wozniak(a)mcs.anl.gov> Date: Tue Jun 7 15:16:50 2011 -0500 Initialize the traffic cop commit e317047f6166375605bfb0ab8da5229d61a8bce8 Author: Justin Wozniak <wozniak(a)mcs.anl.gov> Date: Tue Jun 7 12:36:48 2011 -0500 New triton_status_get() and test. ref #120 commit 123ed70c15962805eb5f0b7602ce2f07e8864873 Author: Justin Wozniak <wozniak(a)mcs.anl.gov> Date: Tue Jun 7 11:24:10 2011 -0500 New triton_status_is_failed() ----------------------------------------------------------------------- Summary of changes: code/src/state/state.ae | 32 ++++++++++++++++++++++++++++++++ code/src/state/state.hae | 5 +++++ code/src/state/test/module.mk.in | 3 ++- code/src/state/test/rosd-global.ae | 4 ++-- code/src/state/test/rosd-maint.ae | 4 ++-- code/src/state/test/rosd-peers.ae | 19 +++++++++++++++---- code/src/state/test/rosd-peers.sh | 8 ++++++++ code/src/state/test/rosd-recover.ae | 7 +++++-- code/src/state/test/rosd-start.ae | 4 ++-- code/src/state/test/rosd-status.ae | 4 ++-- code/src/state/test/rosd-trigger.ae | 4 ++-- code/src/state/test/rpc-global.ae | 2 +- code/src/state/test/rpc-list.ae | 5 +++-- code/src/state/test/rpc-size.ae | 2 +- 14 files changed, 82 insertions(+), 21 deletions(-) Diff of changes: diff --git a/code/src/state/state.ae b/code/src/state/state.ae index 28230c3..cf5c243 100644 --- a/code/src/state/state.ae +++ b/code/src/state/state.ae @@ -5,6 +5,38 @@ struct triton_state_funcs triton_state; triton_status_t triton_status = TRITON_STATUS_PROTO; +bool triton_status_is_failed(triton_status_t status) +{ + if (status == TRITON_STATUS_MAINTENANCE || + status == TRITON_STATUS_INJECTED || + status == TRITON_STATUS_UNREACHABLE) + return true; + return false; +} + +/** + Get the status of a remote node. + The local status is available in triton_status. +*/ +triton_ret_t triton_status_get(triton_node_t node, + triton_status_t *status) +{ + triton_string_t key; + triton_state_data_t *data; + + triton_string_init(&key, "triton.state"); + data = triton_state.lookup(node, &key); + + if (!data) + return TRITON_ERR_NOTFOUND; + + triton_mutex_lock(&data->mutex); + memcpy(status, data->value, sizeof(triton_status_t)); + triton_mutex_unlock(&data->mutex); + + return TRITON_SUCCESS; +} + triton_ret_t triton_status_tostring(triton_string_t *result, triton_status_t status) { diff --git a/code/src/state/state.hae b/code/src/state/state.hae index 8cb34bd..fed8be1 100644 --- a/code/src/state/state.hae +++ b/code/src/state/state.hae @@ -103,6 +103,11 @@ typedef enum extern triton_status_t triton_status; +bool triton_status_is_failed(triton_status_t status); + +triton_ret_t triton_status_get(triton_node_t node, + triton_status_t *status); + triton_ret_t triton_status_tostring(triton_string_t *result, triton_status_t status); diff --git a/code/src/state/test/module.mk.in b/code/src/state/test/module.mk.in index ba0cbda..66c912f 100644 --- a/code/src/state/test/module.mk.in +++ b/code/src/state/test/module.mk.in @@ -21,7 +21,8 @@ STATE_TEST_SRC += $(DIR)/rosd-trigger.ae STATE_TEST_SRC += $(DIR)/rosd-peers.ae STATE_TEST_SRC += $(DIR)/rosd-maint.ae STATE_TEST_SRC += $(DIR)/rosd-injection.ae -STATE_TEST_SRC += $(DIR)/rosd-recover.ae +# Still needs some work: +# STATE_TEST_SRC += $(DIR)/rosd-recover.ae # AETESTSRC += $(DIR)/state-client.ae STATE_TESTS = $(patsubst %.ae,%,$(STATE_TEST_SRC)) diff --git a/code/src/state/test/rosd-global.ae b/code/src/state/test/rosd-global.ae index ebf2a8d..fbc989e 100644 --- a/code/src/state/test/rosd-global.ae +++ b/code/src/state/test/rosd-global.ae @@ -344,7 +344,7 @@ int main(int argc, char *argv[]) triton_error_assert(ret); /* servers */ - ret = triton_init("triton.server"); + ret = triton_init("triton.server", "triton.traffic_cop"); triton_error_assert(ret); ret = aer_remote_register_rosd(); triton_error_assert(ret); @@ -354,7 +354,7 @@ int main(int argc, char *argv[]) else { /* clients */ - ret = triton_init("triton.client"); + ret = triton_init("triton.client", "triton.traffic_cop"); triton_error_assert(ret); } diff --git a/code/src/state/test/rosd-maint.ae b/code/src/state/test/rosd-maint.ae index da9aa78..fe8a17b 100644 --- a/code/src/state/test/rosd-maint.ae +++ b/code/src/state/test/rosd-maint.ae @@ -374,7 +374,7 @@ int main(int argc, char *argv[]) triton_error_assert(ret); /* servers */ - ret = triton_init("triton.server"); + ret = triton_init("triton.server", "triton.traffic_cop"); triton_error_assert(ret); ret = aer_remote_register_rosd(); triton_error_assert(ret); @@ -386,7 +386,7 @@ int main(int argc, char *argv[]) else { /* clients */ - ret = triton_init("triton.client"); + ret = triton_init("triton.client", "triton.traffic_cop"); triton_error_assert(ret); } diff --git a/code/src/state/test/rosd-peers.ae b/code/src/state/test/rosd-peers.ae index 39b3c82..b137756 100644 --- a/code/src/state/test/rosd-peers.ae +++ b/code/src/state/test/rosd-peers.ae @@ -42,6 +42,8 @@ #include "src/replicated-osd/rosd_stubs.hae" #include "src/remote/core_stubs.hae" +#include "src/state/state.hae" + #include "mpi.h" #define SVR_POLL_TIMEOUT 1000 @@ -79,17 +81,19 @@ __blocking void update_state() return; } -void handle_status_change(triton_node_t node, +void handle_status_change(triton_node_t node, triton_status_t *status_current, triton_status_t *status_previous); -void handle_status_change(triton_node_t node, +void handle_status_change(triton_node_t node, triton_status_t *status_current, triton_status_t *status_previous) { char node_string[128]; triton_string_t status_string_current; triton_string_t status_string_previous; + triton_string_t status_string_tmp; + triton_status_t tmp; triton_uint128_to_string(node_string, 128, node); triton_status_tostring(&status_string_current, *status_current); @@ -102,6 +106,12 @@ void handle_status_change(triton_node_t node, triton_string_destroy(&status_string_current); triton_string_destroy(&status_string_previous); + // Additional test: use triton_status_get + triton_status_get(node, &tmp); + triton_status_tostring(&status_string_tmp, tmp); + printf("status_get: %s\n", triton_string_get(&status_string_tmp)); + triton_string_destroy(&status_string_tmp); + *status_previous = *status_current; } @@ -178,6 +188,7 @@ __blocking void do_remote_server(void) pbranch { /* run fakess engine to track system state */ + triton_fakess_state_install(); fakess_ret = triton_fakess_engine_start(); /* TODO: error handling */ triton_error_assert(fakess_ret); @@ -355,7 +366,7 @@ int main(int argc, char *argv[]) triton_error_assert(ret); /* servers */ - ret = triton_init("triton.server"); + ret = triton_init("triton.server", "triton.traffic_cop"); triton_error_assert(ret); ret = aer_remote_register_rosd(); triton_error_assert(ret); @@ -365,7 +376,7 @@ int main(int argc, char *argv[]) else { /* clients */ - ret = triton_init("triton.client"); + ret = triton_init("triton.client", "triton.traffic_cop"); triton_error_assert(ret); } diff --git a/code/src/state/test/rosd-peers.sh b/code/src/state/test/rosd-peers.sh index beebe9a..87aa0df 100755 --- a/code/src/state/test/rosd-peers.sh +++ b/code/src/state/test/rosd-peers.sh @@ -15,5 +15,13 @@ LINES=$( grep "status change:" ${OUT} | wc -l ) [[ $? == 0 ]] || exit 1 [[ ${LINES} == 8 ]] || exit 1 +LINES=$( grep "status_get: NOMINAL" ${OUT} | wc -l ) +[[ $? == 0 ]] || exit 1 +[[ ${LINES} == 4 ]] || exit 1 + +LINES=$( grep "status_get: MAINTENANCE" ${OUT} | wc -l ) +[[ $? == 0 ]] || exit 1 +[[ ${LINES} == 4 ]] || exit 1 + echo OK exit 0 diff --git a/code/src/state/test/rosd-recover.ae b/code/src/state/test/rosd-recover.ae index b11075a..4037a0c 100644 --- a/code/src/state/test/rosd-recover.ae +++ b/code/src/state/test/rosd-recover.ae @@ -43,6 +43,9 @@ #include "src/replicated-osd/rosd_stubs.hae" #include "src/remote/core_stubs.hae" +#include "src/state/sc_stubs.hae" +#include "src/state/sc_module.h" + #include "mpi.h" #define SVR_POLL_TIMEOUT 1000 @@ -384,7 +387,7 @@ int main(int argc, char *argv[]) triton_error_assert(ret); /* servers */ - ret = triton_init("triton.server"); + ret = triton_init("triton.server", "triton.traffic_cop"); triton_error_assert(ret); ret = aer_remote_register_rosd(); triton_error_assert(ret); @@ -396,7 +399,7 @@ int main(int argc, char *argv[]) else { /* clients */ - ret = triton_init("triton.client"); + ret = triton_init("triton.client", "triton.traffic_cop"); triton_error_assert(ret); } diff --git a/code/src/state/test/rosd-start.ae b/code/src/state/test/rosd-start.ae index 30702df..96750e0 100644 --- a/code/src/state/test/rosd-start.ae +++ b/code/src/state/test/rosd-start.ae @@ -302,7 +302,7 @@ int main(int argc, char *argv[]) triton_error_assert(ret); /* servers */ - ret = triton_init("triton.server"); + ret = triton_init("triton.server", "triton.traffic_cop"); triton_error_assert(ret); ret = aer_remote_register_rosd(); triton_error_assert(ret); @@ -312,7 +312,7 @@ int main(int argc, char *argv[]) else { /* clients */ - ret = triton_init("triton.client"); + ret = triton_init("triton.client", "triton.traffic_cop"); triton_error_assert(ret); } diff --git a/code/src/state/test/rosd-status.ae b/code/src/state/test/rosd-status.ae index 7fbc437..d3d84c5 100644 --- a/code/src/state/test/rosd-status.ae +++ b/code/src/state/test/rosd-status.ae @@ -368,7 +368,7 @@ int main(int argc, char *argv[]) triton_error_assert(ret); /* servers */ - ret = triton_init("triton.server"); + ret = triton_init("triton.server", "triton.traffic_cop"); triton_error_assert(ret); ret = aer_remote_register_rosd(); triton_error_assert(ret); @@ -378,7 +378,7 @@ int main(int argc, char *argv[]) else { /* clients */ - ret = triton_init("triton.client"); + ret = triton_init("triton.client", "triton.traffic_cop"); triton_error_assert(ret); } diff --git a/code/src/state/test/rosd-trigger.ae b/code/src/state/test/rosd-trigger.ae index c72816c..a589d8a 100644 --- a/code/src/state/test/rosd-trigger.ae +++ b/code/src/state/test/rosd-trigger.ae @@ -365,7 +365,7 @@ int main(int argc, char *argv[]) triton_error_assert(ret); /* servers */ - ret = triton_init("triton.server"); + ret = triton_init("triton.server", "triton.traffic_cop"); triton_error_assert(ret); ret = aer_remote_register_rosd(); triton_error_assert(ret); @@ -375,7 +375,7 @@ int main(int argc, char *argv[]) else { /* clients */ - ret = triton_init("triton.client"); + ret = triton_init("triton.client", "triton.traffic_cop"); triton_error_assert(ret); } diff --git a/code/src/state/test/rpc-global.ae b/code/src/state/test/rpc-global.ae index c01c6f9..3779518 100644 --- a/code/src/state/test/rpc-global.ae +++ b/code/src/state/test/rpc-global.ae @@ -193,7 +193,7 @@ int main(int argc, char *argv[]) assert(argc == 2); - triton_init("triton.keyval"); + triton_init("triton.keyval", "triton.traffic_cop"); MPI_Comm_rank(MPI_COMM_WORLD, &rank); diff --git a/code/src/state/test/rpc-list.ae b/code/src/state/test/rpc-list.ae index 3507f37..4fa530b 100644 --- a/code/src/state/test/rpc-list.ae +++ b/code/src/state/test/rpc-list.ae @@ -177,7 +177,8 @@ int main(int argc, char *argv[]) ae_op_id_t op_id; ae_context_t ctx; ae_hints_t hints; - int mpi_thread_level, ret; + int mpi_thread_level; + triton_ret_t ret; /* GDB_WAIT */ int gdb_wait = 0; @@ -185,7 +186,7 @@ int main(int argc, char *argv[]) assert(argc == 2); - triton_init("triton.keyval"); + triton_init("triton.keyval", "triton.traffic_cop"); MPI_Comm_rank(MPI_COMM_WORLD, &rank); diff --git a/code/src/state/test/rpc-size.ae b/code/src/state/test/rpc-size.ae index 712ffae..cd42da9 100644 --- a/code/src/state/test/rpc-size.ae +++ b/code/src/state/test/rpc-size.ae @@ -125,7 +125,7 @@ int main(int argc, char *argv[]) assert(argc == 2); - triton_init("triton.keyval"); + triton_init("triton.keyval", "triton.traffic_cop"); MPI_Comm_rank(MPI_COMM_WORLD, &rank); hooks/post-receive -- Triton Repository

1 0