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

C-Utils Repository branch, master, updated. d907964b6074e401fa34635e956141e26b391087
by noreply＠mcs.anl.gov 26 Mar '12

26 Mar '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 "C-Utils Repository". The branch, master has been updated via d907964b6074e401fa34635e956141e26b391087 (commit) via 96d0e25d29e2a26e31aa434264359ded02bab34a (commit) from 33877b08245dc805447c83fcdf349a4cab227031 (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 d907964b6074e401fa34635e956141e26b391087 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Mon Mar 26 20:39:43 2012 -0400 fix copyright notices and editor directives commit 96d0e25d29e2a26e31aa434264359ded02bab34a Author: Phil Carns <carns(a)mcs.anl.gov> Date: Mon Mar 26 20:34:18 2012 -0400 add COPYRIGHT notice ----------------------------------------------------------------------- Summary of changes: COPYRIGHT | 34 ++++++++++++++++++++++++++++++++++ triton-base.h | 15 +++++++++++++++ triton-hash.h | 7 ++++--- triton-list.h | 8 +++++++- triton-string.c | 15 +++++++++++++++ triton-string.h | 15 +++++++++++++++ triton-uint128.h | 8 +++++++- 7 files changed, 97 insertions(+), 5 deletions(-) create mode 100644 COPYRIGHT Diff of changes: diff --git a/COPYRIGHT b/COPYRIGHT new file mode 100644 index 0000000..3c5bfd8 --- /dev/null +++ b/COPYRIGHT @@ -0,0 +1,34 @@ + + COPYRIGHT + +The following is a notice of limited availability of the code, and disclaimer +which must be included in the prologue of the code and in all source listings +of the code. + +Copyright Notice + + 2009 University of Chicago + +Permission is hereby granted to use, reproduce, prepare derivative works, and +to redistribute to others. This software was authored by: + +Mathematics and Computer Science Division +Argonne National Laboratory, Argonne IL 60439 + + + GOVERNMENT LICENSE + +Portions of this material resulted from work developed under a U.S. +Government Contract and are subject to the following license: the Government +is granted for itself and others acting on its behalf a paid-up, nonexclusive, +irrevocable worldwide license in this computer software to reproduce, prepare +derivative works, and perform publicly and display publicly. + + DISCLAIMER + +This computer code material was prepared, in part, as an account of work +sponsored by an agency of the United States Government. Neither the United +States, nor the University of Chicago, nor any of their employees, makes any +warranty express or implied, or assumes any legal liability or responsibility +for the accuracy, completeness, or usefulness of any information, apparatus, +product, or process disclosed, or represents that its use would not infringe +privately owned rights. diff --git a/triton-base.h b/triton-base.h index 3a81bc0..121ce96 100644 --- a/triton-base.h +++ b/triton-base.h @@ -1,3 +1,9 @@ +/* + * (C) 2009 The University of Chicago + * + * See COPYRIGHT in top-level directory. + */ + #ifndef __TRITON_BASE_H__ #define __TRITON_BASE_H__ @@ -120,3 +126,12 @@ #define SREPEAT(x,i) SREPEAT_(x,i) #endif /* __TRITON_BASE_H__ */ + +/* + * Local variables: + * c-indent-level: 4 + * c-basic-offset: 4 + * End: + * + * vim: ft=c ts=8 sts=4 sw=4 expandtab + */ diff --git a/triton-hash.h b/triton-hash.h index df633b3..b053bf3 100644 --- a/triton-hash.h +++ b/triton-hash.h @@ -1,6 +1,7 @@ -/* 2001 Clemson University and The University of Chicago +/* + * (C) 2009 The University of Chicago * - * See COPYING in top-level directory. + * See COPYRIGHT in top-level directory. */ #ifndef TRITON_HASH_H @@ -431,5 +432,5 @@ static inline int triton_hash_ptr_hash(const void *k, int table_size) * c-basic-offset: 4 * End: * - * vim: ts=8 sts=4 sw=4 expandtab + * vim: ft=c ts=8 sts=4 sw=4 expandtab */ diff --git a/triton-list.h b/triton-list.h index 1897491..30f689f 100644 --- a/triton-list.h +++ b/triton-list.h @@ -1,3 +1,9 @@ +/* + * (C) 2009 The University of Chicago + * + * See COPYRIGHT in top-level directory. + */ + #ifndef __TRITON_LIST_H__ #define __TRITON_LIST_H__ @@ -303,5 +309,5 @@ static inline struct triton_list_link * triton_list_peek_front ( * c-basic-offset: 4 * End: * - * vim: ts=8 sts=4 sw=4 expandtab + * vim: ft=c ts=8 sts=4 sw=4 expandtab */ diff --git a/triton-string.c b/triton-string.c index 796e236..1d2d683 100644 --- a/triton-string.c +++ b/triton-string.c @@ -1,4 +1,19 @@ +/* + * (C) 2009 The University of Chicago + * + * See COPYRIGHT in top-level directory. + */ + #include "triton-string.h" triton_string_t triton_string_null = { .size = 0, .string = NULL, .const_string = 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/triton-string.h b/triton-string.h index 511662f..cf64654 100644 --- a/triton-string.h +++ b/triton-string.h @@ -1,3 +1,9 @@ +/* + * (C) 2009 The University of Chicago + * + * See COPYRIGHT in top-level directory. + */ + #ifndef __TRITON_STRING_H__ #define __TRITON_STRING_H__ @@ -186,3 +192,12 @@ static inline int triton_string_hash(void *k, int table_size) } #endif + +/* + * Local variables: + * c-indent-level: 4 + * c-basic-offset: 4 + * End: + * + * vim: ft=c ts=8 sts=4 sw=4 expandtab + */ diff --git a/triton-uint128.h b/triton-uint128.h index 8482707..10184a6 100644 --- a/triton-uint128.h +++ b/triton-uint128.h @@ -1,3 +1,9 @@ +/* + * (C) 2009 The University of Chicago + * + * See COPYRIGHT in top-level directory. + */ + #ifndef __TRITON_UINT128_H__ #define __TRITON_UINT128_H__ @@ -89,5 +95,5 @@ static inline int triton_cmp_uint128(uint128_t a, uint128_t b) * c-basic-offset: 4 * End: * - * vim: ts=8 sts=4 sw=4 expandtab + * vim: ft=c ts=8 sts=4 sw=4 expandtab */ hooks/post-receive -- C-Utils Repository

