24 files changed, 51 insertions, 35 deletions

diff --git a/baseline/source/adpcm_dec/adpcm_dec.c b/baseline/source/adpcm_dec/adpcm_dec.c
index 6811e69..04a5746 100644
--- a/baseline/source/adpcm_dec/adpcm_dec.c
+++ b/baseline/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/baseline/source/adpcm_enc/adpcm_enc.c b/baseline/source/adpcm_enc/adpcm_enc.c
index d9fb09a..464768f 100644
--- a/baseline/source/adpcm_enc/adpcm_enc.c
+++ b/baseline/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/baseline/source/ammunition/ammunition.c b/baseline/source/ammunition/ammunition.c
index 224babd..269f4c0 100644
--- a/baseline/source/ammunition/ammunition.c
+++ b/baseline/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/baseline/source/anagram/anagram.c b/baseline/source/anagram/anagram.c
index 8f140a3..b458fd2 100644
--- a/baseline/source/anagram/anagram.c
+++ b/baseline/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/baseline/source/audiobeam/audiobeam.c b/baseline/source/audiobeam/audiobeam.c
index ed5d656..208de80 100644
--- a/baseline/source/audiobeam/audiobeam.c
+++ b/baseline/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/baseline/source/cjpeg_transupp/cjpeg_transupp.c b/baseline/source/cjpeg_transupp/cjpeg_transupp.c
index e77d15b..3f48539 100644
--- a/baseline/source/cjpeg_transupp/cjpeg_transupp.c
+++ b/baseline/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/baseline/source/cjpeg_wrbmp/cjpeg_wrbmp.c b/baseline/source/cjpeg_wrbmp/cjpeg_wrbmp.c
index 7bef7ab..278725c 100644
--- a/baseline/source/cjpeg_wrbmp/cjpeg_wrbmp.c
+++ b/baseline/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/baseline/source/dijkstra/dijkstra.c b/baseline/source/dijkstra/dijkstra.c
index af86ea6..1b6a52f 100644
--- a/baseline/source/dijkstra/dijkstra.c
+++ b/baseline/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/baseline/source/epic/epic.c b/baseline/source/epic/epic.c
index 13ba442..e258a4a 100644
--- a/baseline/source/epic/epic.c
+++ b/baseline/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/baseline/source/extra.h b/baseline/source/extra.h
index 3f6df32..02e97af 100644
--- a/baseline/source/extra.h
+++ b/baseline/source/extra.h
@@ -3,6 +3,7 @@
  *
  * This header provides facilities by which to separably run and time TACLeBench
  **/
+#define _GNU_SOURCE
 #include <time.h>
 #include <sys/mman.h>
 #include <stdlib.h>
@@ -12,6 +13,12 @@
 #include <limits.h>
 #include <fcntl.h>
 #include <stdint.h>
+#include <sched.h>
+
+// This is only visible if _GNU_SOURCE is defined, and that define does not
+// come along to places where this file is included. Address this by manually
+// forcing it into the global namespace.
+extern int sched_getcpu();
 
 // These constants correspond to the imx6q-sabredb platform
 #define LINE_SIZE 32
@@ -47,15 +54,24 @@
 #endif
 
 #define LOAD_PARAMS_ITRL \
-    if (argc < 6) { \
-        printf("Usage: %s <name> <loops> <my core> <runID> <save results?>\n", argv[0]);\
+    if (argc != 6) { \
+        fprintf(stderr, "Usage: %s <name> <loops> <my core> <runID> <save results?>\n", argv[0]);\
+        fprintf(stderr, " <loops> integer number of iterations. -1 for infitite.\n");\
+        fprintf(stderr, " <save results?> 1 to save results, 0 to discard.\n");\
         exit(1);\
     }\