projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: typo in --sig-parent help
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
kernel-consumer.c
diff --git
a/src/bin/lttng-sessiond/kernel-consumer.c
b/src/bin/lttng-sessiond/kernel-consumer.c
index bf3559a21fa021a55e5cebeb7a582b72e80b87de..70759fb36d90149d8964967d3b20608c60bcc9ff 100644
(file)
--- a/
src/bin/lttng-sessiond/kernel-consumer.c
+++ b/
src/bin/lttng-sessiond/kernel-consumer.c
@@
-26,7
+26,7
@@
#include <common/defaults.h>
#include "consumer.h"
#include <common/defaults.h>
#include "consumer.h"
-#include "health.h"
+#include "health
-sessiond
.h"
#include "kernel-consumer.h"
static char *create_channel_path(struct consumer_output *consumer,
#include "kernel-consumer.h"
static char *create_channel_path(struct consumer_output *consumer,
@@
-123,7
+123,8
@@
int kernel_consumer_add_channel(struct consumer_socket *sock,
CONSUMER_CHANNEL_TYPE_DATA,
channel->channel->attr.tracefile_size,
channel->channel->attr.tracefile_count,
CONSUMER_CHANNEL_TYPE_DATA,
channel->channel->attr.tracefile_size,
channel->channel->attr.tracefile_count,
- monitor);
+ monitor,
+ channel->channel->attr.live_timer_interval);
health_code_update();
health_code_update();
@@
-184,7
+185,7
@@
int kernel_consumer_add_metadata(struct consumer_socket *sock,
DEFAULT_KERNEL_CHANNEL_OUTPUT,
CONSUMER_CHANNEL_TYPE_METADATA,
0, 0,
DEFAULT_KERNEL_CHANNEL_OUTPUT,
CONSUMER_CHANNEL_TYPE_METADATA,
0, 0,
- monitor);
+ monitor
, 0
);
health_code_update();
health_code_update();
@@
-371,7
+372,6
@@
int kernel_consumer_destroy_channel(struct consumer_socket *socket,
assert(channel);
assert(socket);
assert(channel);
assert(socket);
- assert(socket->fd >= 0);
DBG("Sending kernel consumer destroy channel key %d", channel->fd);
DBG("Sending kernel consumer destroy channel key %d", channel->fd);
@@
-400,7
+400,6
@@
int kernel_consumer_destroy_metadata(struct consumer_socket *socket,
assert(metadata);
assert(socket);
assert(metadata);
assert(socket);
- assert(socket->fd >= 0);
DBG("Sending kernel consumer destroy channel key %d", metadata->fd);
DBG("Sending kernel consumer destroy channel key %d", metadata->fd);
This page took
0.024861 seconds
and
4
git commands to generate.