1 0

C-Utils Repository branch, master, updated. 33877b08245dc805447c83fcdf349a4cab227031
by noreply＠mcs.anl.gov 26 Mar '12

26 Mar '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 "C-Utils Repository". The branch, master has been updated via 33877b08245dc805447c83fcdf349a4cab227031 (commit) from 7f4af54f5af9a97f346cfb1d8fc122b1f2203178 (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 33877b08245dc805447c83fcdf349a4cab227031 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Mon Mar 26 16:55:37 2012 -0400 don't install headers from c-utils for now ----------------------------------------------------------------------- Summary of changes: Makefile.in | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) Diff of changes: diff --git a/Makefile.in b/Makefile.in index fd50394..349fcbc 100644 --- a/Makefile.in +++ b/Makefile.in @@ -298,15 +298,5 @@ etags: | xargs etags install:: all - install -d $(bindir) install -d $(libdir) - install -d $(includedir) install -m 644 libc-utils.* $(libdir) - install -m 644 $(srcdir)/triton-thread.h $(includedir) - install -m 644 $(srcdir)/triton-list.h $(includedir) - install -m 644 $(srcdir)/jenkins-hash.h $(includedir) - install -m 644 $(srcdir)/triton-hash.h $(includedir) - install -m 644 $(srcdir)/triton-uint128.h $(includedir) - install -m 644 $(srcdir)/triton-string.h $(includedir) - install -m 644 $(srcdir)/triton-base.h $(includedir) - install -m 644 c-utils-config.h $(includedir) hooks/post-receive -- C-Utils Repository

1 0

C-Utils Repository branch, master, updated. 7f4af54f5af9a97f346cfb1d8fc122b1f2203178
by noreply＠mcs.anl.gov 26 Mar '12

26 Mar '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 "C-Utils Repository". The branch, master has been updated via 7f4af54f5af9a97f346cfb1d8fc122b1f2203178 (commit) from 712c3fb64e02d7a92cb8aa6043c363f78f9e8a2f (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 7f4af54f5af9a97f346cfb1d8fc122b1f2203178 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Mon Mar 26 15:23:32 2012 -0400 make triton-uint128.h able to stand alone ----------------------------------------------------------------------- Summary of changes: triton-uint128.h | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) Diff of changes: diff --git a/triton-uint128.h b/triton-uint128.h index abb598f..8482707 100644 --- a/triton-uint128.h +++ b/triton-uint128.h @@ -3,8 +3,7 @@ #include <stdio.h> #include <assert.h> - -#include "triton-base.h" +#include <stdint.h> /* unsigned 128 bit integer type */ typedef struct { uint64_t l; uint64_t u; } uint128_t; @@ -25,6 +24,19 @@ typedef struct { uint64_t l; uint64_t u; } uint128_t; */ #define TRITON_UINT128_STRLEN 42 +/* this version relies on less-portable system definitions */ +#ifndef llu +#if __WORDSIZE == 64 +# define llu(x) (unsigned long long)(x) +# define lld(x) (long long)(x) +# define SCANF_lld ld +#else +# define llu(x) (x) +# define lld(x) (x) +# define SCANF_lld lld +#endif +#endif + /* convert to string in uint64_t:uint64_t format (for now) */ static inline void triton_uint128_to_string(char* buf, int buflen, uint128_t big) { hooks/post-receive -- C-Utils Repository

1 0

C-Utils Repository branch, master, updated. 712c3fb64e02d7a92cb8aa6043c363f78f9e8a2f
by noreply＠mcs.anl.gov 26 Mar '12

26 Mar '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 "C-Utils Repository". The branch, master has been updated via 712c3fb64e02d7a92cb8aa6043c363f78f9e8a2f (commit) from aa01f6f32835adb1f8ef1ab593c74e452449430f (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 712c3fb64e02d7a92cb8aa6043c363f78f9e8a2f Author: Phil Carns <carns(a)mcs.anl.gov> Date: Mon Mar 26 14:54:15 2012 -0400 temporarily break config.h dependency ----------------------------------------------------------------------- Summary of changes: triton-base.h | 23 ++++++++++++++++++----- 1 files changed, 18 insertions(+), 5 deletions(-) Diff of changes: diff --git a/triton-base.h b/triton-base.h index 9602b6b..3a81bc0 100644 --- a/triton-base.h +++ b/triton-base.h @@ -1,8 +1,6 @@ #ifndef __TRITON_BASE_H__ #define __TRITON_BASE_H__ -#include "c-utils-config.h" - /** * triton-base.h includes important system headers and defines appropriate * macros used throughout. @@ -20,9 +18,6 @@ /* older systems have malloc in separate header */ #include <stdlib.h> -#ifdef HAVE_MALLOC_H -#include <malloc.h> -#endif /* basic system headers */ #include <stdint.h> @@ -32,6 +27,8 @@ #include <assert.h> /* macros for portable printing of 64 bit values */ +#if 0 +/* this version relies on configure-time results in config.h */ #ifndef llu #if SIZEOF_LONG_INT == 4 # define llu(x) (x) @@ -45,6 +42,22 @@ # error Unexpected sizeof(long int) #endif #endif +#else + +/* this version relies on less-portable system definitions */ +#ifndef llu +#if __WORDSIZE == 64 +# define llu(x) (unsigned long long)(x) +# define lld(x) (long long)(x) +# define SCANF_lld ld +#else +# define llu(x) (x) +# define lld(x) (x) +# define SCANF_lld lld +#endif +#endif + +#endif /* set of macros that allow us to count the number * of arguments passed into a CPP macro that takes hooks/post-receive -- C-Utils Repository

1 0

C-Utils Repository branch, master, updated. aa01f6f32835adb1f8ef1ab593c74e452449430f
by noreply＠mcs.anl.gov 26 Mar '12

26 Mar '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 "C-Utils Repository". The branch, master has been updated via aa01f6f32835adb1f8ef1ab593c74e452449430f (commit) from e4d1f589cf370787f8d62aedf5887251c0d0ab81 (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 aa01f6f32835adb1f8ef1ab593c74e452449430f Author: Phil Carns <carns(a)mcs.anl.gov> Date: Mon Mar 26 14:26:40 2012 -0400 untangling some headers in c-utils ----------------------------------------------------------------------- Summary of changes: triton-list.h | 3 ++- triton-string.h | 5 +++++ triton-thread.h | 2 -- 3 files changed, 7 insertions(+), 3 deletions(-) Diff of changes: diff --git a/triton-list.h b/triton-list.h index 608c9d9..1897491 100644 --- a/triton-list.h +++ b/triton-list.h @@ -1,7 +1,8 @@ #ifndef __TRITON_LIST_H__ #define __TRITON_LIST_H__ -#include "triton-base.h" +#include <stdint.h> +#include <assert.h> typedef struct triton_list triton_list_t; diff --git a/triton-string.h b/triton-string.h index e8b7179..511662f 100644 --- a/triton-string.h +++ b/triton-string.h @@ -1,6 +1,11 @@ #ifndef __TRITON_STRING_H__ #define __TRITON_STRING_H__ +#include <stdarg.h> +#include <stdlib.h> +#include <string.h> +#include <assert.h> + #include "jenkins-hash.h" #include "triton-thread.h" diff --git a/triton-thread.h b/triton-thread.h index bf14f61..73c0dd2 100644 --- a/triton-thread.h +++ b/triton-thread.h @@ -1,8 +1,6 @@ #ifndef __TRITON_THREAD_H__ #define __TRITON_THREAD_H__ -#include "triton-base.h" - #ifdef __TRITON_POSIX_LOCKING__ #include <pthread.h> hooks/post-receive -- C-Utils Repository

1 0

Triton-private Repository branch, master, updated. 373bcb09b9cb7d203c50de9c87063d8ec58ec5f1
by noreply＠mcs.anl.gov 22 Mar '12

22 Mar '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 "Triton-private Repository". The branch, master has been updated via 373bcb09b9cb7d203c50de9c87063d8ec58ec5f1 (commit) from dea32ecc4756ced6307d7e9820858917f92aa043 (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 373bcb09b9cb7d203c50de9c87063d8ec58ec5f1 Author: Dries Kimpe <dkimpe(a)mcs.anl.gov> Date: Thu Mar 22 16:52:55 2012 -0500 Triton overview paper ----------------------------------------------------------------------- Summary of changes: .../{2011/aesop => triton-overview}/IEEEtran.bst | 0 .../{2011/aesop => triton-overview}/IEEEtran.cls | 0 papers/triton-overview/Makefile | 17 +++++++++++++ papers/triton-overview/README | 2 + .../{2011/aesop => triton-overview}/REFERENCES.bib | 0 .../{2011/aesop => triton-overview}/bibspacing.sty | 0 .../aesop/aesop.bib => triton-overview/triton.bib} | 0 .../aesop/aesop.tex => triton-overview/triton.tex} | 25 ++----------------- 8 files changed, 22 insertions(+), 22 deletions(-) copy papers/{2011/aesop => triton-overview}/IEEEtran.bst (100%) copy papers/{2011/aesop => triton-overview}/IEEEtran.cls (100%) create mode 100644 papers/triton-overview/Makefile create mode 100644 papers/triton-overview/README copy papers/{2011/aesop => triton-overview}/REFERENCES.bib (100%) copy papers/{2011/aesop => triton-overview}/bibspacing.sty (100%) copy papers/{2011/aesop/aesop.bib => triton-overview/triton.bib} (100%) copy papers/{2011/aesop/aesop.tex => triton-overview/triton.tex} (95%) Diff of changes: diff --git a/papers/2011/aesop/IEEEtran.bst b/papers/triton-overview/IEEEtran.bst similarity index 100% copy from papers/2011/aesop/IEEEtran.bst copy to papers/triton-overview/IEEEtran.bst diff --git a/papers/2011/aesop/IEEEtran.cls b/papers/triton-overview/IEEEtran.cls similarity index 100% copy from papers/2011/aesop/IEEEtran.cls copy to papers/triton-overview/IEEEtran.cls diff --git a/papers/triton-overview/Makefile b/papers/triton-overview/Makefile new file mode 100644 index 0000000..9731ad8 --- /dev/null +++ b/papers/triton-overview/Makefile @@ -0,0 +1,17 @@ +BASE=triton +BASEPDF=$(addsuffix .pdf,$(BASE)) + +all: $(BASEPDF) + @ echo REMAINING TODO ITEMS: `grep TODO *.tex | wc -l` + + +.phony: figures +figures: + #make -C fig + +%.pdf: %.tex figures + TEXMFOUTPUT=`pwd` rubber -d $< # || (rm $@; exit 1) + +clean:: + rubber -d --clean $(BASE) + diff --git a/papers/triton-overview/README b/papers/triton-overview/README new file mode 100644 index 0000000..16439d1 --- /dev/null +++ b/papers/triton-overview/README @@ -0,0 +1,2 @@ +Triton overview paper + diff --git a/papers/2011/aesop/REFERENCES.bib b/papers/triton-overview/REFERENCES.bib similarity index 100% copy from papers/2011/aesop/REFERENCES.bib copy to papers/triton-overview/REFERENCES.bib diff --git a/papers/2011/aesop/bibspacing.sty b/papers/triton-overview/bibspacing.sty similarity index 100% copy from papers/2011/aesop/bibspacing.sty copy to papers/triton-overview/bibspacing.sty diff --git a/papers/2011/aesop/aesop.bib b/papers/triton-overview/triton.bib similarity index 100% copy from papers/2011/aesop/aesop.bib copy to papers/triton-overview/triton.bib diff --git a/papers/2011/aesop/aesop.tex b/papers/triton-overview/triton.tex similarity index 95% copy from papers/2011/aesop/aesop.tex copy to papers/triton-overview/triton.tex index 7620496..8de2876 100644 --- a/papers/2011/aesop/aesop.tex +++ b/papers/triton-overview/triton.tex @@ -139,29 +139,9 @@ distributed system software development models while at the same time reducing code complexity and enhancing developer productivity. \end{abstract} -\section{Introduction} -\input{intro} -%% -\input{context} -\input{related} -\section{Programming Model} - -\input{model} - -\section{Implementation} - -\input{implementation} - -\section{Evaluation} - -\input{evaluation} - -\section{Conclusions} - -\input {conclusion} \section*{Acknowledgments} %The authors would like to thank the Peops. @@ -201,8 +181,9 @@ Laboratory Computing Resource Center at Argonne National Laboratory. %\begin{spacing}{0.5} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %\bibliographystyle{splncs03} -\bibliographystyle{IEEEtran} -\bibliography{aesop,REFERENCES} + +%\bibliographystyle{IEEEtran} +%\bibliography{triton,REFERENCES} \newpage The submitted manuscript has been created by UChicago Argonne, LLC, hooks/post-receive -- Triton-private Repository

