1 files changed, 23 insertions, 9 deletions

diff --git a/extra.h b/extra.h
index 76fd8c0..5f08a60 100644
--- a/extra.h
+++ b/extra.h
@@ -44,12 +44,12 @@ extern int sched_getcpu();
 // Store state globally so that the job can be outside main()
 // Arrays use float as a comprimise between overflow and size
 // Paired arrays use long longs as precision is more important for those times
-#ifdef PAIRED
+// #ifdef PAIRED
 long long *_rt_start_time;
 long long *_rt_end_time;
-#else
+// #else
 float *_rt_exec_time;
-#endif
+// #endif
 #if MMDC_PERF
 float *_rt_mmdc_read;
 float *_rt_mmdc_write;
@@ -154,6 +154,7 @@ static void _rt_load_params_itrl(int argc, char **argv) {
     }
     _rt_start_time = calloc(_rt_max_jobs * _rt_will_output, sizeof(long long));
     _rt_end_time = calloc(_rt_max_jobs * _rt_will_output, sizeof(long long));
+    _rt_exec_time = calloc(_rt_max_jobs * _rt_will_output, sizeof(float));
     if (!_rt_end_time || !_rt_start_time) {
         perror("Unable to allocate buffers for execution times");
         exit(1);
@@ -197,6 +198,8 @@ static void _rt_load_params_itrl(int argc, char **argv) {
     }
     *_rt_barrier = 0;
 #else
+    _rt_start_time = calloc(_rt_max_jobs * _rt_will_output, sizeof(long long));
+    _rt_end_time = calloc(_rt_max_jobs * _rt_will_output, sizeof(long long));
     _rt_exec_time = calloc(_rt_max_jobs * _rt_will_output, sizeof(float));
     if (!_rt_exec_time) {
         perror("Unable to allocate buffer for execution times");
@@ -342,18 +345,29 @@ static void _rt_save_job_result() {
         fprintf(stderr, "Max jobs setting too small! Trying to record job #%ld when we only have space for %ld jobs. Exiting...\n", _rt_jobs_complete, _rt_max_jobs);
         exit(1);
     }
-#ifdef PAIRED
+// #ifdef PAIRED
     _rt_start_time[_rt_jobs_complete] = _rt_start.tv_sec;
     _rt_start_time[_rt_jobs_complete] *= _BILLION;
     _rt_start_time[_rt_jobs_complete] += _rt_start.tv_nsec;
     _rt_end_time[_rt_jobs_complete] = _rt_end.tv_sec;
     _rt_end_time[_rt_jobs_complete] *= _BILLION;
     _rt_end_time[_rt_jobs_complete] += _rt_end.tv_nsec;
-#else
+
     _rt_exec_time[_rt_jobs_complete] = _rt_end.tv_sec - _rt_start.tv_sec;
     _rt_exec_time[_rt_jobs_complete] *= _BILLION;
     _rt_exec_time[_rt_jobs_complete] += _rt_end.tv_nsec - _rt_start.tv_nsec;
-#endif /* PAIRED */
+// #else
+//     _rt_start_time[_rt_jobs_complete] = _rt_start.tv_sec;
+//     _rt_start_time[_rt_jobs_complete] *= _BILLION;
+//     _rt_start_time[_rt_jobs_complete] += _rt_start.tv_nsec;
+//     _rt_end_time[_rt_jobs_complete] = _rt_end.tv_sec;
+//     _rt_end_time[_rt_jobs_complete] *= _BILLION;
+//     _rt_end_time[_rt_jobs_complete] += _rt_end.tv_nsec;
+
+//     _rt_exec_time[_rt_jobs_complete] = _rt_end.tv_sec - _rt_start.tv_sec;
+//     _rt_exec_time[_rt_jobs_complete] *= _BILLION;
+//     _rt_exec_time[_rt_jobs_complete] += _rt_end.tv_nsec - _rt_start.tv_nsec;
+// #endif /* PAIRED */
 #if MMDC_PROF
     _rt_mmdc_read[_rt_jobs_complete] = mmdc_res.read_bytes;
     _rt_mmdc_write[_rt_jobs_complete] = mmdc_res.write_bytes;
@@ -378,14 +392,14 @@ static void _rt_write_to_file() {
     for (int i = 0; i < _rt_jobs_complete; i++){
         fprintf(fp, "%s %s %u %s %ld", _rt_our_prog_name, _rt_other_prog_name,
             _rt_core, _rt_other_core, _rt_max_jobs);
-#ifdef PAIRED
+// #ifdef PAIRED
         // For unclear legacy reasons, paired tasks emit sec and ns separately
         fprintf(fp, " %lld %lld %lld %lld",
             _rt_start_time[i] / _BILLION, _rt_start_time[i] % _BILLION,
             _rt_end_time[i] / _BILLION, _rt_end_time[i] % _BILLION);
-#else
+// #else
         fprintf(fp, " %.f", _rt_exec_time[i]);
-#endif /* PAIRED */
+// #endif /* PAIRED */
         fprintf(fp, " %s %d %.f %.f\n",  _rt_run_id, i,
 #if MMDC_PROF
             _rt_mmdc_read[i], _rt_mmdc_write[i]);