projects
/
psensor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
set max threshold for nvidia
[psensor.git]
/
src
/
lib
/
nvidia.c
diff --git
a/src/lib/nvidia.c
b/src/lib/nvidia.c
index
32a44b0
..
65cc9a7
100644
(file)
--- a/
src/lib/nvidia.c
+++ b/
src/lib/nvidia.c
@@
-31,12
+31,23
@@
#include <NVCtrl/NVCtrl.h>
#include <NVCtrl/NVCtrlLib.h>
#include <NVCtrl/NVCtrl.h>
#include <NVCtrl/NVCtrlLib.h>
+#include <nvidia.h>
#include <psensor.h>
#include <psensor.h>
-Display *display;
+
static
Display *display;
static const char *PROVIDER_NAME = "nvctrl";
static const char *PROVIDER_NAME = "nvctrl";
+static void set_nvidia_id(struct psensor *s, int id)
+{
+ *(int *)s->provider_data = id;
+}
+
+static int get_nvidia_id(struct psensor *s)
+{
+ return *(int *)s->provider_data;
+}
+
static char *get_product_name(int id, int type)
{
char *name;
static char *get_product_name(int id, int type)
{
char *name;
@@
-55,10
+66,14
@@
static char *get_product_name(int id, int type)
if (strcmp(name, "Unknown"))
return name;
if (strcmp(name, "Unknown"))
return name;
- log_err(_("Unknown NVIDIA product name for GPU %d"), id);
+ log_err(_("%s: Unknown NVIDIA product name for GPU %d"),
+ PROVIDER_NAME,
+ id);
free(name);
} else {
free(name);
} else {
- log_err(_("Failed to retrieve NVIDIA product name for GPU %d"),
+ log_err(_("%s: "
+ "Failed to retrieve NVIDIA product name for GPU %d"),
+ PROVIDER_NAME,
id);
}
id);
}
@@
-215,14
+230,18
@@
static double get_value(int id, int type)
static void update(struct psensor *sensor)
{
double v;
static void update(struct psensor *sensor)
{
double v;
+ int id;
+
+ id = get_nvidia_id(sensor);
- v = get_value(
sensor->nvidia_
id, sensor->type);
+ v = get_value(id, sensor->type);
if (v == UNKNOWN_DBL_VALUE)
if (v == UNKNOWN_DBL_VALUE)
- log_err(_("Failed to retrieve measure of type %x "
+ log_err(_("
%s:
Failed to retrieve measure of type %x "
"for NVIDIA GPU %d"),
"for NVIDIA GPU %d"),
+ PROVIDER_NAME,
sensor->type,
sensor->type,
-
sensor->nvidia_
id);
+ id);
psensor_set_current_value(sensor, v);
}
psensor_set_current_value(sensor, v);
}
@@
-253,6
+272,7
@@
static struct psensor *create_nvidia_sensor(int id, int subtype, int value_len)
int type;
size_t n;
struct psensor *s;
int type;
size_t n;
struct psensor *s;
+ double v;
type = SENSOR_TYPE_NVCTRL | subtype;
type = SENSOR_TYPE_NVCTRL | subtype;
@@
-271,28
+291,38
@@
static struct psensor *create_nvidia_sensor(int id, int subtype, int value_len)
sprintf(sid, "%s %s", PROVIDER_NAME, name);
s = psensor_create(sid, name, pname, type, value_len);
sprintf(sid, "%s %s", PROVIDER_NAME, name);
s = psensor_create(sid, name, pname, type, value_len);
- s->nvidia_id = id;
+ s->provider_data = malloc(sizeof(int));
+ set_nvidia_id(s, id);
+
+ if ((type & SENSOR_TYPE_GPU) && (type & SENSOR_TYPE_TEMP)) {
+ v = get_att(NV_CTRL_TARGET_TYPE_GPU,
+ id,
+ NV_CTRL_GPU_CORE_THRESHOLD);
+ s->max = v;
+ }
free(strnid);
return s;
}
free(strnid);
return s;
}
-static int init()
+static int init(
void
)
{
int evt, err;
display = XOpenDisplay(NULL);
if (!display) {
{
int evt, err;
display = XOpenDisplay(NULL);
if (!display) {
- log_err(_("Cannot open connection to X11 server."));
+ log_err(_("%s: Cannot open connection to X11 server."),
+ PROVIDER_NAME);
return 0;
}
if (XNVCTRLQueryExtension(display, &evt, &err))
return 1;
return 0;
}
if (XNVCTRLQueryExtension(display, &evt, &err))
return 1;
- log_err(_("Failed to retrieve NVIDIA information."));
+ log_err(_("%s: Failed to retrieve NVIDIA information."),
+ PROVIDER_NAME);
return 0;
}
return 0;
}
@@
-349,7
+379,7
@@
void nvidia_psensor_list_append(struct psensor ***ss, int values_len)
ret = XNVCTRLQueryTargetCount(display, NV_CTRL_TARGET_TYPE_COOLER, &n);
if (ret == True) {
ret = XNVCTRLQueryTargetCount(display, NV_CTRL_TARGET_TYPE_COOLER, &n);
if (ret == True) {
- log_
debug("NVIDIA: number of fans: %d"
, n);
+ log_
fct("%s: Number of fans: %d", PROVIDER_NAME
, n);
for (i = 0; i < n; i++) {
utype = SENSOR_TYPE_FAN | SENSOR_TYPE_RPM;
if (check_sensor(i, utype))
for (i = 0; i < n; i++) {
utype = SENSOR_TYPE_FAN | SENSOR_TYPE_RPM;
if (check_sensor(i, utype))
@@
-360,11
+390,12
@@
void nvidia_psensor_list_append(struct psensor ***ss, int values_len)
add(ss, i, utype, values_len);
}
} else {
add(ss, i, utype, values_len);
}
} else {
- log_err(_("NVIDIA: failed to retrieve number of fans."));
+ log_err(_("%s: Failed to retrieve number of fans."),
+ PROVIDER_NAME);
}
}
}
}
-void nvidia_cleanup()
+void nvidia_cleanup(
void
)
{
if (display) {
XCloseDisplay(display);
{
if (display) {
XCloseDisplay(display);