Allow usage of both timeout & loop together

Author: Baraa-Hasheesh

src/arguments.cpp

@@ -242,8 +242,7 @@ Error Arguments::parse(const char* args) {
                 }
 
             CASE("loop")
-                _loop = true;
-                if (value == NULL || (_timeout = parseTimeout(value)) == -1) {
+                if (value == NULL || (_loop = parseTimeout(value)) == -1) {
                     msg = "Invalid loop duration";
                 }
 

src/arguments.h

@@ -176,6 +176,7 @@ class Arguments {
     const char* _event;
     std::vector<const char*> _trace;
     int _timeout;
+    int _loop;
     long _interval;
     long _alloc;
     long _nativemem;
@@ -195,7 +196,6 @@ class Arguments {
     std::vector<const char*> _include;
     std::vector<const char*> _exclude;
     unsigned char _mcache;
-    bool _loop;
     bool _preloaded;
     bool _quiet;
     bool _threads;
@@ -237,6 +237,7 @@ class Arguments {
         _event(NULL),
         _trace(),
         _timeout(0),
+        _loop(0),
         _interval(0),
         _alloc(-1),
         _nativemem(-1),
@@ -256,7 +257,6 @@ class Arguments {
         _include(),
         _exclude(),
         _mcache(0),
-        _loop(false),
         _preloaded(false),
         _quiet(false),
         _threads(false),

src/profiler.cpp

@@ -1267,8 +1267,11 @@ Error Profiler::start(Arguments& args, bool reset) {
     _start_time = OS::micros();
     _epoch++;
 
-    if (args._timeout != 0 || args._output == OUTPUT_JFR) {
-        _stop_time = addTimeout(_start_time, args._timeout);
+    if (args._timeout != 0 || args._loop != 0 || args._output == OUTPUT_JFR) {
+        _loop_time = addTimeout(_start_time, args._loop);
+        if (args._file_num == 0) {
+            _stop_time = addTimeout(_start_time, args._timeout);
+        }
         startTimer();
     }
 
@@ -1846,7 +1849,8 @@ void Profiler::stopTimer() {
 
 void Profiler::timerLoop(void* timer_id) {
     u64 current_micros = OS::micros();
-    u64 sleep_until = _jfr.active() ? current_micros + 1000000 : _stop_time;
+    u64 loop_limit = std::min(_stop_time, _loop_time);
+    u64 sleep_until = _jfr.active() ? current_micros + 1000000 : std::min(_stop_time, loop_limit);
 
     while (true) {
         {
@@ -1858,7 +1862,7 @@ void Profiler::timerLoop(void* timer_id) {
             if (_timer_id != timer_id) return;
         }
 
-        if ((current_micros = OS::micros()) >= _stop_time) {
+        if ((current_micros = OS::micros()) >= loop_limit) {
             restart(_global_args);
             return;
         }
@@ -1998,8 +2002,9 @@ Error Profiler::run(Arguments& args) {
 
 Error Profiler::restart(Arguments& args) {
     MutexLocker ml(_state_lock);
+    bool restart = OS::micros() < _stop_time;
 
-    Error error = stop(args._loop);
+    Error error = stop(restart);
     if (error) {
         return error;
     }
@@ -2015,7 +2020,7 @@ Error Profiler::restart(Arguments& args) {
         }
     }
 
-    if (args._loop) {
+    if (restart) {
         args._fdtransfer = false;  // keep the previous connection
         args._file_num++;
         return start(args, true);

src/profiler.h

@@ -68,6 +68,7 @@ class Profiler {
 
     u64 _start_time;
     u64 _stop_time;
+    u64 _loop_time;
     int _epoch;
     u32 _gc_id;
     WaitableMutex _timer_lock;