projects
/
psensor-pkg-debian.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Upstream version 1.2.0
[psensor-pkg-debian.git]
/
src
/
lib
/
slog.c
diff --git
a/src/lib/slog.c
b/src/lib/slog.c
index
99eb536
..
d6c4bc2
100644
(file)
--- a/
src/lib/slog.c
+++ b/
src/lib/slog.c
@@
-34,6
+34,7
@@
#include "bool.h"
#include "config.h"
#include <plog.h>
#include "bool.h"
#include "config.h"
#include <plog.h>
+#include <pmutex.h>
#include "ptime.h"
#include "slog.h"
#include "ptime.h"
#include "slog.h"
@@
-57,15
+58,14
@@
static char *time_to_str(time_t *t)
str = malloc(64);
str = malloc(64);
- if (strftime(str, 64, "%s", <))
{
+ if (strftime(str, 64, "%s", <))
return str;
return str;
- } else {
- free(str);
- return NULL;
- }
+
+ free(str);
+ return NULL;
}
}
-static char *get_default_path()
+static char *get_default_path(
void
)
{
char *home, *path, *dir;
{
char *home, *path, *dir;
@@
-82,10
+82,10
@@
static char *get_default_path()
free(dir);
return path;
free(dir);
return path;
- } else {
- log_warn(_("HOME variable not set."));
- return strdup(DEFAULT_FILENAME);
}
}
+
+ log_warn(_("HOME variable not set."));
+ return strdup(DEFAULT_FILENAME);
}
static bool slog_open(const char *path, struct psensor **sensors)
}
static bool slog_open(const char *path, struct psensor **sensors)
@@
-133,8
+133,8
@@
static void slog_write_sensors(struct psensor **sensors)
bool first_call;
if (!file) {
bool first_call;
if (!file) {
- log_
err
(_("Sensor log file not open."));
- return
;
+ log_
debug
(_("Sensor log file not open."));
+ return;
}
gettimeofday(&tv, NULL);
}
gettimeofday(&tv, NULL);
@@
-169,17
+169,17
@@
static void *slog_routine(void *data)
{
while (1) {
pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL);
{
while (1) {
pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL);
- p
thread_
mutex_lock(sensors_mutex);
+ pmutex_lock(sensors_mutex);
slog_write_sensors(sensors);
slog_write_sensors(sensors);
- p
thread_
mutex_unlock(sensors_mutex);
+ pmutex_unlock(sensors_mutex);
pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
sleep(period);
}
pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
sleep(period);
}
- pthread_exit(
0
);
+ pthread_exit(
NULL
);
}
}
-void slog_close()
+void slog_close(
void
)
{
if (file) {
pthread_cancel(thread);
{
if (file) {
pthread_cancel(thread);