Merge commit '6bd10d9' into bfgminer

README

@@ -168,6 +168,8 @@ Options for both config file and command line:
 --api-port          Port number of miner API (default: 4028)
 --balance           Change multipool strategy from failover to even share balance
 --benchmark         Run BFGMiner in benchmark mode - produces no shares
+--cmd-sick <arg>    Execute a command when a device is declared sick
+--cmd-dead <arg>    Execute a command when a device is declared dead
 --coinbase-addr <arg> Set coinbase payout address for solo mining
 --coinbase-sig <arg> Set coinbase signature when possible
 --compact           Use compact display without per device statistics

miner.c

@@ -358,6 +358,8 @@ static int include_count;
 #define JSON_MAX_DEPTH 10
 #define JSON_MAX_DEPTH_ERR "Too many levels of JSON includes (limit 10) or a loop"
 
+char *cmd_sick, *cmd_dead;
+
 #if defined(unix) || defined(__APPLE__)
 	static char *opt_stderr_cmd = NULL;
 	static int forkpid;
@@ -1382,6 +1384,12 @@ static struct opt_table opt_config_table[] = {
 		     set_int_0_to_9999, opt_show_intval, &opt_bench_algo,
 		     opt_hidden),
 #endif
+	OPT_WITH_ARG("--cmd-sick",
+	             opt_set_charp, NULL, &cmd_sick,
+	             "Execute a command when a device is declared sick"),
+	OPT_WITH_ARG("--cmd-dead",
+	             opt_set_charp, NULL, &cmd_dead,
+	             "Execute a command when a device is declared dead"),
 #if BLKMAKER_VERSION > 1
 	OPT_WITH_ARG("--coinbase-addr",
 		     set_b58addr, NULL, &opt_coinbase_script,
@@ -8706,6 +8714,8 @@ static void *watchdog_thread(void __maybe_unused *userdata)
 				cgtime(&thr->sick);
 
 				dev_error(cgpu, REASON_DEV_SICK_IDLE_60);
+				run_cmd(cmd_sick);
+				
 #ifdef HAVE_ADL
 				if (adl_active && cgpu->has_adl && gpu_activity(gpu) > 50) {
 					applog(LOG_ERR, "GPU still showing activity suggesting a hard hang.");
@@ -8722,6 +8732,7 @@ static void *watchdog_thread(void __maybe_unused *userdata)
 				cgtime(&thr->sick);
 
 				dev_error(cgpu, REASON_DEV_DEAD_IDLE_600);
+				run_cmd(cmd_dead);
 			} else if (now.tv_sec - thr->sick.tv_sec > 60 &&
 				   (cgpu->status == LIFE_SICK || cgpu->status == LIFE_DEAD)) {
 				/* Attempt to restart a GPU that's sick or dead once every minute */

util.c

@@ -2608,3 +2608,20 @@ void _bytes_alloc_failure(size_t sz)
 {
 	quit(1, "bytes_resize failed to allocate %lu bytes", (unsigned long)sz);
 }
+
+
+void *cmd_thread(void *cmdp)
+{
+	const char *cmd = cmdp;
+	applog(LOG_DEBUG, "Executing command: %s", cmd);
+	system(cmd);
+	return NULL;
+}
+
+void run_cmd(const char *cmd)
+{
+	if (!cmd)
+		return;
+	pthread_t pth;
+	pthread_create(&pth, NULL, cmd_thread, (void*)cmd);
+}

util.h

@@ -347,4 +347,7 @@ void maybe_strdup_if_null(const char **p, const char *s)
 }
 
 
+extern void run_cmd(const char *cmd);
+
+
 #endif /* __UTIL_H__ */