projects
/
psensor-pkg-ubuntu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Upstream version 1.1.1
[psensor-pkg-ubuntu.git]
/
src
/
server
/
server.c
diff --git
a/src/server/server.c
b/src/server/server.c
index
55649b8
..
297d083
100644
(file)
--- a/
src/server/server.c
+++ b/
src/server/server.c
@@
-44,6
+44,7
@@
#include <plog.h>
#include "psensor_json.h"
#include <plog.h>
#include "psensor_json.h"
+#include <pmutex.h>
#include "url.h"
#include "server.h"
#include "slog.h"
#include "url.h"
#include "server.h"
#include "slog.h"
@@
-74,7
+75,7
@@
static struct option long_options[] = {
static struct server_data server_data;
static struct server_data server_data;
-static pthread_mutex_t mutex
= PTHREAD_MUTEX_INITIALIZER
;
+static pthread_mutex_t mutex;
static int server_stop_requested;
static int server_stop_requested;
@@
-298,9
+299,9
@@
static int cbk_http_request(void *cls,
nurl = url_normalize(url);
nurl = url_normalize(url);
- p
thread_
mutex_lock(&mutex);
+ pmutex_lock(&mutex);
response = create_response(nurl, method, &resp_code);
response = create_response(nurl, method, &resp_code);
- p
thread_
mutex_unlock(&mutex);
+ pmutex_unlock(&mutex);
ret = MHD_queue_response(connection, resp_code, response);
MHD_destroy_response(response);
ret = MHD_queue_response(connection, resp_code, response);
MHD_destroy_response(response);
@@
-388,6
+389,8
@@
int main(int argc, char *argv[])
if (!log_file)
log_file = strdup(DEFAULT_LOG_FILE);
if (!log_file)
log_file = strdup(DEFAULT_LOG_FILE);
+ pmutex_init(&mutex);
+
log_open(log_file);
psensor_init();
log_open(log_file);
psensor_init();
@@
-426,7
+429,7
@@
int main(int argc, char *argv[])
}
while (!server_stop_requested) {
}
while (!server_stop_requested) {
- p
thread_
mutex_lock(&mutex);
+ pmutex_lock(&mutex);
#ifdef HAVE_GTOP
sysinfo_update(&server_data.psysinfo);
#ifdef HAVE_GTOP
sysinfo_update(&server_data.psysinfo);
@@
-436,7
+439,7
@@
int main(int argc, char *argv[])
psensor_log_measures(server_data.sensors);
psensor_log_measures(server_data.sensors);
- p
thread_
mutex_unlock(&mutex);
+ pmutex_unlock(&mutex);
sleep(5);
}
sleep(5);
}