June 2014 - Asg - mailman3.cels.anl.gov

branch, bindist, updated. v0.2-34-g02bf8de
by noreply＠mcs.anl.gov 15 Jun '14

15 Jun '14

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, bindist has been updated via 02bf8dee7e5aab8934b565200a933010ef8c25f8 (commit) via 179f2209b853936feb53880564c7c3f40a44f6bf (commit) from 772236cbb12d710e09353f10f160e7d433f2b297 (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 02bf8dee7e5aab8934b565200a933010ef8c25f8 Author: Dries Kimpe <dries(a)kimpe.be> Date: Sun Jun 15 22:06:35 2014 -0500 Sync up current status commit 179f2209b853936feb53880564c7c3f40a44f6bf Author: Dries Kimpe <dkimpe(a)mcs.anl.gov> Date: Wed May 28 17:20:50 2014 -0500 Fix inconsistency between pthread/triton_mutex Cond.hae was using pthread_xxxx and cond.c was using triton_mutex_xxx ----------------------------------------------------------------------- Summary of changes: Makefile.am | 13 +- maint/aesop.pc.in => aesop.pc.in | 4 +- configure.ac | 8 +- .../resources/sem => include/aesop/std}/cond.hae | 7 +- .../resources/sem => include/aesop/std}/sem.hae | 0 src/std/Makefile.subdir | 5 +- src/std/resources/sem/Makefile.subdir | 42 ++++- src/timer/test/module.mk.in | 8 - src/timer/test/pthread-compare.ae | 113 ---------- src/timer/test/timer-cancel.ae | 65 ------ src/timer/test/timer1.ae | 65 ------ src/timer/test/timer2.ae | 74 ------- src/timer/timer.ae | 225 -------------------- src/timer/timer.hae | 33 --- 14 files changed, 70 insertions(+), 592 deletions(-) rename maint/aesop.pc.in => aesop.pc.in (78%) rename {src/std/resources/sem => include/aesop/std}/cond.hae (90%) rename {src/std/resources/sem => include/aesop/std}/sem.hae (100%) delete mode 100644 src/timer/test/module.mk.in delete mode 100644 src/timer/test/pthread-compare.ae delete mode 100644 src/timer/test/timer-cancel.ae delete mode 100644 src/timer/test/timer1.ae delete mode 100644 src/timer/test/timer2.ae delete mode 100644 src/timer/timer.ae delete mode 100644 src/timer/timer.hae Diff of changes: diff --git a/Makefile.am b/Makefile.am index 1350401..64b6382 100644 --- a/Makefile.am +++ b/Makefile.am @@ -23,10 +23,13 @@ AM_CTAGSFLAGS=--excmd=pattern -B --extra=+f --langmap=c:+.ae.hae -I pwait,pbranc # List of dependencies for _the use_ of the aecc compiler _in tree_ compilerdeps = +# Extra flags for linking aesop programs against the in-tree libs +AESOP_LOCAL_LIBS = -L$(top_builddir)/lib $(AESOP_PKGCONFIG_LIBS) + AM_CPPFLAGS = -I$(top_srcdir) # So code can include aesop/... headers whether installed or in-tree -AM_CPPFLAGS += -I$(top_srcdir)/include +AM_CPPFLAGS += -I$(top_srcdir)/include -I$(top_builddir)/include AM_CFLAGS = @@ -38,6 +41,14 @@ AM_CXXFLAGS = $(AM_CFLAGS) AM_GHCFLAGS = +# +# pkgconfig +# +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = aesop.pc +$(pkgconfig_DATA): config.status + + include Make.rules include $(top_srcdir)/Makefile.subdir diff --git a/maint/aesop.pc.in b/aesop.pc.in similarity index 78% rename from maint/aesop.pc.in rename to aesop.pc.in index 0d1db87..779eb85 100644 --- a/maint/aesop.pc.in +++ b/aesop.pc.in @@ -3,6 +3,8 @@ exec_prefix = @exec_prefix@ libdir=@libdir@ includedir=@includedir@ aesop_pkgconfig_libs=@AESOP_PKGCONFIG_LIBS@ + +# Not sure if we need this db_lib=@DB_LIB@ db_ldflags=@DB_LDFLAGS@ db_cflags=@DB_CFLAGS@ @@ -12,5 +14,5 @@ Description: language for high concurrency system software development Version: @AESOP_VERSION@ URL: http://trac.mcs.anl.gov/projects/aesop Requires: -Libs: ${db_ldflags} -L${libdir} ${db_lib} -laesop ${aesop_pkgconfig_libs} +Libs: ${db_ldflags} -L${libdir} ${db_lib} -laesop-rt ${aesop_pkgconfig_libs} Cflags: -I${includedir} ${db_cflags} diff --git a/configure.ac b/configure.ac index 3b09d2d..f523549 100644 --- a/configure.ac +++ b/configure.ac @@ -371,7 +371,7 @@ AC_SUBST(AECC_CFLAGS) AC_SUBST(LIBCFLAGS) AC_SUBST(THREAD_LIB) -AESOP_PKGCONFIG_LIBS="${AESOP_PKGCONFIG_LIBS} ${THREAD_LIB}" +AESOP_PKGCONFIG_LIBS="-laesop-rt ${AESOP_PKGCONFIG_LIBS} ${THREAD_LIB}" AC_SUBST(AESOP_PKGCONFIG_LIBS) AC_CONFIG_FILES([bin/aecc-utils], []) @@ -384,8 +384,12 @@ AC_CONFIG_FILES([maint/depend-hae.sh],[chmod +x maint/depend-hae.sh]) AC_CONFIG_FILES([Makefile]) +AC_CONFIG_FILES([aesop.pc]) + dnl Create build directory for haskell compiler -AC_CONFIG_COMMANDS([mkdir], [$MKDIR_P src/compiler]) +AC_CONFIG_COMMANDS([compilerdir], [$MKDIR_P src/compiler]) +AC_CONFIG_COMMANDS([stdlib dir], [$MKDIR_P include/aesop/std]) + AC_OUTPUT diff --git a/src/std/resources/sem/cond.hae b/include/aesop/std/cond.hae similarity index 90% rename from src/std/resources/sem/cond.hae rename to include/aesop/std/cond.hae index 868b52c..fa5ac03 100644 --- a/src/std/resources/sem/cond.hae +++ b/include/aesop/std/cond.hae @@ -9,8 +9,9 @@ #include <pthread.h> #include <aesop/aesop.h> -#include <aesop/op.h> +#include <aesop/rt/op.h> #include <sys/time.h> +#include <triton-thread.h> enum aesop_cond_state { @@ -22,7 +23,7 @@ enum aesop_cond_state /* TODO: this should probably be a forward definition */ typedef struct aesop_cond_id_s { - pthread_mutex_t *mutex; + triton_mutex_t * mutex; enum aesop_cond_state state; ae_op_id_t op_id; struct ae_op op; @@ -52,7 +53,7 @@ void aesop_cond_notify_specific(aesop_cond_t cond, aesop_cond_id_t *id); * aesop_cond_obj_wait waits on a conduling object to be notified. The mutex passed in * must be locked. */ -__blocking int aesop_cond_obj_wait(aesop_cond_t cond, pthread_mutex_t *mutex, aesop_cond_id_t *result); +__blocking int aesop_cond_obj_wait(aesop_cond_t cond, triton_mutex_t *mutex, aesop_cond_id_t *result); /** * Just wait on a conduling variable without a conduling id. No way to wake up individuals, only notify_all or diff --git a/src/std/resources/sem/sem.hae b/include/aesop/std/sem.hae similarity index 100% rename from src/std/resources/sem/sem.hae rename to include/aesop/std/sem.hae diff --git a/src/std/Makefile.subdir b/src/std/Makefile.subdir index 3b81d8d..28c3ea3 100644 --- a/src/std/Makefile.subdir +++ b/src/std/Makefile.subdir @@ -5,6 +5,9 @@ stdlibsources = # headers that need to be installed for stdlib stdlibheaders = +# Extra flags (mainly for built sources) +stdlibcppflags = + include src/std/resources/Makefile.subdir lib_LTLIBRARIES += lib/libaesop-std.la @@ -12,5 +15,5 @@ lib_libaesop_std_la_SOURCES = $(stdlibsources) stdlibdir = $(includedir)/aesop/std -nobase_stdlib_HEADERS = $(stdlibheaders) +stdlib_HEADERS = $(stdlibheaders) diff --git a/src/std/resources/sem/Makefile.subdir b/src/std/resources/sem/Makefile.subdir index c16aaf5..ea5588f 100644 --- a/src/std/resources/sem/Makefile.subdir +++ b/src/std/resources/sem/Makefile.subdir @@ -4,6 +4,46 @@ stdlibsources += \ src/std/resources/sem/sem.c \ src/std/resources/sem/cond.c -BUILT_SOURCES += src/std/resources/sem/sem.h + +stdlibheaders += $(top_builddir)/include/aesop/std/sem.h \ + $(top_builddir)/include/aesop/std/cond.h \ + $(top_srcdir)/include/aesop/std/sem.hae \ + $(top_srcdir)/include/aesop/std/cond.hae + +# This is needed so the BUILT_SOURCES below (which end up in the BUILD +# directory, not in the same directory as the .c sources) can be found +AM_CPPFLAGS += -I$(top_builddir)/src/std/resources/sem + + +# might be able to get away for these with explicit dependencies +BUILT_SOURCES += include/aesop/std/sem.h \ + include/aesop/std/cond.h + + +CLEANFILES += include/aesop/std/sem.h \ + include/aesop/std/cond.h + + +local_tests = src/std/resources/sem/test/cancel-sem \ + src/std/resources/sem/test/cancel-sem-before-down \ + src/std/resources/sem/test/cancel-sem-forloop \ + src/std/resources/sem/test/cond-cancel \ + src/std/resources/sem/test/cond-pthread-compare \ + src/std/resources/sem/test/simple-sem + +TESTS += $(local_tests) + +check_PROGRAMS += $(local_tests) + + +local_test_ldadd = lib/libaesop-std.la \ + $(AESOP_LOCAL_LIBS) + +src_std_resources_sem_test_cancel_sem_LDADD = $(local_test_ldadd) +src_std_resources_sem_test_cancel_sem_before_down_LDADD = $(local_test_ldadd) +src_std_resources_sem_test_cancel_sem_forloop_LDADD = $(local_test_ldadd) +src_std_resources_sem_test_cond_cancel_LDADD = $(local_test_ldadd) +src_std_resources_sem_test_cond_pthread_compare_LDADD = $(local_test_ldadd) +src_std_resources_sem_test_simple_sem_LDADD = $(local_test_ladd) diff --git a/src/timer/test/module.mk.in b/src/timer/test/module.mk.in deleted file mode 100644 index ee276da..0000000 --- a/src/timer/test/module.mk.in +++ /dev/null @@ -1,8 +0,0 @@ -DIR := src/timer/test - -AETESTSRC += $(DIR)/timer1.ae \ - $(DIR)/pthread-compare.ae \ - $(DIR)/timer2.ae \ - $(DIR)/timer-cancel.ae - -MODLIBS_$(DIR)/pthread-compare = -lpthread diff --git a/src/timer/test/pthread-compare.ae b/src/timer/test/pthread-compare.ae deleted file mode 100644 index bdf26a7..0000000 --- a/src/timer/test/pthread-compare.ae +++ /dev/null @@ -1,113 +0,0 @@ -/* - * (C) 2009 The University of Chicago - * - * See COPYRIGHT in top-level directory. - */ - -#include <unistd.h> -#include <sys/time.h> - -#include <aesop/aesop.h> -#include <aesop/timer.hae> - -triton_mutex_t mutex = TRITON_MUTEX_INITIALIZER; - -static __blocking int triton_dosleep(void) -{ - pwait - { - int i; - - for(i = 0; i < 1000; ++i) - { - pbranch - { - aesop_timer(1000); - } - } - } - - return 0; -} - -static void *threadfun(void *cb) -{ - sleep(1); - return NULL; -} - -static void thread_dosleep(void) -{ - int i, ret; - void *val; - pthread_t tid[100]; - for(i = 0; i < 100; ++i) - { - ret = pthread_create(&tid[i], NULL, threadfun, NULL); - if(ret != 0) - { - perror("pthread_create failed!\n"); - assert(ret == 0); - } - } - - for(i = 0; i < 100; ++i) - { - pthread_join(tid[i], &val); - } - - return; -} - - - -__blocking int aesop_main(int argc, char **argv) -{ - int ret; - struct timeval t1, t2, diff; - - ret = aesop_timer_init(); - if(ret != 0) - { - fprintf(stderr, "Error: failed to init.\n"); - return(ret); - } - - gettimeofday(&t1, NULL); - ret = triton_dosleep(); - gettimeofday(&t2, NULL); - diff.tv_sec = t2.tv_sec - t1.tv_sec; - diff.tv_usec = t2.tv_usec - t1.tv_usec; - if(t2.tv_usec < t1.tv_usec) - { - diff.tv_sec--; - diff.tv_usec += 1e6; - } - printf("aesop time: %d.%06d secs\n", (int)diff.tv_sec, (int)diff.tv_usec); - - gettimeofday(&t1, NULL); - thread_dosleep(); - gettimeofday(&t2, NULL); - diff.tv_sec = t2.tv_sec - t1.tv_sec; - diff.tv_usec = t2.tv_usec - t1.tv_usec; - if(t2.tv_usec < t1.tv_usec) - { - diff.tv_sec--; - diff.tv_usec += 1e6; - } - printf("thread time: %d.%06d secs\n", (int)diff.tv_sec, (int)diff.tv_usec); - - aesop_timer_finalize(); - return ret; -} - -aesop_main_set(aesop_main); - -/* - * Local variables: - * c-indent-level: 4 - * c-basic-offset: 4 - * End: - * - * vim: ft=c ts=8 sts=4 sw=4 expandtab - */ diff --git a/src/timer/test/timer-cancel.ae b/src/timer/test/timer-cancel.ae deleted file mode 100644 index 9eeb97e..0000000 --- a/src/timer/test/timer-cancel.ae +++ /dev/null @@ -1,65 +0,0 @@ -/* - * (C) 2009 The University of Chicago - * - * See COPYRIGHT in top-level directory. - */ - - -#include <stdio.h> -#include <aesop/aesop.h> -#include <aesop/timer.hae> - -static __blocking int dotimer(void) -{ - pwait - { - pbranch - { - printf("sleeping for 10 s\n"); - aesop_timer(10000); - printf("10 s done.\n"); - } - - pbranch - { - printf("sleeping for 1 s\n"); - aesop_timer(1000); - printf("1 s done.\n"); - - /* shut down the other timer */ - printf("canceling other branch\n"); - aesop_cancel_branches(); - printf("cancel done\n"); - - } - } - return 0; -} - -__blocking int aesop_main(int argc, char **argv) -{ - int ret; - - ret = aesop_timer_init(); - if(ret != 0) - { - fprintf(stderr, "Error: failed to init.\n"); - return(ret); - } - - ret = dotimer(); - - aesop_timer_finalize(); - return ret; -} - -aesop_main_set(aesop_main); - -/* - * Local variables: - * c-indent-level: 4 - * c-basic-offset: 4 - * End: - * - * vim: ft=c ts=8 sts=4 sw=4 expandtab - */ diff --git a/src/timer/test/timer1.ae b/src/timer/test/timer1.ae deleted file mode 100644 index ea86244..0000000 --- a/src/timer/test/timer1.ae +++ /dev/null @@ -1,65 +0,0 @@ -/* - * (C) 2009 The University of Chicago - * - * See COPYRIGHT in top-level directory. - */ - - -#include <stdio.h> -#include <aesop/aesop.h> -#include <aesop/timer.hae> - -static __blocking int dotimer(void) -{ - pwait - { - pbranch - { - printf("sleeping for 100 ms\n"); - aesop_timer(100); - printf("100 ms done.\n"); - } - - pbranch - { - printf("sleeping for 1000 ms\n"); - aesop_timer(1000); - printf("1000 ms done.\n"); - } - - pbranch - { - printf("sleeping for 10 ms\n"); - aesop_timer(10); - printf("10 ms done.\n"); - } - } - return 0; -} - -__blocking int aesop_main(int argc, char **argv) -{ - int ret; - - ret = aesop_timer_init(); - if(ret != 0) - { - fprintf(stderr, "Error: failed to init.\n"); - return(ret); - } - - ret = dotimer(); - - aesop_timer_finalize(); - return ret; -} - -aesop_main_set(aesop_main); -/* - * Local variables: - * c-indent-level: 4 - * c-basic-offset: 4 - * End: - * - * vim: ft=c ts=8 sts=4 sw=4 expandtab - */ diff --git a/src/timer/test/timer2.ae b/src/timer/test/timer2.ae deleted file mode 100644 index a6ba316..0000000 --- a/src/timer/test/timer2.ae +++ /dev/null @@ -1,74 +0,0 @@ -/* - * (C) 2009 The University of Chicago - * - * See COPYRIGHT in top-level directory. - */ - - -#include <stdio.h> -#include <aesop/aesop.h> -#include <aesop/timer.hae> - -int exit_loop = 0; - -static __blocking int receiver() -{ - int i = 0; - printf("receiver\n"); - - pwait - { - pbranch - { - while(!exit_loop) - { - printf("recving...\n"); - aesop_timer(100); - } - } - pbranch - { - while(!exit_loop) - { - printf("sleeping...\n"); - aesop_timer(100); - if (i++ == 10) - { - exit_loop = 1; - } - printf("iter=%i\n", i); - } - } - } - - return 0; -} - -__blocking int aesop_main(int argc, char **argv) -{ - int ret; - - ret = aesop_timer_init(); - if(ret != 0) - return(ret); - - printf("ready\n"); - - ret = receiver(); - - printf("done\n"); - - aesop_timer_finalize(); - return ret; -} - -aesop_main_set(aesop_main); - -/* - * Local variables: - * c-indent-level: 4 - * c-basic-offset: 4 - * End: - * - * vim: ft=c ts=8 sts=4 sw=4 expandtab - */ diff --git a/src/timer/timer.ae b/src/timer/timer.ae deleted file mode 100644 index fa0f63e..0000000 --- a/src/timer/timer.ae +++ /dev/null @@ -1,225 +0,0 @@ -/* - * (C) 2009 The University of Chicago - * - * See COPYRIGHT in top-level directory. - */ - -#include <sys/time.h> - -#include <aesop/timer.hae> -#include <triton-list.h> -#include <aesop/sem.hae> -#include <pthread.h> - -static pthread_t tid; -static triton_mutex_t module_lock = TRITON_MUTEX_INITIALIZER; -static int module_refcount = 0; -static triton_mutex_t timer_mutex = TRITON_MUTEX_INITIALIZER; -static triton_cond_t timer_cond = TRITON_COND_INITIALIZER; -static TRITON_LIST_DEFINE(timer_queue); -static int shutting_down = 0; - -static void* thread_fn(void* foo); - -struct timer_obj -{ - struct timeval expire; - aesop_sem_t sem; - triton_list_link_t link; -}; - -/** - * run a timer for the specified number of milliseconds - * \return 0 on success, -ECANCELED if canceled - */ -__blocking int aesop_timer(int millisecs) -{ - struct timer_obj* tm; - struct timeval adjust, now; - struct timer_obj *pos, *scratch, *holder; - int ret; - - tm = malloc(sizeof(*tm)); - if(!tm) - { - return(AE_ERR_NOMEM); - } - aesop_sem_init(&tm->sem, 0); - triton_list_link_clear(&tm->link); - - /* calculate when this timer will expire */ - adjust.tv_sec = (int)(millisecs / 1e3); - adjust.tv_usec = (millisecs % 1000) * 1e3; - gettimeofday(&now, NULL); - timeradd(&adjust, &now, &(tm->expire)); - - triton_mutex_lock(&timer_mutex); - - /* Insert this timer in the list in ascending order. Search backwards - * through the queue because newly posted timers are more likely to be - * at the end of the queue. - */ - holder = NULL; - triton_list_for_each_entry_reverse(pos, scratch, &timer_queue, struct timer_obj, link) - { - if(timercmp(&(pos->expire), &(tm->expire), <)) - { - break; - } - holder = pos; - } - if(holder) - triton_list_insert_before(&tm->link, &holder->link, &timer_queue); - else - triton_list_add_back(&tm->link, &timer_queue); - - /* detect if we are the new head or not */ - if(triton_list_peek_front(&timer_queue) == &tm->link) - { - /* if so, wake up the worker thread so that it can adjust its - * timeout - */ - triton_cond_signal(&timer_cond); - } - triton_mutex_unlock(&timer_mutex); - - /* sleep until the worker thread signals that this timer has expired */ - ret = aesop_sem_down(&tm->sem); - - triton_mutex_lock(&timer_mutex); - /* See if we need to remove this from the timer queue or not. If - * operation was cancelled then the progress engine (thread_fn) may not - * find the operation. - */ - if(triton_list_return_list(&tm->link)) - triton_list_del(&tm->link); - /* Note that we do not need to signal the thread_fn. In the worst case - * it will simply wake up too early and find nothing to do. - */ - triton_mutex_unlock(&timer_mutex); - - free(tm); - - return ret; -} - -int aesop_timer_init(void) -{ - int ret; - - triton_mutex_lock(&module_lock); - - if(!module_refcount) - { - ret = aesop_sem_module_init(); - if(ret != 0) - { - triton_mutex_unlock(&module_lock); - return(ret); - } - ret = pthread_create(&tid, NULL, thread_fn, NULL); - if(ret != 0) - { - aesop_sem_module_finalize(); - triton_mutex_unlock(&module_lock); - return AE_ERR_SYSTEM; - } - } - module_refcount++; - triton_mutex_unlock(&module_lock); - - return AE_SUCCESS; -} - -void aesop_timer_finalize(void) -{ - triton_mutex_lock(&module_lock); - module_refcount--; - - if(!module_refcount) - { - triton_mutex_lock(&timer_mutex); - shutting_down = 1; - triton_cond_signal(&timer_cond); - triton_mutex_unlock(&timer_mutex); - - pthread_join(tid, NULL); - aesop_sem_module_finalize(); - } - triton_mutex_unlock(&module_lock); - - return; -} - -static void* thread_fn(void* foo) -{ - triton_list_link_t* head_link; - struct timer_obj* tm; - struct timeval now; - struct timespec abstime; - - triton_mutex_lock(&timer_mutex); - while(!shutting_down) - { - /* look for expired timers */ - head_link = triton_list_del_front(&timer_queue); - while(head_link) - { - tm = triton_list_get_entry(head_link, struct timer_obj, link); - - gettimeofday(&now, NULL); - if(timercmp(&(tm->expire), &now, <)) - { - /* expired; up semaphore */ - triton_mutex_unlock(&timer_mutex); - aesop_sem_up(&tm->sem); - triton_mutex_lock(&timer_mutex); - } - else - { - /* head item has not expired, put back on queue */ - triton_list_add_front(&tm->link, &timer_queue); - break; - } - head_link = triton_list_del_front(&timer_queue); - } - - /* NOTE: we check shutdown flag again after exiting the above loop; - * it could have been set while the mutex was dropped around the - * aesop_sem_up() call. - */ - if(!shutting_down) - { - if(triton_list_empty(&timer_queue)) - { - /* if there is nothing on the queue, then sleep indefinitely */ - triton_cond_wait(&timer_cond, &timer_mutex); - } - else - { - /* otherwise sleep until the next timer expires */ - head_link = triton_list_peek_front(&timer_queue); - assert(head_link); - tm = triton_list_get_entry(head_link, struct timer_obj, link); - - abstime.tv_sec = tm->expire.tv_sec; - abstime.tv_nsec = (long)tm->expire.tv_usec * (long)1000; - triton_cond_timedwait(&timer_cond, &timer_mutex, &abstime); - } - } - } - - shutting_down = 0; - triton_mutex_unlock(&timer_mutex); - - return(NULL); -} - -/* - * Local variables: - * c-indent-level: 4 - * c-basic-offset: 4 - * End: - * - * vim: ft=c ts=8 sts=4 sw=4 expandtab - */ diff --git a/src/timer/timer.hae b/src/timer/timer.hae deleted file mode 100644 index eeae1a5..0000000 --- a/src/timer/timer.hae +++ /dev/null @@ -1,33 +0,0 @@ -/* - * (C) 2009 The University of Chicago - * - * See COPYRIGHT in top-level directory. - */ - -#ifndef __TRITON_TIMER_HAE__ -#define __TRITON_TIMER_HAE__ - -#include <errno.h> - -#include <aesop/aesop.h> - -/** - * run a timer for the specified number of milliseconds - * \return 0 on success, -ECANCELED if canceled - */ -__blocking int aesop_timer(int millisecs); - -int aesop_timer_init(void); -void aesop_timer_finalize(void); - -#endif - - -/* - * Local variables: - * c-indent-level: 4 - * c-basic-offset: 4 - * End: - * - * vim: ft=c ts=8 sts=4 sw=4 expandtab - */ hooks/post-receive --

