/*
- * Copyright (C) 2010-2013 jeanfi@gmail.com
+ * Copyright (C) 2010-2014 jeanfi@gmail.com
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301 USA
*/
+#define _LARGEFILE_SOURCE 1
+#include "config.h"
+
#include <locale.h>
#include <libintl.h>
#define _(str) gettext(str)
-#include "config.h"
-
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#ifdef HAVE_GTOP
#include "sysinfo.h"
-#include "cpu.h"
+#include <pgtop2.h>
#endif
-#include "log.h"
+#include <plog.h>
#include "psensor_json.h"
+#include <pmutex.h>
#include "url.h"
#include "server.h"
#include "slog.h"
static struct server_data server_data;
-static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
+static pthread_mutex_t mutex;
static int server_stop_requested;
{
FILE *file = cls;
- fseek(file, pos, SEEK_SET);
+ fseeko(file, pos, SEEK_SET);
return fread(buf, 1, max, file);
}
struct psensor *s;
char *page = NULL;
- if (!strcmp(nurl, URL_BASE_API_1_0_SENSORS)) {
+ if (!strcmp(nurl, URL_BASE_API_1_1_SENSORS)) {
page = sensors_to_json_string(server_data.sensors);
#ifdef HAVE_GTOP
- } else if (!strcmp(nurl, URL_API_1_0_SYSINFO)) {
+ } else if (!strcmp(nurl, URL_API_1_1_SYSINFO)) {
page = sysinfo_to_json_string(&server_data.psysinfo);
- } else if (!strcmp(nurl, URL_API_1_0_CPU_USAGE)) {
+ } else if (!strcmp(nurl, URL_API_1_1_CPU_USAGE)) {
page = sensor_to_json_string(server_data.cpu_usage);
#endif
- } else if (!strncmp(nurl, URL_BASE_API_1_0_SENSORS,
- strlen(URL_BASE_API_1_0_SENSORS))
- && nurl[strlen(URL_BASE_API_1_0_SENSORS)] == '/') {
+ } else if (!strncmp(nurl, URL_BASE_API_1_1_SENSORS,
+ strlen(URL_BASE_API_1_1_SENSORS))
+ && nurl[strlen(URL_BASE_API_1_1_SENSORS)] == '/') {
- const char *sid = nurl + strlen(URL_BASE_API_1_0_SENSORS) + 1;
+ const char *sid = nurl + strlen(URL_BASE_API_1_1_SENSORS) + 1;
s = psensor_list_get_by_id(server_data.sensors, sid);
if (s)
page = sensor_to_json_string(s);
- } else if (!strcmp(nurl, URL_API_1_0_SERVER_STOP)) {
+ } else if (!strcmp(nurl, URL_API_1_1_SERVER_STOP)) {
server_stop_requested = 1;
page = strdup(HTML_STOP_REQUESTED);
{
struct MHD_Response *resp = NULL;
- if (!strncmp(nurl, URL_BASE_API_1_0, strlen(URL_BASE_API_1_0))) {
+ if (!strncmp(nurl, URL_BASE_API_1_1, strlen(URL_BASE_API_1_1))) {
resp = create_response_api(nurl, method, rp_code);
} else {
char *fpath = get_path(nurl, server_data.www_dir);
free(fpath);
}
- if (resp) {
+ if (resp)
return resp;
- } else {
- char *page = strdup(PAGE_NOT_FOUND);
- *rp_code = MHD_HTTP_NOT_FOUND;
- return MHD_create_response_from_data
- (strlen(page), page, MHD_YES, MHD_NO);
- }
+ char *page = strdup(PAGE_NOT_FOUND);
+ *rp_code = MHD_HTTP_NOT_FOUND;
+
+ return MHD_create_response_from_data(strlen(page),
+ page,
+ MHD_YES,
+ MHD_NO);
}
static int cbk_http_request(void *cls,
nurl = url_normalize(url);
- pthread_mutex_lock(&mutex);
+ pmutex_lock(&mutex);
response = create_response(nurl, method, &resp_code);
- pthread_mutex_unlock(&mutex);
+ pmutex_unlock(&mutex);
ret = MHD_queue_response(connection, resp_code, response);
MHD_destroy_response(response);
#endif
server_data.www_dir = NULL;
+#ifdef HAVE_GTOP
server_data.psysinfo.interfaces = NULL;
+#endif
log_file = NULL;
slog_file = NULL;
slog_interval = 300;
if (!log_file)
log_file = strdup(DEFAULT_LOG_FILE);
+ pmutex_init(&mutex);
+
log_open(log_file);
psensor_init();
}
while (!server_stop_requested) {
- pthread_mutex_lock(&mutex);
+ pmutex_lock(&mutex);
#ifdef HAVE_GTOP
sysinfo_update(&server_data.psysinfo);
psensor_log_measures(server_data.sensors);
- pthread_mutex_unlock(&mutex);
+ pmutex_unlock(&mutex);
sleep(5);
}
#ifdef HAVE_GTOP
sysinfo_cleanup();
- cpu_cleanup();
#endif
if (log_file != DEFAULT_LOG_FILE)