handle signals

HAndle signals to close the miner

Author: psychocrypt

xmrstak/backend/amd/amd_gpu/gpu.cpp

@@ -607,7 +607,7 @@ size_t InitOpenCLGpu(cl_context opencl_ctx, GpuContext* ctx, const char* source_
 	return 0;
 }
 
-size_t FinalizeOpenCL(GpuContext* ctx)
+void FinalizeOpenCL(GpuContext* ctx)
 {
 	xmrstak_algo miner_algo[2] = {
 		::jconf::inst()->GetCurrentCoinSelection().GetDescription(1).GetMiningAlgo(),

xmrstak/backend/amd/amd_gpu/gpu.hpp

@@ -52,7 +52,7 @@ int getAMDPlatformIdx();
 std::vector<GpuContext> getAMDDevices(int index);
 
 size_t InitOpenCL(GpuContext* ctx, size_t num_gpus, size_t platform_idx);
-size_t FinalizeOpenCL(GpuContext* ctx);
+void FinalizeOpenCL(GpuContext* ctx);
 size_t XMRSetJob(GpuContext* ctx, uint8_t* input, size_t input_len, uint64_t target, xmrstak_algo miner_algo);
 size_t XMRRunJob(GpuContext* ctx, cl_uint* HashOutput, xmrstak_algo miner_algo);
 

xmrstak/cli/cli-miner.cpp

@@ -55,6 +55,14 @@
 #	include "xmrstak/misc/uac.hpp"
 #endif // _WIN32
 
+#include <csignal>
+
+// exit miner if we receive a signal e.g. CTRL+C
+void signal_handler(int signal)
+{
+	executor::inst()->shutdown();
+}
+
 int do_benchmark(int block_version, int wait_sec, int work_sec);
 
 void help()
@@ -747,6 +755,10 @@ int main(int argc, char *argv[])
 	if(strlen(jconf::inst()->GetOutputFile()) != 0)
 		printer::inst()->open_logfile(jconf::inst()->GetOutputFile());
 
+	std::signal(SIGINT, signal_handler);
+	std::signal(SIGABRT, signal_handler);
+	std::signal(SIGTERM, signal_handler);
+
 	if (!BackendConnector::self_test())
 	{
 		printer::inst()->print_msg(L0, "Self test not passed!");
@@ -814,7 +826,6 @@ int main(int argc, char *argv[])
 	while(!forceQuit && !exec->isShutdownFinished())
 	{
 		key = get_key();
-
 		switch(key)
 		{
 		case 'h':

xmrstak/misc/executor.cpp

@@ -45,7 +45,6 @@
 #include <assert.h>
 #include <time.h>
 
-
 #ifdef _WIN32
 #define strncasecmp _strnicmp
 #endif // _WIN32
@@ -488,7 +487,7 @@ inline void disable_sigpipe() {}
 #endif
 
 void executor::ex_main()
-{
+{	
 	disable_sigpipe();
 
 	assert(1000 % iTickTime == 0);
@@ -599,7 +598,7 @@ void executor::ex_main()
 	// If the user requested it, start the autohash printer
 	if(jconf::inst()->GetVerboseLevel() >= 4)
 		push_timed_event(ex_event(EV_HASHRATE_LOOP), jconf::inst()->GetAutohashTime());
-
+	
 	size_t cnt = 0;
 	while(!bQuit)
 	{