projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Clean-up: sessiond kernel: fix include style
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
kernel.c
diff --git
a/src/bin/lttng-sessiond/kernel.c
b/src/bin/lttng-sessiond/kernel.c
index 547d2ec6cafa7567a6a9238f138eb5c15f4012cd..0ba10f912d85f456a4966e3ad523e0782d218dd6 100644
(file)
--- a/
src/bin/lttng-sessiond/kernel.c
+++ b/
src/bin/lttng-sessiond/kernel.c
@@
-5,11
+5,6
@@
*
*/
*
*/
-#include "bin/lttng-sessiond/tracker.h"
-#include "common/tracker.h"
-#include "common/utils.h"
-#include "lttng/lttng-error.h"
-#include "lttng/tracker.h"
#define _LGPL_SOURCE
#include <fcntl.h>
#include <stdlib.h>
#define _LGPL_SOURCE
#include <fcntl.h>
#include <stdlib.h>
@@
-24,6
+19,11
@@
#include <common/kernel-ctl/kernel-ctl.h>
#include <common/kernel-ctl/kernel-ioctl.h>
#include <common/sessiond-comm/sessiond-comm.h>
#include <common/kernel-ctl/kernel-ctl.h>
#include <common/kernel-ctl/kernel-ioctl.h>
#include <common/sessiond-comm/sessiond-comm.h>
+#include <common/tracker.h>
+#include <common/utils.h>
+#include <lttng/event.h>
+#include <lttng/lttng-error.h>
+#include <lttng/tracker.h>
#include "lttng-sessiond.h"
#include "lttng-syscall.h"
#include "lttng-sessiond.h"
#include "lttng-syscall.h"
@@
-34,6
+34,7
@@
#include "utils.h"
#include "rotate.h"
#include "modprobe.h"
#include "utils.h"
#include "rotate.h"
#include "modprobe.h"
+#include "tracker.h"
/*
* Key used to reference a channel between the sessiond and the consumer. This
/*
* Key used to reference a channel between the sessiond and the consumer. This
@@
-1741,7
+1742,7
@@
enum lttng_error_code kernel_rotate_session(struct ltt_session *session)
ksess->uid, ksess->gid, ksess->consumer,
/* is_metadata_channel */ false);
if (ret < 0) {
ksess->uid, ksess->gid, ksess->consumer,
/* is_metadata_channel */ false);
if (ret < 0) {
- status = LTTNG_ERR_
KERN_CONSUMER_FAIL
;
+ status = LTTNG_ERR_
ROTATION_FAIL_CONSUMER
;
goto error;
}
}
goto error;
}
}
@@
-1753,7
+1754,7
@@
enum lttng_error_code kernel_rotate_session(struct ltt_session *session)
ksess->uid, ksess->gid, ksess->consumer,
/* is_metadata_channel */ true);
if (ret < 0) {
ksess->uid, ksess->gid, ksess->consumer,
/* is_metadata_channel */ true);
if (ret < 0) {
- status = LTTNG_ERR_
KERN_CONSUMER_FAIL
;
+ status = LTTNG_ERR_
ROTATION_FAIL_CONSUMER
;
goto error;
}
}
goto error;
}
}
This page took
0.024006 seconds
and
4
git commands to generate.