1 0

Triton Repository branch, master, updated. 6318bfc2ea2dc737ff7fa049521f98e02b6cebb8
by noreply＠mcs.anl.gov 21 Mar '12

21 Mar '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 "Triton Repository". The branch, master has been updated via 6318bfc2ea2dc737ff7fa049521f98e02b6cebb8 (commit) from 662e9e82a431578e053d5a9ae0682a7bb8d6b4e0 (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 6318bfc2ea2dc737ff7fa049521f98e02b6cebb8 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Wed Mar 21 10:55:52 2012 -0400 bug fix benchmark, now complete ----------------------------------------------------------------------- Summary of changes: code/src/transactional-osd/tests/tosd-bench-idb.ae | 53 +++++++++++++------- 1 files changed, 35 insertions(+), 18 deletions(-) Diff of changes: diff --git a/code/src/transactional-osd/tests/tosd-bench-idb.ae b/code/src/transactional-osd/tests/tosd-bench-idb.ae index b606476..58236d0 100644 --- a/code/src/transactional-osd/tests/tosd-bench-idb.ae +++ b/code/src/transactional-osd/tests/tosd-bench-idb.ae @@ -106,20 +106,28 @@ static __blocking int do_tosd_test(void) { pbranch { - triton_mutex_lock(&op_list_mutex); - /* get the next operation off of the list */ - tmp_link = triton_stack_pop(&op_list); - if(tmp_link) - { - tmp_op = triton_list_get_entry(tmp_link, struct bench_op, - list_link); - /* increment version number for this object */ - this_version = ++version_array[tmp_op->oid.l]; - } - triton_mutex_unlock(&op_list_mutex); - - while(tmp_link) + + while(1) { + triton_mutex_lock(&op_list_mutex); + /* get the next operation off of the list */ + tmp_link = triton_stack_pop(&op_list); + if(tmp_link) + { + tmp_op = triton_list_get_entry(tmp_link, + struct bench_op, list_link); + /* increment version number for this object */ + version_array[tmp_op->oid.l]++; + this_version = version_array[tmp_op->oid.l]; + total_ops++; + triton_mutex_unlock(&op_list_mutex); + } + else + { + triton_mutex_unlock(&op_list_mutex); + break; + } + if(tmp_op->type == WRITE) { b_ret = tosd_write(tmp_op->oid, 0, this_version, &buffer_array[i], @@ -133,15 +141,17 @@ static __blocking int do_tosd_test(void) b_ret = tosd_read(tmp_op->oid, 0, &buffer_array[i], &tmp_op->size, 1, &tmp_op->offset, &tmp_op->size, 1, &out_size, 0); + if(out_size != tmp_op->size) + { + printf("out_size: %ld\n", out_size); + printf("tmp_op->size: %ld\n", tmp_op->size); + printf("tmp_op->offset: %ld\n", tmp_op->offset); + } triton_error_assert(b_ret); assert(out_size == tmp_op->size); } - triton_mutex_lock(&op_list_mutex); - total_ops++; - tmp_link = triton_stack_pop(&op_list); - triton_mutex_unlock(&op_list_mutex); - } + } while(tmp_link); } } } @@ -159,6 +169,7 @@ __blocking int aesop_main(int argc, char **argv) int ret; struct bench_op* tmp_op; int i; + int parsed_count = 0; triton_signal_init (); @@ -213,6 +224,7 @@ __blocking int aesop_main(int argc, char **argv) else assert(0); + parsed_count++; triton_list_add_back(&tmp_op->list_link, &op_list); } fclose(desc); @@ -228,6 +240,11 @@ __blocking int aesop_main(int argc, char **argv) printf(" %s", argv[i]); } printf("\n"); + printf("# parsed %d ops, performed %d ops\n", parsed_count, total_ops); + if(parsed_count != total_ops) + { + printf("# WARNING: test appears to be incomplete!\n"); + } printf("# <seconds> <ops/s>\n"); printf("%f\t%f\n", end_tm-start_tm, ((double)(total_ops))/(end_tm-start_tm)); hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. 662e9e82a431578e053d5a9ae0682a7bb8d6b4e0
by noreply＠mcs.anl.gov 20 Mar '12

