projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: possible infinite loop in disable ust event
[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 837afdc8333faf71de79dfe56bbff31ae44a236a..f30c11ccc2fa2be882e77218220b5da7b746ed10 100644
(file)
--- a/
src/bin/lttng-sessiond/kernel-consumer.c
+++ b/
src/bin/lttng-sessiond/kernel-consumer.c
@@
-26,6
+26,7
@@
#include <common/defaults.h>
#include "consumer.h"
#include <common/defaults.h>
#include "consumer.h"
+#include "health.h"
#include "kernel-consumer.h"
/*
#include "kernel-consumer.h"
/*
@@
-53,7
+54,7
@@
int kernel_consumer_add_channel(struct consumer_socket *sock,
/* Get the right path name destination */
if (consumer->type == CONSUMER_DST_LOCAL) {
/* Set application path to the destination path */
/* Get the right path name destination */
if (consumer->type == CONSUMER_DST_LOCAL) {
/* Set application path to the destination path */
- ret = snprintf(tmp_path, sizeof(tmp_path), "%s
/
%s",
+ ret = snprintf(tmp_path, sizeof(tmp_path), "%s%s",
consumer->dst.trace_path, consumer->subdir);
if (ret < 0) {
PERROR("snprintf metadata path");
consumer->dst.trace_path, consumer->subdir);
if (ret < 0) {
PERROR("snprintf metadata path");
@@
-93,7
+94,9
@@
int kernel_consumer_add_channel(struct consumer_socket *sock,
channel->channel->name,
channel->stream_count,
channel->channel->attr.output,
channel->channel->name,
channel->stream_count,
channel->channel->attr.output,
- CONSUMER_CHANNEL_TYPE_DATA);
+ CONSUMER_CHANNEL_TYPE_DATA,
+ channel->channel->attr.tracefile_size,
+ channel->channel->attr.tracefile_count);
health_code_update();
health_code_update();
@@
-133,7
+136,7
@@
int kernel_consumer_add_metadata(struct consumer_socket *sock,
/* Get the right path name destination */
if (consumer->type == CONSUMER_DST_LOCAL) {
/* Set application path to the destination path */
/* Get the right path name destination */
if (consumer->type == CONSUMER_DST_LOCAL) {
/* Set application path to the destination path */
- ret = snprintf(tmp_path, sizeof(tmp_path), "%s
/
%s",
+ ret = snprintf(tmp_path, sizeof(tmp_path), "%s%s",
consumer->dst.trace_path, consumer->subdir);
if (ret < 0) {
PERROR("snprintf metadata path");
consumer->dst.trace_path, consumer->subdir);
if (ret < 0) {
PERROR("snprintf metadata path");
@@
-173,7
+176,8
@@
int kernel_consumer_add_metadata(struct consumer_socket *sock,
DEFAULT_METADATA_NAME,
1,
DEFAULT_KERNEL_CHANNEL_OUTPUT,
DEFAULT_METADATA_NAME,
1,
DEFAULT_KERNEL_CHANNEL_OUTPUT,
- CONSUMER_CHANNEL_TYPE_METADATA);
+ CONSUMER_CHANNEL_TYPE_METADATA,
+ 0, 0);
health_code_update();
health_code_update();
@@
-189,7
+193,7
@@
int kernel_consumer_add_metadata(struct consumer_socket *sock,
LTTNG_CONSUMER_ADD_STREAM,
session->metadata->fd,
session->metadata_stream_fd,
LTTNG_CONSUMER_ADD_STREAM,
session->metadata->fd,
session->metadata_stream_fd,
- 0);
/* CPU: 0 for metadata. */
+ 0); /* CPU: 0 for metadata. */
health_code_update();
health_code_update();
This page took
0.024685 seconds
and
4
git commands to generate.