Fixing lockup on non-existing program.

votchallenge · May 12, 2017 · 2af883b · 2af883b
1 parent 4f3c09a
commit 2af883b
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/support/client/cli.cpp b/support/client/cli.cpp
@@ -660,7 +660,7 @@ int main( int argc, char** argv) {
 
         }
 
-    } catch (std::runtime_error e) {
+    } catch (const std::runtime_error &e) {
 
         fprintf(stderr, "Error: %s\n", e.what());
         result = -1;

diff --git a/support/client/client.cpp b/support/client/client.cpp
@@ -311,9 +311,16 @@ class TrackerProcess::State : public Synchronized {
 
 		if (!started) {
 			print_debug("Unable to start process");
-			throw new std::runtime_error("Unable to start the tracker process");
+			throw std::runtime_error("Unable to start the tracker process");
 		} else {
 
+			sleepf(0.1);
+			if (!process->is_alive()) {
+				print_debug("Unable to start process");
+				throw std::runtime_error("Unable to start the tracker process");
+			}
+
+
 			start_watchdog();
 
 			Logging logger = trax_no_log;
@@ -564,7 +571,6 @@ class TrackerProcess::State : public Synchronized {
 					state->flush_condition.notify();
 
 				}
-
 				if (err == -1) {
 					sleep(0);
 					continue;
@@ -575,6 +581,7 @@ class TrackerProcess::State : public Synchronized {
 			char chr;
 			bool flush = false;
 			int read = read_stream(err, &chr, 1);
+
 			if (read != 1) {
 
 				if (state->process_running()) err =  -1;

diff --git a/support/client/player.cpp b/support/client/player.cpp
@@ -381,7 +381,7 @@ int main(int argc, char** argv) {
 
         reader.release();
 
-    } catch (std::runtime_error e) {
+    } catch (const std::runtime_error &e) {
 
         fprintf(stderr, "Error: %s\n", e.what());
         result = -1;

diff --git a/support/client/tester.cpp b/support/client/tester.cpp
@@ -327,7 +327,7 @@ int main(int argc, char** argv) {
 
         }
 
-    } catch (std::runtime_error e) {
+    } catch (const std::runtime_error &e) {
 
         fprintf(stderr, "Error: %s\n", e.what());
         result = -1;