1 0

ASG plugin for IOR
by Phil Carns 10 Jun '14

10 Jun '14

Hi all, In case anyone is interested, an initial cut at an ASG backend for the IOR benchmark is now available in this repo: git clone [email protected]:asg/ior Some notes are in the README.ASG file at the top level. It's not a complete implementation by any means, but it is enough to at least run some very simple configurations. The documentation and autoconf logic only shows how to link it against Triton, but in theory it could be linked to any ASG implementation with minimal change. The code is based directly off of the IOR tree from github and I did not make any changes to the core logic. The ASG back end fits in just like any of the other IOR back ends alongside posix, mpiio, pnetcdf, and hdf5. Here is an example running it on my laptop. Please ignore the performance of course- my laptop isn't a particularly interesting HPC platform :) # start a server $ ./triton-server --conf ~/triton-confs/1.conf --listenaddr tcp://localhost:3344 [14:25:23.603714 info]: Server using configuration file /home/pcarns/triton-confs/1.conf # confirm an empty Triton storage system $ ./triton-ls tcp://localhost:3344 Objects on server ::3344 (tcp://localhost:3344): # run IOR, file-per-proc mode, 128 MiB total per node, 16 MiB access size, write only $ mpiexec -n 4 ./ior -f ~/triton-confs/ior-uniq.conf > ior-output.log Commencing write performance test: Tue Jun 10 14:25:53 2014 WARNING: ASG aiori cannot properly confirm object size yet. # check performance $ grep "Max Write" ior-output.log Max Write: 124.02 MiB/sec (130.04 MB/sec) # confirm that 4 objects were written $ ./triton-ls tcp://localhost:3344 Objects on server ::3344 (tcp://localhost:3344): 1341:88ea:cf70:fc57::1 1341:88ea:cf70:fc58::1 1341:88ea:cf70:fc59::1 1341:88ea:cf70:fc5a::1 # check the underlying storage too $ ls -alh /tmp/triton-server-tcp\:localhost\:3344-data/ total 517M drwxr-xr-x 2 pcarns pcarns 4.0K Jun 10 14:25 . drwxrwxrwt 17 root root 4.3M Jun 10 14:26 .. -rw------- 1 pcarns pcarns 129M Jun 10 14:25 1341:88ea:cf70:fc57::1.dat -rw------- 1 pcarns pcarns 129M Jun 10 14:25 1341:88ea:cf70:fc58::1.dat -rw------- 1 pcarns pcarns 129M Jun 10 14:25 1341:88ea:cf70:fc59::1.dat -rw------- 1 pcarns pcarns 129M Jun 10 14:25 1341:88ea:cf70:fc5a::1.dat The file names are mapped to objects by hashing them (using a simplistic hash; the IDs tend to be bunched up as you can see above), and the "create" and "close" steps don't actually do much of anything except attach to the storage system. I have not filled in read or size checking logic. I'll work on filling in more of the implementation as time permits; I just wanted to share what I have so far. This code might also suggest some gaps in our API. There are a few IOR features that don't easily map to ASG functionality. We'll try to keep track of those; this might be a reasonable test platform for some API extension experiments at some point. thanks, -Phil

