Power usage parameterized: -HWMON 0 works as before and -HWMON 1 shows power percentage for NVIDIA cards

Author: Davesmacer

.gitignore

@@ -71,3 +71,6 @@ project.pbxproj
 doc/html
 *.autosave
 node_modules/
+
+# vscode
+.vscode/

ethminer/MinerAux.h

@@ -92,9 +92,9 @@ class MinerCLI
 
 	MinerCLI(OperationMode _mode = OperationMode::None): mode(_mode) {}
 
-	static void signalHandler(int sig)
-	{
-		g_running = false;
+	static void signalHandler(int sig)
+	{
+		g_running = false;
 	}
 
 	bool interpretOption(int& i, int argc, char** argv)
@@ -252,6 +252,7 @@ class MinerCLI
 		else if ((arg == "-HWMON") && i + 1 < argc)
 		{
 			m_show_hwmonitors = true;
+			m_show_power = (bool)atoi(argv[++i]);
 		}
 
 #if API_CORE
@@ -596,7 +597,7 @@ class MinerCLI
 		}
 
 		g_running = true;
-		signal(SIGINT, MinerCLI::signalHandler);
+		signal(SIGINT, MinerCLI::signalHandler);
 		signal(SIGTERM, MinerCLI::signalHandler);
 
 		if (mode == OperationMode::Benchmark)
@@ -625,7 +626,9 @@ class MinerCLI
 			<< "        1: eth-proxy compatible: dwarfpool, f2pool, nanopool (required for hashrate reporting to work with nanopool)" << endl
 			<< "        2: EthereumStratum/1.0.0: nicehash" << endl
 			<< "    -RH, --report-hashrate Report current hashrate to pool (please only enable on pools supporting this)" << endl
-			<< "    -HWMON Displays gpu temp and fan percent." << endl
+			<< "    -HWMON Displays gpu temp, fan percent and power usage." << endl
+			<< "        0: Displays only temp and fan percent" << endl
+			<< "        1: Also displays power usage (only NVIDIA)" << endl
 			<< "    -SE, --stratum-email <s> Email address used in eth-proxy (optional)" << endl
 			<< "    --farm-recheck <n>  Leave n ms between checks for changed work (default: 500). When using stratum, use a high value (i.e. 2000) to get more stable hashrate output" << endl
 			<< endl
@@ -881,7 +884,7 @@ class MinerCLI
 		// Run CLI in loop
 		while (g_running) {
 			if (mgr.isConnected()) {
-				auto mp = f.miningProgress(m_show_hwmonitors);
+				auto mp = f.miningProgress(m_show_hwmonitors, m_show_power);
 				minelog << mp << f.getSolutionStats() << f.farmLaunchedFormatted();
 
 #if ETH_DBUS
@@ -944,6 +947,7 @@ class MinerCLI
 	bool m_farmRecheckSet = false;
 	int m_worktimeout = 180;
 	bool m_show_hwmonitors = false;
+	bool m_show_power = false;
 #if API_CORE
 	int m_api_port = 0;
 #endif

libethcore/Farm.h

@@ -247,7 +247,7 @@ class Farm: public FarmFace
      * @brief Get information on the progress of mining this work package.
      * @return The progress with mining so far.
      */
-    WorkingProgress const& miningProgress(bool hwmon = false) const
+    WorkingProgress const& miningProgress(bool hwmon = false, bool power = false) const
     {
         std::lock_guard<std::mutex> lock(x_minerWork);
         WorkingProgress p;
@@ -259,26 +259,38 @@ class Farm: public FarmFace
 			if (hwmon) {
 				HwMonitorInfo hwInfo = i->hwmonInfo();
 				HwMonitor hw;
-				unsigned int tempC = 0, fanpcnt = 0;
+				unsigned int tempC = 0, fanpcnt = 0, powerW = 0;
 				if (hwInfo.deviceIndex >= 0) {
 					if (hwInfo.deviceType == HwMonitorInfoType::NVIDIA && nvmlh) {
 						wrap_nvml_get_tempC(nvmlh, hwInfo.deviceIndex, &tempC);
 						wrap_nvml_get_fanpcnt(nvmlh, hwInfo.deviceIndex, &fanpcnt);
+						if(power) {
+							wrap_nvml_get_power_usage(nvmlh, hwInfo.deviceIndex, &powerW);
+						}
 					}
 					else if (hwInfo.deviceType == HwMonitorInfoType::AMD && adlh) {
 						wrap_adl_get_tempC(adlh, hwInfo.deviceIndex, &tempC);
 						wrap_adl_get_fanpcnt(adlh, hwInfo.deviceIndex, &fanpcnt);
+						//TODO
+						//if(power) {
+						//wrap_adl_get_power_usage(adlh, hwInfo.deviceIndex, &powerW);
+						//}
 					}
 #if defined(__linux)
 					// Overwrite with sysfs data if present
 					if (hwInfo.deviceType == HwMonitorInfoType::AMD && sysfsh) {
 						wrap_amdsysfs_get_tempC(sysfsh, hwInfo.deviceIndex, &tempC);
 						wrap_amdsysfs_get_fanpcnt(sysfsh, hwInfo.deviceIndex, &fanpcnt);
+						//TODO
+						//if(power) {
+						//wrap_amdsysfs_get_power_usage(sysfsh, hwInfo.deviceIndex, &powerW);
+						//}
 					}
 #endif
 				}
 				hw.tempC = tempC;
 				hw.fanP = fanpcnt;
+				hw.powrW = powerW/((double)1000.0);
 				p.minerMonitors.push_back(hw);
 			}
         }

libethcore/Miner.h

@@ -80,11 +80,18 @@ struct HwMonitor
 {
 	int tempC = 0;
 	int fanP = 0;
+	double powrW = 0;
 };
 
 inline std::ostream& operator<<(std::ostream& os, HwMonitor _hw)
 {
-	return os << _hw.tempC << "C " << _hw.fanP << "%";
+	string power = "";
+	if(_hw.powrW != 0){
+		ostringstream stream;
+		stream << fixed << setprecision(2) << _hw.powrW << "W";
+		power = stream.str();
+	}
+	return os << _hw.tempC << "C " << _hw.fanP << "% " << power;
 }
 
 /// Describes the progress of a mining operation.