Fix infinite looping with libextra

1 files changed, 16 insertions, 16 deletions

diff --git a/extra.h b/extra.h
index a15313a..30940df 100644
--- a/extra.h
+++ b/extra.h
@@ -125,7 +125,7 @@ static void _rt_load_params_itrl(int argc, char **argv) {
     _rt_will_output = atoi(argv[5]);
 #endif /* PAIRED */
     if (_rt_max_jobs < 0 && _rt_will_output != 0) {
-        fprintf(stderr, "Infinite loops only supported when _rt_will_output is disabled!\n");
+        fprintf(stderr, "Infinite loops only supported when output is disabled!\n");
         exit(1);
     }
     if (strlen(_rt_run_id) + 5 > _RT_FILENAME_LEN) {
@@ -326,28 +326,28 @@ static void _rt_load_params_itrl(int argc, char **argv) {
 
 // Buffer timing result from a single job
 static void _rt_save_job_result() {
+    if (!_rt_will_output)
+        return;
     if (_rt_jobs_complete >= _rt_max_jobs) {
         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);
     }
-    if (_rt_jobs_complete > -1 && _rt_will_output) {
 #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;
+    _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;
+    _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;
-#endif
-    }
+    _rt_mmdc_read[_rt_jobs_complete] = mmdc_res.read_bytes;
+    _rt_mmdc_write[_rt_jobs_complete] = mmdc_res.write_bytes;
+#endif /* MMDC_PROF */
 }
 
 // Save all buffered timing results to disk
@@ -465,7 +465,7 @@ static void _rt_stop_loop() {
  *    result. We use this to call our void function from inside a comparison.
  */
 #define for_each_job \
-    for (; _rt_jobs_complete < _rt_max_jobs && (_rt_start_loop(),1); \
+    for (; (_rt_max_jobs == -1 || _rt_jobs_complete < _rt_max_jobs) && (_rt_start_loop(),1); \
          _rt_stop_loop())
 
 /****** Legacy API ******