1 0

weekly report
by jingxuan 09 Jun '14

09 Jun '14

Hi, everyone, Last week, we were working on the modification for our security prototype,especially on the fault-tolerance which will last for the next few weeks. Jingxuan SUN Holcombe Department of Electrical and Computer Engineering Clemson University Tel:864-643-8210 Email: jingxus(a)g.clemson.edu

1 0

ANL Weekly Status - 20140609
by Harms, Kevin N. 09 Jun '14

09 Jun '14

Triton: * continue work on ASG API implementation * added asg_probe_object, asg_probe_fork support * directory/file listing now works with asg_fuse_client * continue investigation of porting IOR onto ASG interface * continue research into provenance schemes and how they might fist ASG/Triton Simulation: * sent Haiying's team example Amazon and Mira file size data * continue work on running epidemic protocol simulations In general working to finish out June deliverables. kevin

1 0

TAMU update
by Gim Jongmin 09 Jun '14

09 Jun '14

Dear All, Last week, we debugged some critical errors caused by new dir cache. This work has been done with old version APIs. This work will be ported to new library. Thanks, Jongmin -- Jongmin Gim Post-Doctoral Research Associate Dept. of Elecrical and Computer Enginerring Texas A&M University 333D Wisenbaker College Station, TX 77843-3259 Phone: 979-587-8311

