add warning if orphaned obs64 process could not be reaped

Author: sandboxcoder

obs-studio-client/source/controller.cpp

@@ -249,47 +249,6 @@ static void write_pid_file(std::string &pid_path, uint64_t pid)
 	pid_file.write(reinterpret_cast<char *>(&pid), sizeof(pid));
 }
 
-#elif defined(__APPLE__)
-enum TimeoutResult { Success, Error, Timeout };
-
-TimeoutResult wait_with_timeout(pid_t target_pid, int timeout_seconds, int sleepIntervalSeconds)
-{
-	TimeoutResult result = TimeoutResult::Timeout;
-
-	auto start = std::chrono::steady_clock::now();
-	auto end = start + std::chrono::seconds(timeout_seconds);
-
-	do {
-		int kill_result = kill(target_pid, 0);
-
-		if (kill_result == -1) {
-			if (errno == EINTR) {
-				continue;
-			}
-			if (errno == ESRCH) {
-				result = TimeoutResult::Success;
-				break;
-			}
-			result = TimeoutResult::Error;
-			break;
-		}
-
-		auto now = std::chrono::steady_clock::now();
-		if (now >= end)
-			break;
-
-		auto remaining = end - now;
-		auto remaining_seconds = std::chrono::duration_cast<std::chrono::seconds>(remaining);
-
-		auto sleep_duration = std::min(remaining_seconds, std::chrono::seconds(sleepIntervalSeconds));
-
-		std::this_thread::sleep_for(sleep_duration);
-
-	} while (true);
-
-	return result;
-}
-
 #endif
 
 Controller::Controller() {}
@@ -350,20 +309,8 @@ std::shared_ptr<ipc::client> Controller::host(const std::string &uri)
 		int st = proc_pidinfo(pids[i], PROC_PIDTBSDINFO, 0, &proc, PROC_PIDTBSDINFO_SIZE);
 		if (st == PROC_PIDTBSDINFO_SIZE) {
 			if (strcmp("obs64", proc.pbi_name) == 0) {
-				if (pids[i] != 0) {
-					if (kill(pids[i], SIGKILL) == 0) {
-						TimeoutResult waitPidResult = wait_with_timeout(pids[i], processTimeoutSeconds, sleepIntervalSeconds);
-						switch (waitPidResult) {
-						case TimeoutResult::Error:
-							std::cout << "waitPidResult had an error" << std::endl;
-							break;
-						case TimeoutResult::Timeout:
-							std::cout << "waitPidResult could not close the PID before the timeout" << std::endl;
-							break;
-						case TimeoutResult::Success:
-							break;
-						}
-					}
+				if (pids[i] != 0 && kill(pids[i], SIGKILL) != 0) {
+                    std::cout << "Warning: could not kill orphaned/former obs64 process" << std::endl;
 				}
 			}
 		}