projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add the sessiond notification-handling subsystem
[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 83771f2d75c8896d142a705066410c50023acaf4..2241acbcaa8ccdf2e6ad250a41ac2fc641ce964c 100644
(file)
--- a/
src/bin/lttng-sessiond/kernel-consumer.c
+++ b/
src/bin/lttng-sessiond/kernel-consumer.c
@@
-15,16
+15,15
@@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
* Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#define _GNU_SOURCE
#define _LGPL_SOURCE
#include <stdio.h>
#include <stdlib.h>
#define _LGPL_SOURCE
#include <stdio.h>
#include <stdlib.h>
-#include <string.h>
#include <sys/stat.h>
#include <unistd.h>
#include <common/common.h>
#include <common/defaults.h>
#include <sys/stat.h>
#include <unistd.h>
#include <common/common.h>
#include <common/defaults.h>
+#include <common/compat/string.h>
#include "consumer.h"
#include "health-sessiond.h"
#include "consumer.h"
#include "health-sessiond.h"
@@
-48,9
+47,9
@@
static char *create_channel_path(struct consumer_output *consumer,
PERROR("snprintf kernel channel path");
goto error;
}
PERROR("snprintf kernel channel path");
goto error;
}
- pathname = strndup(tmp_path, sizeof(tmp_path));
+ pathname =
lttng_
strndup(tmp_path, sizeof(tmp_path));
if (!pathname) {
if (!pathname) {
- PERROR("strndup");
+ PERROR("
lttng_
strndup");
goto error;
}
goto error;
}
@@
-69,9
+68,9
@@
static char *create_channel_path(struct consumer_output *consumer,
PERROR("snprintf kernel metadata path");
goto error;
}
PERROR("snprintf kernel metadata path");
goto error;
}
- pathname = strndup(tmp_path, sizeof(tmp_path));
+ pathname =
lttng_
strndup(tmp_path, sizeof(tmp_path));
if (!pathname) {
if (!pathname) {
- PERROR("strndup");
+ PERROR("
lttng_
strndup");
goto error;
}
DBG3("Kernel network consumer subdir path: %s", pathname);
goto error;
}
DBG3("Kernel network consumer subdir path: %s", pathname);
@@
-339,7
+338,7
@@
int kernel_consumer_send_channel_stream(struct consumer_socket *sock,
/* Send streams */
cds_list_for_each_entry(stream, &channel->stream_list.head, list) {
/* Send streams */
cds_list_for_each_entry(stream, &channel->stream_list.head, list) {
- if (!stream->fd) {
+ if (!stream->fd
|| stream->sent_to_consumer
) {
continue;
}
continue;
}
@@
-349,6
+348,7
@@
int kernel_consumer_send_channel_stream(struct consumer_socket *sock,
if (ret < 0) {
goto error;
}
if (ret < 0) {
goto error;
}
+ stream->sent_to_consumer = true;
}
error:
}
error:
This page took
0.025955 seconds
and
5
git commands to generate.