1 0

Weekly report
by guoxinl＠clemson.edu 09 Jun '14

09 Jun '14

Dear all, In the last week, we were implementing our hierarchical DHT overlay on our distributed simulator to quickly find files when the files can be moved to and stored anywhere. Best Regards! Guoxin Liu PHD Candidate ECE, Clemson University

1 0

20140609 - Sandia Status
by Danielson, Geoffrey Charles 09 Jun '14

09 Jun '14

All, last week, Sandia worked to debug our localstore implementation. Regards, Geoff Danielson Geoffrey.Danielson(a)hp.com gcdanie(a)sandia.gov Cell: (505) 263-0751

2 1

weekly report
by jingxuan 02 Jun '14

02 Jun '14

Hi, Everyone, last week, we finished and uploaded our deliverable”validation of prototype secure protocol:actual and predicted performance”. This week, we began working on analyzing fault-tolerance of our prototype for the next deliverable. Jingxuan SUN Holcombe Department of Electrical and Computer Engineering Clemson University Tel:864-643-8210 Email: jingxus(a)g.clemson.edu

1 0

TAMU update
by Gim Jongmin 02 Jun '14

02 Jun '14

Dear All, We are writing the code for preventing hash collision. We want to maintain the cache structure we have used, LHASH, jenkins hashing algorithm. Because LHASH only allocates memory for entries, NOT fixed size table, we maintains multiple hash table headers which have 0 size table. If collision happens, filesystem occupies 1 entry to other hash table header. The details will be reported in document with results. Sincerely, Jongmin -- Jongmin Gim Post-Doctoral Research Associate Dept. of Elecrical and Computer Enginerring Texas A&M University 333D Wisenbaker College Station, TX 77843-3259 Phone: 979-587-8311

1 0

slides for today's conference call (June 2)
by Phil Carns 02 Jun '14

02 Jun '14

Hi everyone, Here are the slides that we will use for ANL's status update presentation in today's call. It is fairly high level so that we can touch on several topics, but feel free to ask questions during the call if you would like to dive in further on any of them. thanks, -Phil

1 0