projects
/
psensor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added experimental support for ati/amd gpu/fan
[psensor.git]
/
src
/
main.c
diff --git
a/src/main.c
b/src/main.c
index
a9b07b6
..
3a55482
100644
(file)
--- a/
src/main.c
+++ b/
src/main.c
@@
-27,9
+27,6
@@
#include <gtk/gtk.h>
#include <gtk/gtk.h>
-#include <sensors/sensors.h>
-#include <sensors/error.h>
-
#include "config.h"
#include "cfg.h"
#include "config.h"
#include "cfg.h"
@@
-50,6
+47,10
@@
#include "nvidia.h"
#endif
#include "nvidia.h"
#endif
+#ifdef HAVE_LIBATIADL
+#include "amd.h"
+#endif
+
#ifdef HAVE_REMOTE_SUPPORT
#include "rsensor.h"
#endif
#ifdef HAVE_REMOTE_SUPPORT
#include "rsensor.h"
#endif
@@
-130,7
+131,6
@@
void update_psensor_measures(struct ui_psensor *ui)
struct config *cfg = ui->config;
while (1) {
struct config *cfg = ui->config;
while (1) {
- /*gdk_threads_enter();*/
g_mutex_lock(ui->sensors_mutex);
if (!sensors)
g_mutex_lock(ui->sensors_mutex);
if (!sensors)
@@
-145,8
+145,9
@@
void update_psensor_measures(struct ui_psensor *ui)
#ifdef HAVE_NVIDIA
nvidia_psensor_list_update(sensors);
#endif
#ifdef HAVE_NVIDIA
nvidia_psensor_list_update(sensors);
#endif
-
- /*gdk_threads_leave();*/
+#ifdef HAVE_LIBATIADL
+ amd_psensor_list_update(sensors);
+#endif
g_mutex_unlock(ui->sensors_mutex);
sleep(cfg->sensor_update_interval);
g_mutex_unlock(ui->sensors_mutex);
sleep(cfg->sensor_update_interval);
@@
-163,11
+164,10
@@
gboolean ui_refresh_thread(gpointer data)
cfg = ui->config;
g_mutex_lock(ui->sensors_mutex);
cfg = ui->config;
g_mutex_lock(ui->sensors_mutex);
- /*gdk_threads_enter();*/
graph_update(ui->sensors, ui->w_graph, ui->config);
graph_update(ui->sensors, ui->w_graph, ui->config);
- ui_sensorlist_update(ui
->ui_sensorlist
);
+ ui_sensorlist_update(ui);
#if defined(HAVE_APPINDICATOR) || defined(HAVE_APPINDICATOR_029)
ui_appindicator_update(ui);
#if defined(HAVE_APPINDICATOR) || defined(HAVE_APPINDICATOR_029)
ui_appindicator_update(ui);
@@
-184,7
+184,6
@@
gboolean ui_refresh_thread(gpointer data)
}
g_mutex_unlock(ui->sensors_mutex);
}
g_mutex_unlock(ui->sensors_mutex);
- /*gdk_threads_leave();*/
if (ret == FALSE)
g_timeout_add(1000 * ui->graph_update_interval,
if (ret == FALSE)
g_timeout_add(1000 * ui->graph_update_interval,
@@
-291,7
+290,7
@@
int main(int argc, char **argv)
struct ui_psensor ui;
GError *error;
GThread *thread;
struct ui_psensor ui;
GError *error;
GThread *thread;
- int
err,
optc;
+ int optc;
char *url = NULL;
int cmdok = 1;
char *url = NULL;
int cmdok = 1;
@@
-345,12
+344,7
@@
int main(int argc, char **argv)
ui.config = config_load();
ui.config = config_load();
- err = lmsensor_init();
- if (!err) {
- fprintf(stderr, _("ERROR: lmsensor init failure: %s\n"),
- sensors_strerror(err));
- exit(EXIT_FAILURE);
- }
+ psensor_init();
if (url) {
#ifdef HAVE_REMOTE_SUPPORT
if (url) {
#ifdef HAVE_REMOTE_SUPPORT
@@
-362,16
+356,12
@@
int main(int argc, char **argv)
exit(EXIT_FAILURE);
#endif
} else {
exit(EXIT_FAILURE);
#endif
} else {
-#ifdef HAVE_NVIDIA
- struct psensor **tmp;
-
- tmp = get_all_sensors(600);
- ui.sensors = nvidia_psensor_list_add(tmp, 600);
-
- if (tmp != ui.sensors)
- free(tmp);
-#else
ui.sensors = get_all_sensors(600);
ui.sensors = get_all_sensors(600);
+#ifdef HAVE_NVIDIA
+ ui.sensors = nvidia_psensor_list_add(ui.sensors, 600);
+#endif
+#ifdef HAVE_LIBATIADL
+ ui.sensors = amd_psensor_list_add(ui.sensors, 600);
#endif
}
#endif
}
@@
-387,7
+377,7
@@
int main(int argc, char **argv)
ui.w_graph = ui_graph_create(&ui);
/* sensor list */
ui.w_graph = ui_graph_create(&ui);
/* sensor list */
- ui
.ui_sensorlist = ui_sensorlist_create(ui.sensors
);
+ ui
_sensorlist_create(&ui
);
ui_window_update(&ui);
ui_window_update(&ui);
@@
-408,9
+398,15
@@
int main(int argc, char **argv)
/* main loop */
gtk_main();
/* main loop */
gtk_main();
-
sensors
_cleanup();
+
psensor
_cleanup();
psensor_list_free(ui.sensors);
psensor_list_free(ui.sensors);
+#ifdef HAVE_NVIDIA
+ nvidia_cleanup();
+#endif
+#ifdef HAVE_LIBATIADL
+ amd_cleanup();
+#endif
return 0;
}
return 0;
}