projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
exec: fix a race condition when setting environment variables
[collectd.git]
/
src
/
procevent.c
diff --git
a/src/procevent.c
b/src/procevent.c
index
3a5be7a
..
ab000db
100644
(file)
--- a/
src/procevent.c
+++ b/
src/procevent.c
@@
-336,8
+336,9
@@
static int gen_message_payload(int state, long pid, char *process,
goto err;
if (yajl_gen_string(
goto err;
if (yajl_gen_string(
- g, (u_char *)(state == 0 ? PROCEVENT_EVENT_SEVERITY_CRITICAL_VALUE
- : PROCEVENT_EVENT_SEVERITY_NORMAL_VALUE),
+ g,
+ (u_char *)(state == 0 ? PROCEVENT_EVENT_SEVERITY_CRITICAL_VALUE
+ : PROCEVENT_EVENT_SEVERITY_NORMAL_VALUE),
strlen((state == 0 ? PROCEVENT_EVENT_SEVERITY_CRITICAL_VALUE
: PROCEVENT_EVENT_SEVERITY_NORMAL_VALUE))) !=
yajl_gen_status_ok)
strlen((state == 0 ? PROCEVENT_EVENT_SEVERITY_CRITICAL_VALUE
: PROCEVENT_EVENT_SEVERITY_NORMAL_VALUE))) !=
yajl_gen_status_ok)
@@
-388,8
+389,9
@@
static int gen_message_payload(int state, long pid, char *process,
goto err;
if (yajl_gen_string(
goto err;
if (yajl_gen_string(
- g, (u_char *)(state == 0 ? PROCEVENT_VF_STATUS_CRITICAL_VALUE
- : PROCEVENT_VF_STATUS_NORMAL_VALUE),
+ g,
+ (u_char *)(state == 0 ? PROCEVENT_VF_STATUS_CRITICAL_VALUE
+ : PROCEVENT_VF_STATUS_NORMAL_VALUE),
strlen((state == 0 ? PROCEVENT_VF_STATUS_CRITICAL_VALUE
: PROCEVENT_VF_STATUS_NORMAL_VALUE))) !=
yajl_gen_status_ok)
strlen((state == 0 ? PROCEVENT_VF_STATUS_CRITICAL_VALUE
: PROCEVENT_VF_STATUS_NORMAL_VALUE))) !=
yajl_gen_status_ok)
@@
-662,7
+664,9
@@
static int process_map_refresh(void) {
static int nl_connect() {
struct sockaddr_nl sa_nl = {
static int nl_connect() {
struct sockaddr_nl sa_nl = {
- .nl_family = AF_NETLINK, .nl_groups = CN_IDX_PROC, .nl_pid = getpid(),
+ .nl_family = AF_NETLINK,
+ .nl_groups = CN_IDX_PROC,
+ .nl_pid = getpid(),
};
nl_sock = socket(PF_NETLINK, SOCK_DGRAM, NETLINK_CONNECTOR);
};
nl_sock = socket(PF_NETLINK, SOCK_DGRAM, NETLINK_CONNECTOR);
@@
-809,9
+813,9
@@
static int read_event() {
usleep(1000);
continue;
} else {
usleep(1000);
continue;
} else {
- DEBUG("procevent plugin: Process %d status is now %s at %lu", proc_id,
+ DEBUG("procevent plugin: Process %d status is now %s at %l
l
u", proc_id,
(proc_status == PROCEVENT_EXITED ? "EXITED" : "STARTED"),
(proc_status == PROCEVENT_EXITED ? "EXITED" : "STARTED"),
-
CDTIME_T_TO_US(cdtime()
));
+
(unsigned long long)cdtime(
));
ring.buffer[ring.head][RBUF_PROC_ID_INDEX] = proc_id;
ring.buffer[ring.head][RBUF_PROC_STATUS_INDEX] = proc_status;
ring.buffer[ring.head][RBUF_PROC_ID_INDEX] = proc_id;
ring.buffer[ring.head][RBUF_PROC_STATUS_INDEX] = proc_status;