Index: src/tests/.expect/boundedBuffer.txt =================================================================== --- src/tests/.expect/boundedBuffer.txt (revision 5e6502b998d52e88f6a2759f8b5a1ebe698e1156) +++ (revision ) @@ -1,1 +1,0 @@ -total:500000 Index: src/tests/.expect/concurrent/boundedBuffer.txt =================================================================== --- src/tests/.expect/concurrent/boundedBuffer.txt (revision cd034920302a4c438731188dac8d4dc2fc608705) +++ src/tests/.expect/concurrent/boundedBuffer.txt (revision cd034920302a4c438731188dac8d4dc2fc608705) @@ -0,0 +1,1 @@ +total:500000 Index: src/tests/.expect/concurrent/fmtLines.txt =================================================================== --- src/tests/.expect/concurrent/fmtLines.txt (revision cd034920302a4c438731188dac8d4dc2fc608705) +++ src/tests/.expect/concurrent/fmtLines.txt (revision cd034920302a4c438731188dac8d4dc2fc608705) @@ -0,0 +1,78 @@ +// / / Cf oral l Ve rsio +n 1. 0.0 Copy righ t (C +) 20 17 U nive rsit y of + Wat erlo o/// / Th e co +nten ts o f th is f ile +are cove red unde r th +e li cenc e ag reem ent +in t he// fil e "L ICEN +CE" dist ribu ted with + Cfo rall .// // f mtLi +nes. cc - - // // Auth +or : P eter + A. Buhr // C reat ed O +n : Su n Se p 17 + 21: 56:1 5 20 17// Las +t Mo difi ed B y : Pete +r A. Buh r// Last Mod +ifie d On : M on S ep 1 +8 11 :35: 57 2 017/ / Up +date Cou nt : 31/ +/ #i nclu de < fstr eam> +#inc lude +coro utin e Fo rmat { c +har ch; // + use d fo r co mmun icat +ion int g, b ; + // g loba l be caus +e us ed i n de stru ctor +};vo id ? {}( Form at & + fmt ) { resu me( +fmt ); // s +tart cor outi ne}v oid +^?{} ( Fo rmat & f mt ) + { if ( f mt.g != +0 || fmt .b ! = 0 ) so +ut | end l;}v oid main +( Fo rmat & f mt ) { f +or ( ;; ) { + // for as m any char +acte rs for ( fm t.g += 0; fmt .g < 5; fmt. +g += 1 ) { // g roup +s of 5 b lock s for +( fm t.b = 0; fmt .b < + 4; fmt. b += 1 ) { / +/ bl ocks of 4 ch arac +ters for ( ;; ) { + / / fo r ne wlin +e ch arac ters sus +pend (); if ( fmt +.ch != ' \n' ) br eak; + // ign ore newl ine + } // for s out +| fm t.ch ; // p +rint cha ract er } / +/ fo r sout | " "; + // p rint blo +ck s epar ator } // f +or sout | e ndl; + // prin t gr oup +sepa rato r } // f or} +// m ainv oid prt( For +mat & fm t, c har ch ) + { fm t.ch = c h; + re sume ( fm t ); } // + prt int main () { For +mat fmt; cha r ch ; fo +r ( ;; ) { sin | ch +; / / re ad o +ne c hara cter i f ( +eof( sin ) ) bre ak; + // eof ? prt( + fmt , ch ); } // for +} // mai n// Loca l Va +riab les: /// / ta b-wi +dth: 4 / /// comp ile- +comm and: "cf a fm tLin +es.c " // // E nd: // Index: src/tests/.expect/concurrent/matrixSum.txt =================================================================== --- src/tests/.expect/concurrent/matrixSum.txt (revision cd034920302a4c438731188dac8d4dc2fc608705) +++ src/tests/.expect/concurrent/matrixSum.txt (revision cd034920302a4c438731188dac8d4dc2fc608705) @@ -0,0 +1,1 @@ +10000 Index: src/tests/.expect/concurrent/pingpong.txt =================================================================== --- src/tests/.expect/concurrent/pingpong.txt (revision cd034920302a4c438731188dac8d4dc2fc608705) +++ src/tests/.expect/concurrent/pingpong.txt (revision cd034920302a4c438731188dac8d4dc2fc608705) @@ -0,0 +1,40 @@ +ping +pong +ping +pong +ping +pong +ping +pong +ping +pong +ping +pong +ping +pong +ping +pong +ping +pong +ping +pong +ping +pong +ping +pong +ping +pong +ping +pong +ping +pong +ping +pong +ping +pong +ping +pong +ping +pong +ping +pong Index: src/tests/.expect/fmtLines.txt =================================================================== --- src/tests/.expect/fmtLines.txt (revision 5e6502b998d52e88f6a2759f8b5a1ebe698e1156) +++ (revision ) @@ -1,78 +1,0 @@ -// / / Cf oral l Ve rsio -n 1. 0.0 Copy righ t (C -) 20 17 U nive rsit y of - Wat erlo o/// / Th e co -nten ts o f th is f ile -are cove red unde r th -e li cenc e ag reem ent -in t he// fil e "L ICEN -CE" dist ribu ted with - Cfo rall .// // f mtLi -nes. cc - - // // Auth -or : P eter - A. Buhr // C reat ed O -n : Su n Se p 17 - 21: 56:1 5 20 17// Las -t Mo difi ed B y : Pete -r A. Buh r// Last Mod -ifie d On : M on S ep 1 -8 11 :35: 57 2 017/ / Up -date Cou nt : 31/ -/ #i nclu de < fstr eam> -#inc lude -coro utin e Fo rmat { c -har ch; // - use d fo r co mmun icat -ion int g, b ; - // g loba l be caus -e us ed i n de stru ctor -};vo id ? {}( Form at & - fmt ) { resu me( -fmt ); // s -tart cor outi ne}v oid -^?{} ( Fo rmat & f mt ) - { if ( f mt.g != -0 || fmt .b ! = 0 ) so -ut | end l;}v oid main -( Fo rmat & f mt ) { f -or ( ;; ) { - // for as m any char -acte rs for ( fm t.g -= 0; fmt .g < 5; fmt. -g += 1 ) { // g roup -s of 5 b lock s for -( fm t.b = 0; fmt .b < - 4; fmt. b += 1 ) { / -/ bl ocks of 4 ch arac -ters for ( ;; ) { - / / fo r ne wlin -e ch arac ters sus -pend (); if ( fmt -.ch != ' \n' ) br eak; - // ign ore newl ine - } // for s out -| fm t.ch ; // p -rint cha ract er } / -/ fo r sout | " "; - // p rint blo -ck s epar ator } // f -or sout | e ndl; - // prin t gr oup -sepa rato r } // f or} -// m ainv oid prt( For -mat & fm t, c har ch ) - { fm t.ch = c h; - re sume ( fm t ); } // - prt int main () { For -mat fmt; cha r ch ; fo -r ( ;; ) { sin | ch -; / / re ad o -ne c hara cter i f ( -eof( sin ) ) bre ak; - // eof ? prt( - fmt , ch ); } // for -} // mai n// Loca l Va -riab les: /// / ta b-wi -dth: 4 / /// comp ile- -comm and: "cf a fm tLin -es.c " // // E nd: // Index: src/tests/.expect/matrixSum.txt =================================================================== --- src/tests/.expect/matrixSum.txt (revision 5e6502b998d52e88f6a2759f8b5a1ebe698e1156) +++ (revision ) @@ -1,1 +1,0 @@ -10000 Index: src/tests/.expect/pingpong.txt =================================================================== --- src/tests/.expect/pingpong.txt (revision 5e6502b998d52e88f6a2759f8b5a1ebe698e1156) +++ (revision ) @@ -1,40 +1,0 @@ -ping -pong -ping -pong -ping -pong -ping -pong -ping -pong -ping -pong -ping -pong -ping -pong -ping -pong -ping -pong -ping -pong -ping -pong -ping -pong -ping -pong -ping -pong -ping -pong -ping -pong -ping -pong -ping -pong -ping -pong Index: src/tests/Makefile.am =================================================================== --- src/tests/Makefile.am (revision 5e6502b998d52e88f6a2759f8b5a1ebe698e1156) +++ src/tests/Makefile.am (revision cd034920302a4c438731188dac8d4dc2fc608705) @@ -11,6 +11,6 @@ ## Created On : Sun May 31 09:08:15 2015 ## Last Modified By : Peter A. Buhr -## Last Modified On : Mon Sep 11 16:17:16 2017 -## Update Count : 45 +## Last Modified On : Tue Oct 10 13:29:36 2017 +## Update Count : 46 ############################################################################### @@ -22,21 +22,24 @@ concurrent = yes quick_test += coroutine thread monitor -concurrent_test = \ - coroutine \ - thread \ - monitor \ - multi-monitor \ - preempt \ - sched-int-block \ - sched-int-disjoint \ - sched-int-wait \ - sched-ext-barge \ - sched-ext-dtor \ - sched-ext-else \ - sched-ext-parse \ - sched-ext-recurse \ - sched-ext-statment \ +concurrent_test = \ + coroutine \ + fmtLines \ + pingpong \ + thread \ + matrixSum \ + monitor \ + multi-monitor \ + boundedBuffer \ + preempt \ + sched-int-block \ + sched-int-disjoint \ + sched-int-wait \ + sched-ext-barge \ + sched-ext-dtor \ + sched-ext-else \ + sched-ext-parse \ + sched-ext-recurse \ + sched-ext-statment \ sched-ext-when - else concurrent=no