projects
/
psensor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use glibtop instead of sysconf
[psensor.git]
/
src
/
server
/
server.c
diff --git
a/src/server/server.c
b/src/server/server.c
index
fbafba5
..
ccb4d67
100644
(file)
--- a/
src/server/server.c
+++ b/
src/server/server.c
@@
-151,15
+151,10
@@
create_response_api(const char *nurl,
char *page = NULL;
if (!strcmp(nurl, URL_BASE_API_1_0_SENSORS)) {
char *page = NULL;
if (!strcmp(nurl, URL_BASE_API_1_0_SENSORS)) {
-
page = sensors_to_json_string(server_data.sensors);
page = sensors_to_json_string(server_data.sensors);
-
#ifdef HAVE_GTOP
#ifdef HAVE_GTOP
-#ifdef HAVE_SYSINFO_FCT
} else if (!strcmp(nurl, URL_API_1_0_SYSINFO)) {
} else if (!strcmp(nurl, URL_API_1_0_SYSINFO)) {
-
page = sysinfo_to_json_string(&server_data.psysinfo);
page = sysinfo_to_json_string(&server_data.psysinfo);
-#endif
} else if (!strcmp(nurl, URL_API_1_0_CPU_USAGE)) {
page = sensor_to_json_string(server_data.cpu_usage);
#endif
} else if (!strcmp(nurl, URL_API_1_0_CPU_USAGE)) {
page = sensor_to_json_string(server_data.cpu_usage);
#endif
@@
-387,9
+382,7
@@
int main(int argc, char *argv[])
pthread_mutex_lock(&mutex);
#ifdef HAVE_GTOP
pthread_mutex_lock(&mutex);
#ifdef HAVE_GTOP
-#ifdef HAVE_SYSINFO_FCT
sysinfo_update(&server_data.psysinfo);
sysinfo_update(&server_data.psysinfo);
-#endif
cpu_usage_sensor_update(server_data.cpu_usage);
#endif
psensor_list_update_measures(server_data.sensors);
cpu_usage_sensor_update(server_data.cpu_usage);
#endif
psensor_list_update_measures(server_data.sensors);
@@
-409,9
+402,7
@@
int main(int argc, char *argv[])
sensors_cleanup();
#ifdef HAVE_GTOP
sensors_cleanup();
#ifdef HAVE_GTOP
-#ifdef HAVE_SYSINFO_FCT
sysinfo_cleanup();
sysinfo_cleanup();
-#endif
cpu_cleanup();
#endif
cpu_cleanup();
#endif