projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add support for --syscalls
[lttng-tools.git]
/
ltt-sessiond
/
kernel-ctl.c
diff --git
a/ltt-sessiond/kernel-ctl.c
b/ltt-sessiond/kernel-ctl.c
index 3879c2bbb3bc9c9bda33d47564ee5a9c0ccc0471..b66f08cb3fd354d00f15a3abd85d8dfa21462371 100644
(file)
--- a/
ltt-sessiond/kernel-ctl.c
+++ b/
ltt-sessiond/kernel-ctl.c
@@
-24,14
+24,13
@@
#include <string.h>
#include <unistd.h>
#include <string.h>
#include <unistd.h>
-#include "lttngerr.h"
-#include "kernelctl.h"
+#include <lttng-kernel-ctl.h>
+#include <lttngerr.h>
+
#include "kernel-ctl.h"
/*
#include "kernel-ctl.h"
/*
- * kernel_add_channel_context
- *
- * Add context on a kernel channel.
+ * Add context on a kernel channel.
*/
int kernel_add_channel_context(struct ltt_kernel_channel *chan,
struct lttng_kernel_context *ctx)
*/
int kernel_add_channel_context(struct ltt_kernel_channel *chan,
struct lttng_kernel_context *ctx)
@@
-65,9
+64,7
@@
error:
}
/*
}
/*
- * kernel_add_event_context
- *
- * Add context on a kernel event.
+ * Add context on a kernel event.
*/
int kernel_add_event_context(struct ltt_kernel_event *event,
struct lttng_kernel_context *ctx)
*/
int kernel_add_event_context(struct ltt_kernel_event *event,
struct lttng_kernel_context *ctx)
@@
-96,10
+93,8
@@
error:
}
/*
}
/*
- * kernel_create_session
- *
- * Create a new kernel session, register it to the kernel tracer and add it to
- * the session daemon session.
+ * Create a new kernel session, register it to the kernel tracer and add it to
+ * the session daemon session.
*/
int kernel_create_session(struct ltt_session *session, int tracer_fd)
{
*/
int kernel_create_session(struct ltt_session *session, int tracer_fd)
{
@@
-107,7
+102,7
@@
int kernel_create_session(struct ltt_session *session, int tracer_fd)
struct ltt_kernel_session *lks;
/* Allocate data structure */
struct ltt_kernel_session *lks;
/* Allocate data structure */
- lks = trace_
create_kernel_session(
);
+ lks = trace_
kernel_create_session(session->path
);
if (lks == NULL) {
ret = -1;
goto error;
if (lks == NULL) {
ret = -1;
goto error;
@@
-139,18
+134,17
@@
error:
}
/*
}
/*
- * kernel_create_channel
- *
- * Create a kernel channel, register it to the kernel tracer and add it to the
- * kernel session.
+ * Create a kernel channel, register it to the kernel tracer and add it to the
+ * kernel session.
*/
*/
-int kernel_create_channel(struct ltt_kernel_session *session, struct lttng_channel *chan, char *path)
+int kernel_create_channel(struct ltt_kernel_session *session,
+ struct lttng_channel *chan, char *path)
{
int ret;
struct ltt_kernel_channel *lkc;
/* Allocate kernel channel */
{
int ret;
struct ltt_kernel_channel *lkc;
/* Allocate kernel channel */
- lkc = trace_
create_kernel
_channel(chan, path);
+ lkc = trace_
kernel_create
_channel(chan, path);
if (lkc == NULL) {
goto error;
}
if (lkc == NULL) {
goto error;
}
@@
-184,17
+178,16
@@
error:
}
/*
}
/*
- * kernel_create_event
- *
- * Create a kernel event, enable it to the kernel tracer and add it to the
- * channel event list of the kernel session.
+ * Create a kernel event, enable it to the kernel tracer and add it to the
+ * channel event list of the kernel session.
*/
*/
-int kernel_create_event(struct lttng_event *ev, struct ltt_kernel_channel *channel)
+int kernel_create_event(struct lttng_event *ev,
+ struct ltt_kernel_channel *channel)
{
int ret;
struct ltt_kernel_event *event;
{
int ret;
struct ltt_kernel_event *event;
- event = trace_
create_kernel
_event(ev);
+ event = trace_
kernel_create
_event(ev);
if (event == NULL) {
goto error;
}
if (event == NULL) {
goto error;
}
@@
-227,9
+220,7
@@
error:
}
/*
}
/*
- * kernel_disable_channel
- *
- * Disable a kernel channel.
+ * Disable a kernel channel.
*/
int kernel_disable_channel(struct ltt_kernel_channel *chan)
{
*/
int kernel_disable_channel(struct ltt_kernel_channel *chan)
{
@@
-252,18
+243,15
@@
error:
}
/*
}
/*
- * kernel_enable_channel
- *
- * Enable a kernel channel.
+ * Enable a kernel channel.
*/
int kernel_enable_channel(struct ltt_kernel_channel *chan)
{
int ret;
ret = kernctl_enable(chan->fd);
*/
int kernel_enable_channel(struct ltt_kernel_channel *chan)
{
int ret;
ret = kernctl_enable(chan->fd);
- if (ret < 0) {
- perror("enable chan ioctl");
- ret = errno;
+ if (ret < 0 && errno != EEXIST) {
+ perror("Enable kernel chan");
goto error;
}
goto error;
}
@@
-277,20
+265,15
@@
error:
}
/*
}
/*
- * kernel_enable_event
- *
- * Enable a kernel event.
+ * Enable a kernel event.
*/
int kernel_enable_event(struct ltt_kernel_event *event)
{
int ret;
ret = kernctl_enable(event->fd);
*/
int kernel_enable_event(struct ltt_kernel_event *event)
{
int ret;
ret = kernctl_enable(event->fd);
- if (ret < 0) {
- perror("enable event ioctl");
- if (errno == EEXIST) {
- ret = -EEXIST;
- }
+ if (ret < 0 && errno != EEXIST) {
+ perror("enable kernel event");
goto error;
}
goto error;
}
@@
-304,17
+287,15
@@
error:
}
/*
}
/*
- * kernel_disable_event
- *
- * Disable a kernel event.
+ * Disable a kernel event.
*/
int kernel_disable_event(struct ltt_kernel_event *event)
{
int ret;
ret = kernctl_disable(event->fd);
*/
int kernel_disable_event(struct ltt_kernel_event *event)
{
int ret;
ret = kernctl_disable(event->fd);
- if (ret < 0) {
- perror("disable
event ioctl
");
+ if (ret < 0
&& errno != EEXIST
) {
+ perror("disable
kernel event
");
goto error;
}
goto error;
}
@@
-328,10
+309,8
@@
error:
}
/*
}
/*
- * kernel_open_metadata
- *
- * Create kernel metadata, open from the kernel tracer and add it to the
- * kernel session.
+ * Create kernel metadata, open from the kernel tracer and add it to the
+ * kernel session.
*/
int kernel_open_metadata(struct ltt_kernel_session *session, char *path)
{
*/
int kernel_open_metadata(struct ltt_kernel_session *session, char *path)
{
@@
-339,7
+318,7
@@
int kernel_open_metadata(struct ltt_kernel_session *session, char *path)
struct ltt_kernel_metadata *lkm;
/* Allocate kernel metadata */
struct ltt_kernel_metadata *lkm;
/* Allocate kernel metadata */
- lkm = trace_
create_kernel
_metadata(path);
+ lkm = trace_
kernel_create
_metadata(path);
if (lkm == NULL) {
goto error;
}
if (lkm == NULL) {
goto error;
}
@@
-368,9
+347,7
@@
error:
}
/*
}
/*
- * kernel_start_session
- *
- * Start tracing session.
+ * Start tracing session.
*/
int kernel_start_session(struct ltt_kernel_session *session)
{
*/
int kernel_start_session(struct ltt_kernel_session *session)
{
@@
-391,9
+368,7
@@
error:
}
/*
}
/*
- * kernel_wait_quiescent
- *
- * Make a kernel wait to make sure in-flight probe have completed.
+ * Make a kernel wait to make sure in-flight probe have completed.
*/
void kernel_wait_quiescent(int fd)
{
*/
void kernel_wait_quiescent(int fd)
{
@@
-409,7
+384,7
@@
void kernel_wait_quiescent(int fd)
}
/*
}
/*
- *
kernel_
calibrate
+ *
Kernel
calibrate
*/
int kernel_calibrate(int fd, struct lttng_kernel_calibrate *calibrate)
{
*/
int kernel_calibrate(int fd, struct lttng_kernel_calibrate *calibrate)
{
@@
-426,8
+401,6
@@
int kernel_calibrate(int fd, struct lttng_kernel_calibrate *calibrate)
/*
/*
- * kernel_metadata_flush_buffer
- *
* Force flush buffer of metadata.
*/
int kernel_metadata_flush_buffer(int fd)
* Force flush buffer of metadata.
*/
int kernel_metadata_flush_buffer(int fd)
@@
-443,9
+416,7
@@
int kernel_metadata_flush_buffer(int fd)
}
/*
}
/*
- * kernel_flush_buffer
- *
- * Force flush buffer for channel.
+ * Force flush buffer for channel.
*/
int kernel_flush_buffer(struct ltt_kernel_channel *channel)
{
*/
int kernel_flush_buffer(struct ltt_kernel_channel *channel)
{
@@
-468,9
+439,7
@@
int kernel_flush_buffer(struct ltt_kernel_channel *channel)
}
/*
}
/*
- * kernel_stop_session
- *
- * Stop tracing session.
+ * Stop tracing session.
*/
int kernel_stop_session(struct ltt_kernel_session *session)
{
*/
int kernel_stop_session(struct ltt_kernel_session *session)
{
@@
-490,12
+459,10
@@
error:
}
/*
}
/*
- * kernel_open_channel_stream
+ * Open stream of channel, register it to the kernel tracer and add it
+ * to the stream list of the channel.
*
*
- * Open stream of channel, register it to the kernel tracer and add it
- * to the stream list of the channel.
- *
- * Return the number of created stream. Else, a negative value.
+ * Return the number of created stream. Else, a negative value.
*/
int kernel_open_channel_stream(struct ltt_kernel_channel *channel)
{
*/
int kernel_open_channel_stream(struct ltt_kernel_channel *channel)
{
@@
-503,7
+470,7
@@
int kernel_open_channel_stream(struct ltt_kernel_channel *channel)
struct ltt_kernel_stream *lks;
while ((ret = kernctl_create_stream(channel->fd)) > 0) {
struct ltt_kernel_stream *lks;
while ((ret = kernctl_create_stream(channel->fd)) > 0) {
- lks = trace_
create_kernel
_stream();
+ lks = trace_
kernel_create
_stream();
if (lks == NULL) {
close(ret);
goto error;
if (lks == NULL) {
close(ret);
goto error;
@@
-538,9
+505,7
@@
error:
}
/*
}
/*
- * kernel_open_metadata_stream
- *
- * Open the metadata stream and set it to the kernel session.
+ * Open the metadata stream and set it to the kernel session.
*/
int kernel_open_metadata_stream(struct ltt_kernel_session *session)
{
*/
int kernel_open_metadata_stream(struct ltt_kernel_session *session)
{
This page took
0.027179 seconds
and
4
git commands to generate.