Some fixes for uninitialized vars + removed linking hwmon to cl and cuda

Author: smurfy

libethash-cl/CMakeLists.txt

@@ -45,5 +45,5 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
 include_directories(..)
 
 add_library(ethash-cl ${SOURCES})
-target_link_libraries(ethash-cl PUBLIC ethcore ethash hwmon)
+target_link_libraries(ethash-cl PUBLIC ethcore ethash)
 target_link_libraries(ethash-cl PRIVATE OpenCL::OpenCL)

libethash-cuda/CMakeLists.txt

@@ -27,6 +27,6 @@ file(GLOB sources "*.cpp" "*.cu")
 file(GLOB headers "*.h" "*.cuh")
 
 cuda_add_library(ethash-cuda STATIC ${sources} ${headers})
-target_link_libraries(ethash-cuda ethcore ethash hwmon)
+target_link_libraries(ethash-cuda ethcore ethash)
 target_include_directories(ethash-cuda PUBLIC ${CUDA_INCLUDE_DIRS})
 target_include_directories(ethash-cuda PRIVATE .. ${CMAKE_CURRENT_BINARY_DIR})

libethcore/CMakeLists.txt

@@ -9,7 +9,7 @@ set(SOURCES
 include_directories(BEFORE ..)
 
 add_library(ethcore ${SOURCES})
-target_link_libraries(ethcore ethash devcore)
+target_link_libraries(ethcore ethash devcore hwmon)
 
 if(ETHASHCL)
 	target_link_libraries(ethcore ethash-cl)

libethcore/Farm.h

@@ -263,21 +263,23 @@ class Farm: public FarmFace
 				HwMonitorInfo hwInfo = i->hwmonInfo();
 				HwMonitor hw;
 				unsigned int tempC = 0, fanpcnt = 0;
-				if (hwInfo.deviceType == HwMonitorInfoType::NVIDIA && nvmlh) {
-					wrap_nvml_get_tempC(nvmlh, hwInfo.deviceIndex, &tempC);
-					wrap_nvml_get_fanpcnt(nvmlh, hwInfo.deviceIndex, &fanpcnt);
-				} 
-				else if (hwInfo.deviceType == HwMonitorInfoType::AMD && adlh) {
-					wrap_adl_get_tempC(adlh, hwInfo.deviceIndex, &tempC);
-					wrap_adl_get_fanpcnt(adlh, hwInfo.deviceIndex, &fanpcnt);
-				}
+				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);
+					}
+					else if (hwInfo.deviceType == HwMonitorInfoType::AMD && adlh) {
+						wrap_adl_get_tempC(adlh, hwInfo.deviceIndex, &tempC);
+						wrap_adl_get_fanpcnt(adlh, hwInfo.deviceIndex, &fanpcnt);
+					}
 #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);
-				}
+					// 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);
+					}
 #endif
+				}
 				hw.tempC = tempC;
 				hw.fanP = fanpcnt;
 				p.minerMonitors.push_back(hw);

libethcore/Miner.h

@@ -72,8 +72,8 @@ enum class HwMonitorInfoType
 
 struct HwMonitorInfo
 {
-	HwMonitorInfoType deviceType;
-	int deviceIndex;
+	HwMonitorInfoType deviceType = HwMonitorInfoType::UNKNOWN;
+	int deviceIndex = -1;
 };
 
 struct HwMonitor

libhwmon/wrapamdsysfs.cpp

@@ -49,6 +49,7 @@ wrap_amdsysfs_handle * wrap_amdsysfs_create()
 
 	unsigned int gpucount = 0;
 	struct dirent* dire;
+	errno = 0;
 	while ((dire = readdir(dirp)) != nullptr)
 	{
 		if (::strncmp(dire->d_name, "card", 4) != 0)