kolan
/
gkrellm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- Wait up to 10 seconds for a running SpeedFan that has not detected its sensors yet (SHM file reports 0 sensors) 

- Add debug output for sensor init on win32
This commit is contained in:
Stefan Gehn 2008-12-28 15:59:37 +00:00
parent a1bc3c7aae
commit c8c1591363
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/sysdeps/win32.c
View File

@ -653,6 +653,7 @@ gkrellm_sys_sensors_mbm_init(void)
hData = gkrellm_sys_sensors_open_shm_helper(MBM_SHM_NAME, MBM_EXE_NAME); hData = gkrellm_sys_sensors_open_shm_helper(MBM_SHM_NAME, MBM_EXE_NAME);
if (hData == 0) if (hData == 0)
return FALSE; return FALSE;
gkrellm_debug(DEBUG_SYSDEP, "Mapping MBM SHM file\n");
pData = (MBMSharedData *)MapViewOfFile(hData, FILE_MAP_READ, 0, 0, 0); pData = (MBMSharedData *)MapViewOfFile(hData, FILE_MAP_READ, 0, 0, 0);
if (pData != NULL) if (pData != NULL)
{ {
@ -796,11 +797,25 @@ gkrellm_sys_sensors_sf_init(void)
hData = gkrellm_sys_sensors_open_shm_helper(SPEEDFAN_SHM_NAME, SPEEDFAN_EXE_NAME); hData = gkrellm_sys_sensors_open_shm_helper(SPEEDFAN_SHM_NAME, SPEEDFAN_EXE_NAME);
if (hData == 0) if (hData == 0)
return FALSE; return FALSE;
gkrellm_debug(DEBUG_SYSDEP, "Mapping SpeedFan SHM file\n");
pData = (SFSharedMemory *)MapViewOfFile(hData, FILE_MAP_READ, 0, 0, 0); pData = (SFSharedMemory *)MapViewOfFile(hData, FILE_MAP_READ, 0, 0, 0);
if (pData != NULL) if (pData != NULL)
{ {
ret = TRUE; // Mark SpeedFan as available ret = TRUE; // Mark SpeedFan as available
// Wait a bit for a running SpeedFan that has not detected all its sensors yet
i = 10;
while (i-- > 0)
{
if ((pData->NumTemps + pData->NumVolts + pData->NumFans) > 0)
break;
g_usleep(G_USEC_PER_SEC);
}
gkrellm_debug(DEBUG_SYSDEP, "Enumerating %hu temps, %hu voltages and %hu fans\n",
pData->NumTemps, pData->NumVolts, pData->NumFans);
for (i = 0; i < pData->NumTemps; i++) for (i = 0; i < pData->NumTemps; i++)
{ {
id_name = g_strdup_printf("speedfan-temp-%d", i); id_name = g_strdup_printf("speedfan-temp-%d", i);
@ -935,6 +950,7 @@ gkrellm_sys_sensors_ct_init(void)
hData = gkrellm_sys_sensors_open_shm_helper(CORE_TEMP_SHM_NAME, CORE_TEMP_EXE_NAME); hData = gkrellm_sys_sensors_open_shm_helper(CORE_TEMP_SHM_NAME, CORE_TEMP_EXE_NAME);
if (hData == 0) if (hData == 0)
return FALSE; return FALSE;
gkrellm_debug(DEBUG_SYSDEP, "Mapping CoreTemp SHM file\n");
pData = (CORE_TEMP_SHARED_DATA *)MapViewOfFile(hData, FILE_MAP_READ, 0, 0, 0); pData = (CORE_TEMP_SHARED_DATA *)MapViewOfFile(hData, FILE_MAP_READ, 0, 0, 0);
if (pData != NULL) if (pData != NULL)
{ {
@ -1013,6 +1029,7 @@ gkrellm_sys_sensors_init(void)
init_ok |= gkrellm_sys_sensors_ct_init(); init_ok |= gkrellm_sys_sensors_ct_init();
init_ok |= gkrellm_sys_sensors_mbm_init(); init_ok |= gkrellm_sys_sensors_mbm_init();
gkrellm_debug(DEBUG_SYSDEP, "INIT sensors finished, result is %d\n", init_ok);
// returns true if at least one sensors interface has been found // returns true if at least one sensors interface has been found
return init_ok; return init_ok;
} }