Cleanup `extra.h` for pairs and add option to use that in DIS build

Also remove some unused code from the cleanupSemaphores utility

26 files changed, 57 insertions, 47 deletions

diff --git a/all_pairs/source/adpcm_dec/adpcm_dec.c b/all_pairs/source/adpcm_dec/adpcm_dec.c
index 6811e69..04a5746 100644
--- a/all_pairs/source/adpcm_dec/adpcm_dec.c
+++ b/all_pairs/source/adpcm_dec/adpcm_dec.c
@@ -708,7 +708,7 @@ void _Pragma( "entrypoint" ) adpcm_dec_main( void )
 int main(int argc, char **argv)
 {
   SET_UP
-  for (jobsComplete=-1; jobsComplete<maxJobs; jobsComplete++){
+  for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
         START_LOOP
         adpcm_dec_init();
         adpcm_dec_main();
diff --git a/all_pairs/source/adpcm_enc/adpcm_enc.c b/all_pairs/source/adpcm_enc/adpcm_enc.c
index d9fb09a..464768f 100644
--- a/all_pairs/source/adpcm_enc/adpcm_enc.c
+++ b/all_pairs/source/adpcm_enc/adpcm_enc.c
@@ -747,7 +747,7 @@ void _Pragma( "entrypoint" ) adpcm_enc_main(void)
 int main(int argc, char **argv)
 {
         SET_UP
-        for(jobsComplete=-1; jobsComplete<maxJobs; jobsComplete++){
+        for(jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
                 START_LOOP
                 adpcm_enc_init();
                 adpcm_enc_main();
diff --git a/all_pairs/source/ammunition/ammunition.c b/all_pairs/source/ammunition/ammunition.c
index 224babd..269f4c0 100644
--- a/all_pairs/source/ammunition/ammunition.c
+++ b/all_pairs/source/ammunition/ammunition.c
@@ -1174,7 +1174,7 @@ void _Pragma( "entrypoint" ) ammunition_main( void )
 int main( int argc, char **argv )
 {
         SET_UP
-        for (jobsComplete=-1; jobsComplete<maxJobs; jobsComplete++){
+        for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
                 START_LOOP
                 ammunition_init();
                 ammunition_main();
diff --git a/all_pairs/source/anagram/anagram.c b/all_pairs/source/anagram/anagram.c
index 8f140a3..b458fd2 100644
--- a/all_pairs/source/anagram/anagram.c
+++ b/all_pairs/source/anagram/anagram.c
@@ -659,7 +659,7 @@ int main(int argc, char **argv)
         SET_UP
         //int jobsComplete;
         //int maxJobs=100;
-        //for(jobsComplete=-1; jobsComplete<maxJobs; jobsComplete++){
+        //for(jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
                 START_LOOP
                 anagram_init();
                 anagram_main();
diff --git a/all_pairs/source/audiobeam/audiobeam.c b/all_pairs/source/audiobeam/audiobeam.c
index ed5d656..208de80 100644
--- a/all_pairs/source/audiobeam/audiobeam.c
+++ b/all_pairs/source/audiobeam/audiobeam.c
@@ -581,7 +581,7 @@ int main( int argc, char **argv )
         //SET_UP
         int jobsComplete;
         int maxJobs=100;
-        for (jobsComplete=-1; jobsComplete<maxJobs; jobsComplete++){
+        for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
         //      START_LOOP
                 audiobeam_init();
                 audiobeam_main();
diff --git a/all_pairs/source/cjpeg_transupp/cjpeg_transupp.c b/all_pairs/source/cjpeg_transupp/cjpeg_transupp.c
index e77d15b..3f48539 100644
--- a/all_pairs/source/cjpeg_transupp/cjpeg_transupp.c
+++ b/all_pairs/source/cjpeg_transupp/cjpeg_transupp.c
@@ -707,7 +707,7 @@ void _Pragma ( "entrypoint" ) cjpeg_transupp_main( void )
 int main(int argc, char **argv)
 {
         SET_UP
-        for (jobsComplete=-1; jobsComplete<maxJobs; jobsComplete++){
+        for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
                 START_LOOP
                 cjpeg_transupp_init();
                 cjpeg_transupp_main();
diff --git a/all_pairs/source/cjpeg_wrbmp/cjpeg_wrbmp.c b/all_pairs/source/cjpeg_wrbmp/cjpeg_wrbmp.c
index 7bef7ab..278725c 100644
--- a/all_pairs/source/cjpeg_wrbmp/cjpeg_wrbmp.c
+++ b/all_pairs/source/cjpeg_wrbmp/cjpeg_wrbmp.c
@@ -211,7 +211,7 @@ int cjpeg_wrbmp_return()
 int main(int argc, char **argv)
 {
         SET_UP
-        for (jobsComplete=-1; jobsComplete<maxJobs; jobsComplete++){
+        for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
                 START_LOOP
                 cjpeg_wrbmp_init();
                 cjpeg_wrbmp_main();
diff --git a/all_pairs/source/cleanupSemaphores.c b/all_pairs/source/cleanupSemaphores.c
index 71ff989..dde2bb3 100644
--- a/all_pairs/source/cleanupSemaphores.c
+++ b/all_pairs/source/cleanupSemaphores.c
@@ -3,8 +3,4 @@
 int main(){
         sem_unlink("/firstTacleSem");
         sem_unlink("/secondTacleSem");
-        sem_unlink("/thirdTacleSem");
-        sem_unlink("/fourthTacleSem");
-        //no longer in use; delete last line after running once
-        //sem_unlink("/cacheTacleSem");
 }
diff --git a/all_pairs/source/dijkstra/dijkstra.c b/all_pairs/source/dijkstra/dijkstra.c
index af86ea6..1b6a52f 100644
--- a/all_pairs/source/dijkstra/dijkstra.c
+++ b/all_pairs/source/dijkstra/dijkstra.c
@@ -193,7 +193,7 @@ void _Pragma( "entrypoint" ) dijkstra_main( void )
 int main(int argc, char** argv )
 {
         SET_UP
-        for(jobsComplete=-1; jobsComplete<maxJobs; jobsComplete++){
+        for(jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
                 START_LOOP
                 dijkstra_init();
                 dijkstra_main();
diff --git a/all_pairs/source/empty.c b/all_pairs/source/empty.c
index e4fd214..c7c5f5d 100644
--- a/all_pairs/source/empty.c
+++ b/all_pairs/source/empty.c
@@ -3,7 +3,7 @@
 int main(int argc, char **argv)
 {
         SET_UP
-        for (jobsComplete=-1; jobsComplete<maxJobs; jobsComplete++){
+        for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
                 START_LOOP
                 STOP_LOOP
         }
diff --git a/all_pairs/source/epic/epic.c b/all_pairs/source/epic/epic.c
index 13ba442..e258a4a 100644
--- a/all_pairs/source/epic/epic.c
+++ b/all_pairs/source/epic/epic.c
@@ -1130,7 +1130,7 @@ int epic_return(){
 int main( int argc, char **argv )
 {
         SET_UP
-        for (jobsComplete=-1; jobsComplete<maxJobs; jobsComplete++){
+        for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
                 START_LOOP
                 epic_init();
                 epic_main();
diff --git a/all_pairs/source/extra.h b/all_pairs/source/extra.h
index bdbd1f5..0681250 100644
--- a/all_pairs/source/extra.h
+++ b/all_pairs/source/extra.h
@@ -19,6 +19,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE