formatting by request

SVN revision: 79962
This commit is contained in:
Mike Blumenkrantz 2012-12-01 08:42:33 +00:00
parent ffe6ab106c
commit 18ceb3defd
1 changed files with 268 additions and 239 deletions

View File

@ -33,7 +33,7 @@ static int mib[5];
#ifdef __OpenBSD__ #ifdef __OpenBSD__
static int dev, numt; static int dev, numt;
static struct sensordev snsrdev; static struct sensordev snsrdev;
static size_t sdlen = sizeof(snsrdev); static size_t sdlen = sizeof(snsrdev);
static struct sensor snsr; static struct sensor snsr;
static size_t slen = sizeof(snsr); static size_t slen = sizeof(snsr);
@ -42,12 +42,12 @@ static size_t slen = sizeof(snsr);
static Ecore_Poller *poller = NULL; static Ecore_Poller *poller = NULL;
static int ptemp = 0; static int ptemp = 0;
static void init(void); static void init(void);
static int check(void); static int check(void);
static Eina_Bool poll_cb(void *data); static Eina_Bool poll_cb(void *data);
Eina_List * Eina_List *
temperature_get_bus_files(const char* bus) temperature_get_bus_files(const char *bus)
{ {
Eina_List *result; Eina_List *result;
Eina_List *therms; Eina_List *therms;
@ -68,7 +68,7 @@ temperature_get_bus_files(const char* bus)
/* Search each device for temp*_input, these should be /* Search each device for temp*_input, these should be
* temperature devices. */ * temperature devices. */
snprintf(path, sizeof(path),"%s/%s", busdir, name); snprintf(path, sizeof(path), "%s/%s", busdir, name);
files = ecore_file_ls(path); files = ecore_file_ls(path);
EINA_LIST_FREE(files, file) EINA_LIST_FREE(files, file)
{ {
@ -100,56 +100,60 @@ init(void)
if ((!sensor_type) || ((!sensor_name) || (sensor_name[0] == 0))) if ((!sensor_type) || ((!sensor_name) || (sensor_name[0] == 0)))
{ {
if (sensor_name) free(sensor_name); if (sensor_name) free(sensor_name);
if (sensor_path) free(sensor_path); if (sensor_path) free(sensor_path);
sensor_path = NULL; sensor_path = NULL;
#ifdef __FreeBSD__ #ifdef __FreeBSD__
/* TODO: FreeBSD can also have more temperature sensors! */ /* TODO: FreeBSD can also have more temperature sensors! */
sensor_type = SENSOR_TYPE_FREEBSD; sensor_type = SENSOR_TYPE_FREEBSD;
sensor_name = strdup("tz0"); sensor_name = strdup("tz0");
#elif __OpenBSD__ #elif __OpenBSD__
mib[0] = CTL_HW; mib[0] = CTL_HW;
mib[1] = HW_SENSORS; mib[1] = HW_SENSORS;
for (dev = 0; ; dev++) { for (dev = 0;; dev++) {
mib[2] = dev; mib[2] = dev;
if (sysctl(mib, 3, &snsrdev, &sdlen, NULL, 0) == -1) { if (sysctl(mib, 3, &snsrdev, &sdlen, NULL, 0) == -1)
if (errno == ENOENT) /* no further sensors */ {
break; if (errno == ENOENT) /* no further sensors */
else break;
continue; else
} continue;
if (strcmp(snsrdev.xname, "cpu0") == 0) { }
sensor_type = SENSOR_TYPE_OPENBSD; if (strcmp(snsrdev.xname, "cpu0") == 0)
sensor_name = strdup("cpu0"); {
break; sensor_type = SENSOR_TYPE_OPENBSD;
} else if (strcmp(snsrdev.xname, "km0") == 0) { sensor_name = strdup("cpu0");
sensor_type = SENSOR_TYPE_OPENBSD; break;
sensor_name = strdup("km0"); }
break; else if (strcmp(snsrdev.xname, "km0") == 0)
} {
} sensor_type = SENSOR_TYPE_OPENBSD;
sensor_name = strdup("km0");
break;
}
}
#else #else
therms = ecore_file_ls("/proc/acpi/thermal_zone"); therms = ecore_file_ls("/proc/acpi/thermal_zone");
if (therms) if (therms)
{ {
char *name; char *name;
name = eina_list_data_get(therms); name = eina_list_data_get(therms);
sensor_type = SENSOR_TYPE_LINUX_ACPI; sensor_type = SENSOR_TYPE_LINUX_ACPI;
sensor_name = strdup(name); sensor_name = strdup(name);
eina_list_free(therms); eina_list_free(therms);
} }
else else
{ {
eina_list_free(therms); eina_list_free(therms);
therms = ecore_file_ls("/sys/class/thermal"); therms = ecore_file_ls("/sys/class/thermal");
if (therms) if (therms)
{ {
char *name; char *name;
Eina_List *l; Eina_List *l;
EINA_LIST_FOREACH(therms, l, name) EINA_LIST_FOREACH(therms, l, name)
{ {
if (!strncmp(name, "thermal", 7)) if (!strncmp(name, "thermal", 7))
@ -197,13 +201,13 @@ init(void)
if (therms) if (therms)
{ {
char *name; char *name;
if ((name = eina_list_data_get(therms))) if ((name = eina_list_data_get(therms)))
{ {
if (ecore_file_exists(name)) if (ecore_file_exists(name))
{ {
int len; int len;
snprintf(path, sizeof(path), snprintf(path, sizeof(path),
"%s", ecore_file_file_get(name)); "%s", ecore_file_file_get(name));
len = strlen(path); len = strlen(path);
@ -226,13 +230,13 @@ init(void)
if (therms) if (therms)
{ {
char *name; char *name;
if ((name = eina_list_data_get(therms))) if ((name = eina_list_data_get(therms)))
{ {
if (ecore_file_exists(name)) if (ecore_file_exists(name))
{ {
int len; int len;
snprintf(path, sizeof(path), snprintf(path, sizeof(path),
"%s", ecore_file_file_get(name)); "%s", ecore_file_file_get(name));
len = strlen(path); len = strlen(path);
@ -249,61 +253,70 @@ init(void)
eina_list_free(therms); eina_list_free(therms);
} }
} }
} }
} }
} }
#endif #endif
} }
if ((sensor_type) && (sensor_name) && (!sensor_path)) if ((sensor_type) && (sensor_name) && (!sensor_path))
{ {
char *name; char *name;
switch (sensor_type) switch (sensor_type)
{ {
case SENSOR_TYPE_NONE: case SENSOR_TYPE_NONE:
break; break;
case SENSOR_TYPE_FREEBSD:
case SENSOR_TYPE_FREEBSD:
#ifdef __FreeBSD__ #ifdef __FreeBSD__
snprintf(path, sizeof(path), "hw.acpi.thermal.%s.temperature", snprintf(path, sizeof(path), "hw.acpi.thermal.%s.temperature",
sensor_name); sensor_name);
sensor_path = strdup(path); sensor_path = strdup(path);
len = 5; len = 5;
sysctlnametomib(sensor_path, mib, &len); sysctlnametomib(sensor_path, mib, &len);
#endif #endif
break; break;
case SENSOR_TYPE_OPENBSD:
case SENSOR_TYPE_OPENBSD:
#ifdef __OpenBSD__ #ifdef __OpenBSD__
for (numt = 0; numt < snsrdev.maxnumt[SENSOR_TEMP]; numt++) { for (numt = 0; numt < snsrdev.maxnumt[SENSOR_TEMP]; numt++) {
mib[4] = numt; mib[4] = numt;
slen = sizeof(snsr); slen = sizeof(snsr);
if (sysctl(mib, 5, &snsr, &slen, NULL, 0) == -1) if (sysctl(mib, 5, &snsr, &slen, NULL, 0) == -1)
continue; continue;
if (slen > 0 && (snsr.flags & SENSOR_FINVALID) == 0) { if (slen > 0 && (snsr.flags & SENSOR_FINVALID) == 0)
break; {
} break;
}
} }
#endif #endif
break; break;
case SENSOR_TYPE_OMNIBOOK:
sensor_path = strdup("/proc/omnibook/temperature");
break;
case SENSOR_TYPE_LINUX_MACMINI:
sensor_path = strdup("/sys/devices/temperatures/cpu_temperature");
break;
case SENSOR_TYPE_LINUX_PBOOK:
sensor_path = strdup("/sys/devices/temperatures/sensor1_temperature");
break;
case SENSOR_TYPE_LINUX_INTELCORETEMP:
sensor_path = strdup("/sys/devices/platform/coretemp.0/temp1_input");
break;
case SENSOR_TYPE_LINUX_THINKPAD:
sensor_path = strdup("/sys/devices/platform/thinkpad_hwmon/temp1_input");
break;
case SENSOR_TYPE_LINUX_I2C:
therms = ecore_file_ls("/sys/bus/i2c/devices");
EINA_LIST_FREE(therms, name) case SENSOR_TYPE_OMNIBOOK:
sensor_path = strdup("/proc/omnibook/temperature");
break;
case SENSOR_TYPE_LINUX_MACMINI:
sensor_path = strdup("/sys/devices/temperatures/cpu_temperature");
break;
case SENSOR_TYPE_LINUX_PBOOK:
sensor_path = strdup("/sys/devices/temperatures/sensor1_temperature");
break;
case SENSOR_TYPE_LINUX_INTELCORETEMP:
sensor_path = strdup("/sys/devices/platform/coretemp.0/temp1_input");
break;
case SENSOR_TYPE_LINUX_THINKPAD:
sensor_path = strdup("/sys/devices/platform/thinkpad_hwmon/temp1_input");
break;
case SENSOR_TYPE_LINUX_I2C:
therms = ecore_file_ls("/sys/bus/i2c/devices");
EINA_LIST_FREE(therms, name)
{ {
snprintf(path, sizeof(path), snprintf(path, sizeof(path),
"/sys/bus/i2c/devices/%s/%s_input", "/sys/bus/i2c/devices/%s/%s_input",
@ -311,17 +324,18 @@ init(void)
if (ecore_file_exists(path)) if (ecore_file_exists(path))
{ {
sensor_path = strdup(path); sensor_path = strdup(path);
/* We really only care about the first /* We really only care about the first
* one for the default. */ * one for the default. */
break; break;
} }
free(name); free(name);
} }
break; break;
case SENSOR_TYPE_LINUX_PCI:
therms = ecore_file_ls("/sys/bus/pci/devices");
EINA_LIST_FREE(therms, name) case SENSOR_TYPE_LINUX_PCI:
therms = ecore_file_ls("/sys/bus/pci/devices");
EINA_LIST_FREE(therms, name)
{ {
snprintf(path, sizeof(path), snprintf(path, sizeof(path),
"/sys/bus/pci/devices/%s/%s_input", "/sys/bus/pci/devices/%s/%s_input",
@ -333,22 +347,25 @@ init(void)
* one for the default. */ * one for the default. */
break; break;
} }
free(name); free(name);
} }
break; break;
case SENSOR_TYPE_LINUX_ACPI:
snprintf(path, sizeof(path), case SENSOR_TYPE_LINUX_ACPI:
"/proc/acpi/thermal_zone/%s/temperature", sensor_name); snprintf(path, sizeof(path),
sensor_path = strdup(path); "/proc/acpi/thermal_zone/%s/temperature", sensor_name);
break; sensor_path = strdup(path);
case SENSOR_TYPE_LINUX_SYS: break;
snprintf(path, sizeof(path),
"/sys/class/thermal/%s/temp", sensor_name); case SENSOR_TYPE_LINUX_SYS:
sensor_path = strdup(path); snprintf(path, sizeof(path),
break; "/sys/class/thermal/%s/temp", sensor_name);
sensor_path = strdup(path);
break;
default: default:
break; break;
} }
} }
} }
@ -371,148 +388,159 @@ check(void)
switch (sensor_type) switch (sensor_type)
{ {
case SENSOR_TYPE_NONE: case SENSOR_TYPE_NONE:
/* TODO: Slow down poller? */ /* TODO: Slow down poller? */
break; break;
case SENSOR_TYPE_FREEBSD: case SENSOR_TYPE_FREEBSD:
#ifdef __FreeBSD__ #ifdef __FreeBSD__
len = sizeof(temp); len = sizeof(temp);
if (sysctl(mib, 5, &ftemp, &len, NULL, 0) != -1) if (sysctl(mib, 5, &ftemp, &len, NULL, 0) != -1)
{ {
temp = (ftemp - 2732) / 10; temp = (ftemp - 2732) / 10;
ret = 1; ret = 1;
} }
else else
goto error; goto error;
#endif #endif
break; break;
case SENSOR_TYPE_OPENBSD: case SENSOR_TYPE_OPENBSD:
#ifdef __OpenBSD__ #ifdef __OpenBSD__
if (sysctl(mib, 5, &snsr, &slen, NULL, 0) != -1) { if (sysctl(mib, 5, &snsr, &slen, NULL, 0) != -1)
temp = (snsr.value - 273150000) / 1000000.0; {
ret = 1; temp = (snsr.value - 273150000) / 1000000.0;
} ret = 1;
else }
goto error; else
goto error;
#endif #endif
break; break;
case SENSOR_TYPE_OMNIBOOK:
f = fopen(sensor_path, "r");
if (f)
{
char dummy[4096];
if (fgets(buf, sizeof(buf), f) == NULL) goto error; case SENSOR_TYPE_OMNIBOOK:
f = fopen(sensor_path, "r");
if (f)
{
char dummy[4096];
if (fgets(buf, sizeof(buf), f) == NULL) goto error;
buf[sizeof(buf) - 1] = 0; buf[sizeof(buf) - 1] = 0;
if (sscanf(buf, "%s %s %i", dummy, dummy, &temp) == 3) if (sscanf(buf, "%s %s %i", dummy, dummy, &temp) == 3)
ret = 1; ret = 1;
else else
goto error; goto error;
fclose(f); fclose(f);
} }
else else
goto error; goto error;
break; break;
case SENSOR_TYPE_LINUX_MACMINI: case SENSOR_TYPE_LINUX_MACMINI:
case SENSOR_TYPE_LINUX_PBOOK: case SENSOR_TYPE_LINUX_PBOOK:
f = fopen(sensor_path, "rb"); f = fopen(sensor_path, "rb");
if (f) if (f)
{ {
if (fgets(buf, sizeof(buf), f) == NULL) goto error; if (fgets(buf, sizeof(buf), f) == NULL) goto error;
fclose(f); fclose(f);
buf[sizeof(buf) - 1] = 0; buf[sizeof(buf) - 1] = 0;
if (sscanf(buf, "%i", &temp) == 1) if (sscanf(buf, "%i", &temp) == 1)
ret = 1; ret = 1;
else else
goto error; goto error;
} }
else else
goto error; goto error;
break; break;
case SENSOR_TYPE_LINUX_INTELCORETEMP: case SENSOR_TYPE_LINUX_INTELCORETEMP:
case SENSOR_TYPE_LINUX_I2C: case SENSOR_TYPE_LINUX_I2C:
case SENSOR_TYPE_LINUX_THINKPAD: case SENSOR_TYPE_LINUX_THINKPAD:
f = fopen(sensor_path, "r"); f = fopen(sensor_path, "r");
if (f) if (f)
{ {
if (fgets(buf, sizeof(buf), f) == NULL) goto error; if (fgets(buf, sizeof(buf), f) == NULL) goto error;
buf[sizeof(buf) - 1] = 0; buf[sizeof(buf) - 1] = 0;
/* actually read the temp */
if (sscanf(buf, "%i", &temp) == 1)
ret = 1;
else
goto error;
/* Hack for temp */
temp = temp / 1000;
fclose(f);
}
else
goto error;
break;
/* actually read the temp */
if (sscanf(buf, "%i", &temp) == 1)
ret = 1;
else
goto error;
/* Hack for temp */
temp = temp / 1000;
fclose(f);
}
else
goto error;
break;
case SENSOR_TYPE_LINUX_PCI: case SENSOR_TYPE_LINUX_PCI:
f = fopen(sensor_path, "r"); f = fopen(sensor_path, "r");
if (f) if (f)
{ {
if (fgets(buf, sizeof(buf), f) == NULL) goto error; if (fgets(buf, sizeof(buf), f) == NULL) goto error;
buf[sizeof(buf) - 1] = 0; buf[sizeof(buf) - 1] = 0;
/* actually read the temp */
if (sscanf(buf, "%i", &temp) == 1)
ret = 1;
else
goto error;
/* Hack for temp */
temp = temp / 1000;
fclose(f);
}
else
goto error;
break;
/* actually read the temp */
if (sscanf(buf, "%i", &temp) == 1)
ret = 1;
else
goto error;
/* Hack for temp */
temp = temp / 1000;
fclose(f);
}
else
goto error;
break;
case SENSOR_TYPE_LINUX_ACPI: case SENSOR_TYPE_LINUX_ACPI:
f = fopen(sensor_path, "r"); f = fopen(sensor_path, "r");
if (f) if (f)
{ {
char *p, *q; char *p, *q;
if (fgets(buf, sizeof(buf), f) == NULL) goto error; if (fgets(buf, sizeof(buf), f) == NULL) goto error;
buf[sizeof(buf) - 1] = 0; buf[sizeof(buf) - 1] = 0;
fclose(f); fclose(f);
p = strchr(buf, ':'); p = strchr(buf, ':');
if (p) if (p)
{ {
p++; p++;
while (*p == ' ') p++; while (*p == ' ')
q = strchr(p, ' '); p++;
if (q) *q = 0; q = strchr(p, ' ');
temp = atoi(p); if (q) *q = 0;
ret = 1; temp = atoi(p);
} ret = 1;
else }
goto error; else
} goto error;
else }
goto error; else
break; goto error;
break;
case SENSOR_TYPE_LINUX_SYS: case SENSOR_TYPE_LINUX_SYS:
f = fopen(sensor_path, "r"); f = fopen(sensor_path, "r");
if (f) if (f)
{ {
if (fgets(buf, sizeof(buf), f) == NULL) goto error; if (fgets(buf, sizeof(buf), f) == NULL) goto error;
buf[sizeof(buf) - 1] = 0; buf[sizeof(buf) - 1] = 0;
fclose(f); fclose(f);
temp = atoi(buf); temp = atoi(buf);
temp /= 1000; temp /= 1000;
ret = 1; ret = 1;
} }
else else
goto error; goto error;
break; break;
default: default:
break; break;
} }
@ -538,28 +566,28 @@ poll_cb(void *data __UNUSED__)
pp = cur_poll_interval; pp = cur_poll_interval;
if (t != ptemp) if (t != ptemp)
{ {
cur_poll_interval /= 2; cur_poll_interval /= 2;
if (cur_poll_interval < 4) cur_poll_interval = 4; if (cur_poll_interval < 4) cur_poll_interval = 4;
} }
else else
{ {
cur_poll_interval *= 2; cur_poll_interval *= 2;
if (cur_poll_interval > 256) cur_poll_interval = 256; if (cur_poll_interval > 256) cur_poll_interval = 256;
} }
/* adapt polling based on if temp changes - every time it changes, /* adapt polling based on if temp changes - every time it changes,
* halve the time between polls, otherwise double it, between 4 and * halve the time between polls, otherwise double it, between 4 and
* 256 ticks */ * 256 ticks */
if (pp != cur_poll_interval) if (pp != cur_poll_interval)
{ {
if (poller) ecore_poller_del(poller); if (poller) ecore_poller_del(poller);
poller = ecore_poller_add(ECORE_POLLER_CORE, cur_poll_interval, poller = ecore_poller_add(ECORE_POLLER_CORE, cur_poll_interval,
poll_cb, NULL); poll_cb, NULL);
} }
if (t != ptemp) if (t != ptemp)
{ {
if (t == -999) printf("ERROR\n"); if (t == -999) printf("ERROR\n");
else printf("%i\n", t); else printf("%i\n", t);
fflush(stdout); fflush(stdout);
} }
ptemp = t; ptemp = t;
return ECORE_CALLBACK_RENEW; return ECORE_CALLBACK_RENEW;
@ -570,15 +598,15 @@ main(int argc, char *argv[])
{ {
if (argc != 4) if (argc != 4)
{ {
printf("ARGS INCORRECT!\n"); printf("ARGS INCORRECT!\n");
return 0; return 0;
} }
sensor_type = atoi(argv[1]); sensor_type = atoi(argv[1]);
sensor_name = strdup(argv[2]); sensor_name = strdup(argv[2]);
if (!strcmp(sensor_name, "-null-")) if (!strcmp(sensor_name, "-null-"))
{ {
free(sensor_name); free(sensor_name);
sensor_name = NULL; sensor_name = NULL;
} }
poll_interval = atoi(argv[3]); poll_interval = atoi(argv[3]);
cur_poll_interval = poll_interval; cur_poll_interval = poll_interval;
@ -589,7 +617,7 @@ main(int argc, char *argv[])
if (poller) ecore_poller_del(poller); if (poller) ecore_poller_del(poller);
poller = ecore_poller_add(ECORE_POLLER_CORE, cur_poll_interval, poller = ecore_poller_add(ECORE_POLLER_CORE, cur_poll_interval,
poll_cb, NULL); poll_cb, NULL);
poll_cb(NULL); poll_cb(NULL);
ecore_main_loop_begin(); ecore_main_loop_begin();
@ -597,3 +625,4 @@ main(int argc, char *argv[])
return 0; return 0;
} }