Changes in / [891c3e3:78754d7]
- Files:
-
- 9 added
- 1 deleted
- 6 edited
-
doc/proposals/concurrency/text/frontpgs.tex (modified) (2 diffs)
-
doc/proposals/concurrency/thesis.tex (modified) (1 diff)
-
doc/proposals/concurrency/version (modified) (1 diff)
-
src/tests/.expect/libcfa_vector.txt (added)
-
src/tests/.expect/vector_test.txt (added)
-
src/tests/.in/vector_test.txt (added)
-
src/tests/Makefile.am (modified) (2 diffs)
-
src/tests/Makefile.in (modified) (11 diffs)
-
src/tests/libcfa_vector.c (added)
-
src/tests/vector.c (deleted)
-
src/tests/vector/array.c (added)
-
src/tests/vector/array.h (added)
-
src/tests/vector/vector_int.c (added)
-
src/tests/vector/vector_int.h (added)
-
src/tests/vector/vector_test.c (added)
-
tools/repeat.c (modified) (6 diffs)
Legend:
- Unmodified
- Added
- Removed
-
doc/proposals/concurrency/text/frontpgs.tex
r891c3e3 r78754d7 39 39 \vspace*{2.0cm} 40 40 41 Waterloo, Ontario, Canada, 201 8\\41 Waterloo, Ontario, Canada, 2017 \\ 42 42 43 43 \vspace*{1.0cm} 44 44 45 \copyright\ Thierry Delisle 201 8\\45 \copyright\ Thierry Delisle 2017 \\ 46 46 \end{center} 47 47 \end{titlepage} … … 154 154 % \newpage 155 155 156 % L I S T O F T A B L E S157 % -----------------------------158 \addcontentsline{toc}{chapter}{List of Acronyms}159 \printglossary[type=\acronymtype,title={List of Acronyms}]160 \cleardoublepage161 \phantomsection % allows hyperref to link to the correct page162 163 156 % Change page numbering back to Arabic numerals 164 157 \pagenumbering{arabic} -
doc/proposals/concurrency/thesis.tex
r891c3e3 r78754d7 125 125 \input{future} 126 126 127 \clearpage 128 \printglossary[type=\acronymtype] 129 \printglossary 127 130 128 131 \clearpage 129 130 % B I B L I O G R A P H Y131 % -----------------------------132 \addcontentsline{toc}{chapter}{Bibliography}133 132 \bibliographystyle{plain} 134 133 \bibliography{pl,local} 135 \cleardoublepage136 \phantomsection % allows hyperref to link to the correct page137 138 % G L O S S A R Y139 % -----------------------------140 \addcontentsline{toc}{chapter}{Glossary}141 \printglossary142 \cleardoublepage143 \phantomsection % allows hyperref to link to the correct page144 134 145 135 -
doc/proposals/concurrency/version
r891c3e3 r78754d7 1 0.11. 4031 0.11.391 -
src/tests/Makefile.am
r891c3e3 r78754d7 17 17 debug=yes 18 18 19 quick_test= avl_test operators numericConstants expression enum array typeof cast dtor-early-exit init_once attributes19 quick_test=vector_test avl_test operators numericConstants expression enum array typeof cast dtor-early-exit init_once attributes 20 20 21 21 if BUILD_CONCURRENCY … … 44 44 45 45 .PHONY : list 46 EXTRA_PROGRAMS = fstream_test avl_test # build but do not install46 EXTRA_PROGRAMS = fstream_test vector_test avl_test # build but do not install 47 47 48 48 fstream_test_SOURCES = fstream_test.c 49 49 fstream_test_CFLAGS = $(if $(test), 2>> $(test), ) ${BUILD_FLAGS} 50 51 vector_test_SOURCES = vector/vector_int.c vector/array.c vector/vector_test.c 52 vector_test_CFLAGS = $(if $(test), 2>> $(test), ) ${BUILD_FLAGS} 50 53 51 54 avl_test_SOURCES = avltree/avl_test.c avltree/avl0.c avltree/avl1.c avltree/avl2.c avltree/avl3.c avltree/avl4.c avltree/avl-private.c -
src/tests/Makefile.in
r891c3e3 r78754d7 94 94 @BUILD_DEBUG_TRUE@@BUILD_RELEASE_FALSE@am__append_2 = -debug 95 95 @BUILD_DEBUG_TRUE@@BUILD_RELEASE_TRUE@am__append_3 = ${DEBUG_FLAGS} 96 EXTRA_PROGRAMS = fstream_test$(EXEEXT) avl_test$(EXEEXT) 96 EXTRA_PROGRAMS = fstream_test$(EXEEXT) vector_test$(EXEEXT) \ 97 avl_test$(EXEEXT) 97 98 subdir = src/tests 98 99 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 … … 121 122 fstream_test_LDADD = $(LDADD) 122 123 fstream_test_LINK = $(CCLD) $(fstream_test_CFLAGS) $(CFLAGS) \ 124 $(AM_LDFLAGS) $(LDFLAGS) -o $@ 125 am_vector_test_OBJECTS = vector/vector_test-vector_int.$(OBJEXT) \ 126 vector/vector_test-array.$(OBJEXT) \ 127 vector/vector_test-vector_test.$(OBJEXT) 128 vector_test_OBJECTS = $(am_vector_test_OBJECTS) 129 vector_test_LDADD = $(LDADD) 130 vector_test_LINK = $(CCLD) $(vector_test_CFLAGS) $(CFLAGS) \ 123 131 $(AM_LDFLAGS) $(LDFLAGS) -o $@ 124 132 AM_V_P = $(am__v_P_@AM_V@) … … 154 162 am__v_CCLD_0 = @echo " CCLD " $@; 155 163 am__v_CCLD_1 = 156 SOURCES = $(avl_test_SOURCES) $(fstream_test_SOURCES) 157 DIST_SOURCES = $(avl_test_SOURCES) $(fstream_test_SOURCES) 164 SOURCES = $(avl_test_SOURCES) $(fstream_test_SOURCES) \ 165 $(vector_test_SOURCES) 166 DIST_SOURCES = $(avl_test_SOURCES) $(fstream_test_SOURCES) \ 167 $(vector_test_SOURCES) 158 168 am__can_run_installinfo = \ 159 169 case $$AM_UPDATE_INFO_DIR in \ … … 303 313 top_srcdir = @top_srcdir@ 304 314 debug = yes 305 quick_test = avl_test operators numericConstants expression enum array typeof cast dtor-early-exit init_once attributes315 quick_test = vector_test avl_test operators numericConstants expression enum array typeof cast dtor-early-exit init_once attributes 306 316 @BUILD_CONCURRENCY_FALSE@concurrent = '-Econcurrent' 307 317 @BUILD_CONCURRENCY_TRUE@concurrent = … … 315 325 fstream_test_SOURCES = fstream_test.c 316 326 fstream_test_CFLAGS = $(if $(test), 2>> $(test), ) ${BUILD_FLAGS} 327 vector_test_SOURCES = vector/vector_int.c vector/array.c vector/vector_test.c 328 vector_test_CFLAGS = $(if $(test), 2>> $(test), ) ${BUILD_FLAGS} 317 329 avl_test_SOURCES = avltree/avl_test.c avltree/avl0.c avltree/avl1.c avltree/avl2.c avltree/avl3.c avltree/avl4.c avltree/avl-private.c 318 330 avl_test_CFLAGS = $(if $(test), 2>> $(test), ) ${BUILD_FLAGS} … … 378 390 @rm -f fstream_test$(EXEEXT) 379 391 $(AM_V_CCLD)$(fstream_test_LINK) $(fstream_test_OBJECTS) $(fstream_test_LDADD) $(LIBS) 392 vector/$(am__dirstamp): 393 @$(MKDIR_P) vector 394 @: > vector/$(am__dirstamp) 395 vector/$(DEPDIR)/$(am__dirstamp): 396 @$(MKDIR_P) vector/$(DEPDIR) 397 @: > vector/$(DEPDIR)/$(am__dirstamp) 398 vector/vector_test-vector_int.$(OBJEXT): vector/$(am__dirstamp) \ 399 vector/$(DEPDIR)/$(am__dirstamp) 400 vector/vector_test-array.$(OBJEXT): vector/$(am__dirstamp) \ 401 vector/$(DEPDIR)/$(am__dirstamp) 402 vector/vector_test-vector_test.$(OBJEXT): vector/$(am__dirstamp) \ 403 vector/$(DEPDIR)/$(am__dirstamp) 404 405 vector_test$(EXEEXT): $(vector_test_OBJECTS) $(vector_test_DEPENDENCIES) $(EXTRA_vector_test_DEPENDENCIES) 406 @rm -f vector_test$(EXEEXT) 407 $(AM_V_CCLD)$(vector_test_LINK) $(vector_test_OBJECTS) $(vector_test_LDADD) $(LIBS) 380 408 381 409 mostlyclean-compile: 382 410 -rm -f *.$(OBJEXT) 383 411 -rm -f avltree/*.$(OBJEXT) 412 -rm -f vector/*.$(OBJEXT) 384 413 385 414 distclean-compile: … … 394 423 @AMDEP_TRUE@@am__include@ @am__quote@avltree/$(DEPDIR)/avl_test-avl4.Po@am__quote@ 395 424 @AMDEP_TRUE@@am__include@ @am__quote@avltree/$(DEPDIR)/avl_test-avl_test.Po@am__quote@ 425 @AMDEP_TRUE@@am__include@ @am__quote@vector/$(DEPDIR)/vector_test-array.Po@am__quote@ 426 @AMDEP_TRUE@@am__include@ @am__quote@vector/$(DEPDIR)/vector_test-vector_int.Po@am__quote@ 427 @AMDEP_TRUE@@am__include@ @am__quote@vector/$(DEPDIR)/vector_test-vector_test.Po@am__quote@ 396 428 397 429 .c.o: … … 522 554 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 523 555 @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fstream_test_CFLAGS) $(CFLAGS) -c -o fstream_test-fstream_test.obj `if test -f 'fstream_test.c'; then $(CYGPATH_W) 'fstream_test.c'; else $(CYGPATH_W) '$(srcdir)/fstream_test.c'; fi` 556 557 vector/vector_test-vector_int.o: vector/vector_int.c 558 @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vector_test_CFLAGS) $(CFLAGS) -MT vector/vector_test-vector_int.o -MD -MP -MF vector/$(DEPDIR)/vector_test-vector_int.Tpo -c -o vector/vector_test-vector_int.o `test -f 'vector/vector_int.c' || echo '$(srcdir)/'`vector/vector_int.c 559 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) vector/$(DEPDIR)/vector_test-vector_int.Tpo vector/$(DEPDIR)/vector_test-vector_int.Po 560 @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='vector/vector_int.c' object='vector/vector_test-vector_int.o' libtool=no @AMDEPBACKSLASH@ 561 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 562 @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vector_test_CFLAGS) $(CFLAGS) -c -o vector/vector_test-vector_int.o `test -f 'vector/vector_int.c' || echo '$(srcdir)/'`vector/vector_int.c 563 564 vector/vector_test-vector_int.obj: vector/vector_int.c 565 @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vector_test_CFLAGS) $(CFLAGS) -MT vector/vector_test-vector_int.obj -MD -MP -MF vector/$(DEPDIR)/vector_test-vector_int.Tpo -c -o vector/vector_test-vector_int.obj `if test -f 'vector/vector_int.c'; then $(CYGPATH_W) 'vector/vector_int.c'; else $(CYGPATH_W) '$(srcdir)/vector/vector_int.c'; fi` 566 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) vector/$(DEPDIR)/vector_test-vector_int.Tpo vector/$(DEPDIR)/vector_test-vector_int.Po 567 @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='vector/vector_int.c' object='vector/vector_test-vector_int.obj' libtool=no @AMDEPBACKSLASH@ 568 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 569 @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vector_test_CFLAGS) $(CFLAGS) -c -o vector/vector_test-vector_int.obj `if test -f 'vector/vector_int.c'; then $(CYGPATH_W) 'vector/vector_int.c'; else $(CYGPATH_W) '$(srcdir)/vector/vector_int.c'; fi` 570 571 vector/vector_test-array.o: vector/array.c 572 @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vector_test_CFLAGS) $(CFLAGS) -MT vector/vector_test-array.o -MD -MP -MF vector/$(DEPDIR)/vector_test-array.Tpo -c -o vector/vector_test-array.o `test -f 'vector/array.c' || echo '$(srcdir)/'`vector/array.c 573 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) vector/$(DEPDIR)/vector_test-array.Tpo vector/$(DEPDIR)/vector_test-array.Po 574 @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='vector/array.c' object='vector/vector_test-array.o' libtool=no @AMDEPBACKSLASH@ 575 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 576 @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vector_test_CFLAGS) $(CFLAGS) -c -o vector/vector_test-array.o `test -f 'vector/array.c' || echo '$(srcdir)/'`vector/array.c 577 578 vector/vector_test-array.obj: vector/array.c 579 @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vector_test_CFLAGS) $(CFLAGS) -MT vector/vector_test-array.obj -MD -MP -MF vector/$(DEPDIR)/vector_test-array.Tpo -c -o vector/vector_test-array.obj `if test -f 'vector/array.c'; then $(CYGPATH_W) 'vector/array.c'; else $(CYGPATH_W) '$(srcdir)/vector/array.c'; fi` 580 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) vector/$(DEPDIR)/vector_test-array.Tpo vector/$(DEPDIR)/vector_test-array.Po 581 @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='vector/array.c' object='vector/vector_test-array.obj' libtool=no @AMDEPBACKSLASH@ 582 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 583 @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vector_test_CFLAGS) $(CFLAGS) -c -o vector/vector_test-array.obj `if test -f 'vector/array.c'; then $(CYGPATH_W) 'vector/array.c'; else $(CYGPATH_W) '$(srcdir)/vector/array.c'; fi` 584 585 vector/vector_test-vector_test.o: vector/vector_test.c 586 @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vector_test_CFLAGS) $(CFLAGS) -MT vector/vector_test-vector_test.o -MD -MP -MF vector/$(DEPDIR)/vector_test-vector_test.Tpo -c -o vector/vector_test-vector_test.o `test -f 'vector/vector_test.c' || echo '$(srcdir)/'`vector/vector_test.c 587 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) vector/$(DEPDIR)/vector_test-vector_test.Tpo vector/$(DEPDIR)/vector_test-vector_test.Po 588 @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='vector/vector_test.c' object='vector/vector_test-vector_test.o' libtool=no @AMDEPBACKSLASH@ 589 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 590 @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vector_test_CFLAGS) $(CFLAGS) -c -o vector/vector_test-vector_test.o `test -f 'vector/vector_test.c' || echo '$(srcdir)/'`vector/vector_test.c 591 592 vector/vector_test-vector_test.obj: vector/vector_test.c 593 @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vector_test_CFLAGS) $(CFLAGS) -MT vector/vector_test-vector_test.obj -MD -MP -MF vector/$(DEPDIR)/vector_test-vector_test.Tpo -c -o vector/vector_test-vector_test.obj `if test -f 'vector/vector_test.c'; then $(CYGPATH_W) 'vector/vector_test.c'; else $(CYGPATH_W) '$(srcdir)/vector/vector_test.c'; fi` 594 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) vector/$(DEPDIR)/vector_test-vector_test.Tpo vector/$(DEPDIR)/vector_test-vector_test.Po 595 @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='vector/vector_test.c' object='vector/vector_test-vector_test.obj' libtool=no @AMDEPBACKSLASH@ 596 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 597 @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vector_test_CFLAGS) $(CFLAGS) -c -o vector/vector_test-vector_test.obj `if test -f 'vector/vector_test.c'; then $(CYGPATH_W) 'vector/vector_test.c'; else $(CYGPATH_W) '$(srcdir)/vector/vector_test.c'; fi` 524 598 525 599 ID: $(am__tagged_files) … … 637 711 -rm -f avltree/$(DEPDIR)/$(am__dirstamp) 638 712 -rm -f avltree/$(am__dirstamp) 713 -rm -f vector/$(DEPDIR)/$(am__dirstamp) 714 -rm -f vector/$(am__dirstamp) 639 715 640 716 maintainer-clean-generic: … … 646 722 647 723 distclean: distclean-am 648 -rm -rf ./$(DEPDIR) avltree/$(DEPDIR) 724 -rm -rf ./$(DEPDIR) avltree/$(DEPDIR) vector/$(DEPDIR) 649 725 -rm -f Makefile 650 726 distclean-am: clean-am distclean-compile distclean-generic \ … … 692 768 693 769 maintainer-clean: maintainer-clean-am 694 -rm -rf ./$(DEPDIR) avltree/$(DEPDIR) 770 -rm -rf ./$(DEPDIR) avltree/$(DEPDIR) vector/$(DEPDIR) 695 771 -rm -f Makefile 696 772 maintainer-clean-am: distclean-am maintainer-clean-generic -
tools/repeat.c
r891c3e3 r78754d7 26 26 if(print_iterations) { 27 27 printf("\r%d / %d", i, repetitions); 28 fflush(stdout);29 28 } 30 29 int retcode = run(); … … 48 47 fprintf(out, "Repeat CMD N times\n\n"); 49 48 fprintf(out, "\t-h,--help\tprint this usage message\n"); 50 fprintf(out, "\t-s\t\tstop on error\n"); 51 fprintf(out, "\t-i\t\toutput iterations instead of CMD stdout\n"); 52 fprintf(out, "\t-x\t\tprint CMD before running it\n"); 53 fprintf(out, "\t-a FILE\t\tredirect output of command to append to FILE\n"); 54 fprintf(out, "\t-r FILE\t\tredirect output of command to FILE\n"); 49 fprintf(out, "\t-s\tstop on error\n"); 50 fprintf(out, "\t-i\toutput iterations instead of CMD stdout\n"); 51 fprintf(out, "\t-x\tprint CMD before running it\n"); 55 52 exit(code); 56 53 } … … 58 55 char ** cmd_to_run = NULL; 59 56 bool print_cmd = false; 60 bool redirect = false;61 bool redirect_append = false;62 char * redirect_to = "/dev/null";63 57 pid_t child_pid = 0; 64 58 … … 79 73 80 74 int c; 81 while ( (c = getopt_long( argc, argv, " ahirsx", long_opts, &long_index)) != -1 ) {75 while ( (c = getopt_long( argc, argv, "hsxi", long_opts, &long_index)) != -1 ) { 82 76 switch ( c ) { 83 77 case Help: … … 93 87 case 'i': 94 88 print_iterations = true; 95 break;96 case 'a':97 if(redirect) { fprintf(stderr, "Cannot have -a and -r\n"); error(); }98 redirect_append = true;99 redirect_to = argv[optind];100 optind++;101 break;102 case 'r':103 if(redirect_append) { fprintf(stderr, "Cannot have -a and -r\n"); error(); }104 redirect = true;105 redirect_to = argv[optind];106 optind++;107 89 break; 108 90 default: … … 160 142 printf("\n"); 161 143 } 162 if(print_iterations || redirect || redirect_append) {144 if(print_iterations) { 163 145 __attribute__((unused)) FILE * ignore = 164 freopen( redirect_to, redirect_append ? "a" : "w", stdout);146 freopen("/dev/null", "w", stdout); 165 147 } 166 148 execvp ( *cmd_to_run, cmd_to_run);
Note:
See TracChangeset
for help on using the changeset viewer.
