1 files changed, 33 insertions, 19 deletions

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
  * SOFTWARE.
  **/
+#define _GNU_SOURCE
 #include <fcntl.h>
 #include <limits.h>
 #include <semaphore.h>
@@ -30,23 +31,31 @@
 #include <sys/stat.h>
 #include <time.h>
 #include <unistd.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();
 
 // Benchmarks use SET_UP, START_LOOP, STOP_LOOP, and WRITE_TO_FILE
 // These are macros so that we can declare and maintain additional state inside
 // the benchmark.
-#define SET_UP if (argc < 8) {\
+#define SET_UP if (argc != 8) {\
         printf("Usage: %s <name> <runs> <my core> <other core> <other program> <runID> <lockID>", argv[0]);\
         exit(1);\
     }\
     char * thisProgram = argv[1];\
     int maxJobs = atoi(argv[2]);\
-    char * thisCore = argv[3];\
-    char * otherCore = argv[4];\
+    unsigned int thisCore = atoi(argv[3]);\
+    unsigned int otherCore = atoi(argv[4]);\
+    thisCore = sched_getcpu();\
     char * otherProgram = argv[5];\
     char * runID = argv[6];\
     int lockID = atoi(argv[7]);\
-    struct timespec start, end;\
+    struct timespec _start, _end;\
     int jobsComplete;\
+    int jobs_complete = -1;\
     long * startS = malloc(sizeof(long) *maxJobs);\
     long * startN = malloc(sizeof(long) *maxJobs);\
     long * endS = malloc(sizeof(long) *maxJobs);\
@@ -81,14 +90,19 @@
         perror("Error mapping shared memory");\
         exit(1);\
     }\
-    int error;\
     int val;
 
-#define SAVE_RESULTS if (jobsComplete > -1){\
-            startS[jobsComplete]=start.tv_sec;\
-            startN[jobsComplete]=start.tv_nsec;\
-            endS[jobsComplete]=end.tv_sec;\
-            endN[jobsComplete]=end.tv_nsec;}
+#define SAVE_RESULTS \
+     if(jobs_complete >= maxJobs) {\
+        fprintf(stderr, "Max jobs setting too small! Trying to record job #%d when we only have space for %d jobs. Exiting...\n", jobs_complete, maxJobs);\
+        exit(1);\
+    }\
+    if (jobs_complete > -1){\
+        startS[jobs_complete]=_start.tv_sec;\
+        startN[jobs_complete]=_start.tv_nsec;\
+        endS[jobs_complete]=_end.tv_sec;\
+        endN[jobs_complete]=_end.tv_nsec;\
+    }
 
 #define WRITE_TO_FILE {\
     munlockall();\
@@ -97,11 +111,11 @@
         perror("Error opening file. \n");\
         exit(1);\
     }\
-    for(jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){\
-        fprintf(fp, "%s %s %s %s %d %ld %ld %ld %ld %s %d \n",\
+    for(int i = 0; i <= jobs_complete; i++){\
+        fprintf(fp, "%s %s %u %u %d %ld %ld %ld %ld %s %d \n",\
         thisProgram, otherProgram, thisCore, otherCore, maxJobs,\
-        startS[jobsComplete], startN[jobsComplete], endS[jobsComplete], endN[jobsComplete],\
-        runID, jobsComplete);\
+        startS[i], startN[i], endS[i], endN[i],\
+        runID, i);\
     }\
     fclose(fp);\
     /* Clean up the barrier synchronization shared memory */\
@@ -127,8 +141,8 @@
     fclose(fp);
 
 // These timers should just be aliases to the hardware counters w/ some small adjustments
-#define START_TIMER clock_gettime(CLOCK_MONOTONIC, &start);
-#define STOP_TIMER clock_gettime(CLOCK_MONOTONIC, &end);
+#define START_TIMER clock_gettime(CLOCK_MONOTONIC, &_start);
+#define STOP_TIMER clock_gettime(CLOCK_MONOTONIC, &_end);
 
 //check value of sem
 //if sem=0, unlock
@@ -176,8 +190,8 @@
         __sync_bool_compare_and_swap(barrier, 1, 0);\
     }
 
-#define START_LOOP FIRST_UNLOCK FIRST_LOCK FLUSH_CACHES BARRIER_SYNC START_TIMER
-#define STOP_LOOP STOP_TIMER SAVE_RESULTS
+#define START_LOOP FIRST_UNLOCK FIRST_LOCK sched_yield(); FLUSH_CACHES BARRIER_SYNC START_TIMER
+#define STOP_LOOP STOP_TIMER jobs_complete++; SAVE_RESULTS
 
 
 /*
@@ -186,7 +200,7 @@ Intended structure
 main
 SET_UP
 notice that STOP LOOP negates the ++ if outout=0
-for (jobsComplete=-1; jobsComplete<maxJobs; jobsComplete++){
+for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
         START_LOOP
         tacleInit();
         tacleMain();