20 Mar '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 "Triton Repository". The branch, master has been updated via 662e9e82a431578e053d5a9ae0682a7bb8d6b4e0 (commit) from 5971f790f31382d5954067f9853eb4b57b3762a1 (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 662e9e82a431578e053d5a9ae0682a7bb8d6b4e0 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Tue Mar 20 17:45:17 2012 -0400 bug fix: inverted discard_data option ----------------------------------------------------------------------- Summary of changes: code/src/transactional-osd/transactional-osd.ae | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Diff of changes: diff --git a/code/src/transactional-osd/transactional-osd.ae b/code/src/transactional-osd/transactional-osd.ae index a4827c3..1aa26e6 100644 --- a/code/src/transactional-osd/transactional-osd.ae +++ b/code/src/transactional-osd/transactional-osd.ae @@ -3409,9 +3409,9 @@ static triton_ret_t discard_data_updater(const char *key, const char *value) { assert(!strcmp(key, discard_data_confkey)); - if(strcmp(value, "yes")) + if(strcmp(value, "yes") == 0) discard_data = 1; - else if (strcmp(value, "no")) + else if (strcmp(value, "no") == 0) discard_data = 0; else return(TRITON_ERR_INVAL); hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. 5971f790f31382d5954067f9853eb4b57b3762a1
by noreply＠mcs.anl.gov 20 Mar '12

20 Mar '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 "Triton Repository". The branch, master has been updated via 5971f790f31382d5954067f9853eb4b57b3762a1 (commit) from 82348badeab966b2a19616a5343365a477a6305d (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 5971f790f31382d5954067f9853eb4b57b3762a1 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Tue Mar 20 16:53:55 2012 -0400 init signal resource so we can ctrl-c benchmarks ----------------------------------------------------------------------- Summary of changes: code/src/transactional-osd/tests/tosd-bench-idb.ae | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) Diff of changes: diff --git a/code/src/transactional-osd/tests/tosd-bench-idb.ae b/code/src/transactional-osd/tests/tosd-bench-idb.ae index 3ecbe6f..b606476 100644 --- a/code/src/transactional-osd/tests/tosd-bench-idb.ae +++ b/code/src/transactional-osd/tests/tosd-bench-idb.ae @@ -7,6 +7,7 @@ #include "src/aesop/aesop.h" #include "src/transactional-osd/transactional-osd.hae" #include "src/zeroconf/zeroconf.h" +#include "src/common/resources/signal/signal.hae" enum op_type { @@ -159,6 +160,8 @@ __blocking int aesop_main(int argc, char **argv) struct bench_op* tmp_op; int i; + triton_signal_init (); + ret = sscanf(argv[3], "%d", &concurrent); if(ret != 1 || concurrent < 1) { @@ -239,7 +242,7 @@ static triton_ret_t init_tosd_zeroconf_params(int argc, char** argv) if(argc != 5) { fprintf(stderr, "Usage: tosd-bench-concurrent <workload description file> <dir> <concurrency> <move data y|n>\n"); - return(-1); + return(TRITON_ERR_INVAL); } tret = triton_zeroconf_set("triton.tosd.db_path", argv[2]); hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. 77c51b0cddc1bec3f565457586080f52db4395a5
by noreply＠mcs.anl.gov 20 Mar '12

20 Mar '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 "Triton Repository". The branch, master has been updated via 77c51b0cddc1bec3f565457586080f52db4395a5 (commit) via 98ebdc0f63b626faae3ed66cadfa199a9a60a5d8 (commit) from fc5bb723bc1698c1ad5390453c53ad0f2e6c7190 (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 77c51b0cddc1bec3f565457586080f52db4395a5 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Tue Mar 20 16:12:26 2012 -0400 ability to turn data payload xfer on and off commit 98ebdc0f63b626faae3ed66cadfa199a9a60a5d8 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Tue Mar 20 15:44:23 2012 -0400 arg and hint to control if data is discarded ----------------------------------------------------------------------- Summary of changes: code/src/transactional-osd/tests/tosd-bench-idb.ae | 17 ++++- code/src/transactional-osd/transactional-osd.ae | 68 +++++++++++++++++--- 2 files changed, 72 insertions(+), 13 deletions(-) Diff of changes: diff --git a/code/src/transactional-osd/tests/tosd-bench-idb.ae b/code/src/transactional-osd/tests/tosd-bench-idb.ae index 1789112..1004348 100644 --- a/code/src/transactional-osd/tests/tosd-bench-idb.ae +++ b/code/src/transactional-osd/tests/tosd-bench-idb.ae @@ -52,6 +52,7 @@ static __blocking int do_tosd_test(void) uint64_t* version_array; char** buffer_array; uint128_t oid; + int ret; /* allocate a buffer big enough to hold the biggest * operation in the workload file @@ -60,8 +61,8 @@ static __blocking int do_tosd_test(void) assert(buffer_array); for(i=0; i<concurrent; i++) { - buffer_array[i] = malloc(max_size); - assert(buffer_array[i]); + ret = posix_memalign((void**)&buffer_array[i], 4096, max_size); + assert(ret == 0); } /* array to track current version for each object */ @@ -160,14 +161,14 @@ __blocking int aesop_main(int argc, char **argv) if(argc != 5) { - fprintf(stderr, "Usage: tosd-bench-concurrent <workload description file> <dir> <concurrency> <threaded y|n>\n"); + fprintf(stderr, "Usage: tosd-bench-concurrent <workload description file> <dir> <concurrency> <move data y|n>\n"); return(-1); } ret = sscanf(argv[3], "%d", &concurrent); if(ret != 1 || concurrent < 1) { - fprintf(stderr, "Usage: tosd-bench-concurrent <workload description file> <dir> <concurrency> <threaded y|n>\n"); + fprintf(stderr, "Usage: tosd-bench-concurrent <workload description file> <dir> <concurrency> <move data y|n>\n"); return(-1); } @@ -248,6 +249,14 @@ static triton_ret_t init_tosd_zeroconf_params(int argc, char** argv) tret = triton_zeroconf_set("triton.tosd.data_path", tosd_path_logs); triton_error_assert(tret); + if(strcmp(argv[4], "n") == 0) + { + /* caller want's us to discard data */ + printf("# Warning: discarding all data (i.e., just testing interval DB)\n"); + tret = triton_zeroconf_set("triton.tosd.discard_data", "yes"); + triton_error_assert(tret); + } + return(TRITON_SUCCESS); } diff --git a/code/src/transactional-osd/transactional-osd.ae b/code/src/transactional-osd/transactional-osd.ae index 777d666..a4827c3 100644 --- a/code/src/transactional-osd/transactional-osd.ae +++ b/code/src/transactional-osd/transactional-osd.ae @@ -75,6 +75,7 @@ } while(0) #define TOSD_CONFKEY_PREFIX "triton.tosd" +static const char* discard_data_confkey = TOSD_CONFKEY_PREFIX ".discard_data"; static const char* db_path_confkey = TOSD_CONFKEY_PREFIX ".db_path"; static const char* data_path_confkey = TOSD_CONFKEY_PREFIX ".data_path"; static const char* db_coal_confkey = TOSD_CONFKEY_PREFIX ".db_coalescing_highwater"; @@ -83,6 +84,7 @@ static const char* align_confkey = TOSD_CONFKEY_PREFIX ".alignment"; static const char* flags_confkey = TOSD_CONFKEY_PREFIX ".flags"; static const char* error_rate_confkey = TOSD_CONFKEY_PREFIX ".insert_errors_at_rate"; static triton_ret_t db_path_updater(const char *key, const char *value); +static triton_ret_t discard_data_updater(const char *key, const char *value); static triton_ret_t data_path_updater(const char *key, const char *value); static triton_ret_t db_coal_updater(const char *key, const char *value); static triton_ret_t data_coal_updater(const char *key, const char *value); @@ -107,6 +109,7 @@ static int global_alignment = 1; static int global_flags = 0; static float insert_errors_at_rate = 0; static triton_mutex_t fault_mutex = TRITON_MUTEX_INITIALIZER; +static int discard_data = 0; #define COALESCE_DB 1 #define COALESCE_DATA 2 @@ -1384,8 +1387,15 @@ static __blocking triton_ret_t read_segment( ((unsigned long)mem_offset) % global_alignment == 0) { assert(lme.size > 0); - tret = file_pread(fd_entry->fd, mem_offset, - lme.size, lme.log_offset); + if(discard_data) + { + tret == TRITON_SUCCESS; + } + else + { + tret = file_pread(fd_entry->fd, mem_offset, + lme.size, lme.log_offset); + } if(tret != TRITON_SUCCESS) { fd_cache_put(fd_entry); @@ -1418,8 +1428,15 @@ static __blocking triton_ret_t read_segment( scratch_size = (scratch_size/global_alignment + 1) * global_alignment; /* read data */ - tret = file_pread(fd_entry->fd, scratch_buffer, scratch_size, - scratch_offset); + if(discard_data) + { + tret == TRITON_SUCCESS; + } + else + { + tret = file_pread(fd_entry->fd, scratch_buffer, scratch_size, + scratch_offset); + } if(tret != TRITON_SUCCESS) { fd_cache_put(fd_entry); @@ -1462,6 +1479,14 @@ triton_ret_t tosd_init(void) return(tret); } + tret = triton_zeroconf_register(discard_data_confkey, + "no", discard_data_updater, + "Should the TOSD discard data payloads? yes|no"); + if(tret != TRITON_SUCCESS) + { + return(tret); + } + tret = triton_zeroconf_register(db_path_confkey, "", db_path_updater, "Directory that will contain Berkeley DB files used by the TOSD."); @@ -2427,7 +2452,6 @@ static __blocking triton_ret_t tosd_write_internal( /* TODO: add tosd_txn_abort() calls in return paths through the rest of * this function */ - tret = fd_cache_get(&fd_entry, oid, global_alignment, global_flags, global_data_coalesce_highwater); if(tret != TRITON_SUCCESS) { @@ -2516,9 +2540,16 @@ static __blocking triton_ret_t tosd_write_internal( mem_ptr = scratch_buffer; } - /* actually write the data */ - tret = file_pwrite(fd_entry->fd, mem_ptr, aligned_size, - tmp_update->log_offset); + if(discard_data) + { + tret == TRITON_SUCCESS; + } + else + { + /* actually write the data */ + tret = file_pwrite(fd_entry->fd, mem_ptr, aligned_size, + tmp_update->log_offset); + } if(tret != TRITON_SUCCESS) { fd_cache_put(fd_entry); @@ -2711,7 +2742,11 @@ __blocking triton_ret_t tosd_write( TOSD_CHECK(); co.oid = oid; - co.flags = COALESCE_DB|COALESCE_DATA; + if(discard_data) + co.flags = COALESCE_DB; + else + co.flags = COALESCE_DB|COALESCE_DATA; + start_write(&co); tret = tosd_write_internal(oid, oid_fork, txn_number, mem_offsets, @@ -3370,6 +3405,21 @@ static void txn_update_list_add(struct logical_map_entry* new_update, return; } +static triton_ret_t discard_data_updater(const char *key, const char *value) +{ + assert(!strcmp(key, discard_data_confkey)); + + if(strcmp(value, "yes")) + discard_data = 1; + else if (strcmp(value, "no")) + discard_data = 0; + else + return(TRITON_ERR_INVAL); + + return TRITON_SUCCESS; +} + + static triton_ret_t db_path_updater(const char *key, const char *value) { assert(!strcmp(key, db_path_confkey)); hooks/post-receive -- Triton Repository

1 0