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: comment fix in agent_thread_manage_registration
[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 4153612746f90c84780b208b94ce2ce731126217..2241acbcaa8ccdf2e6ad250a41ac2fc641ce964c 100644
(file)
--- a/
src/bin/lttng-sessiond/kernel-consumer.c
+++ b/
src/bin/lttng-sessiond/kernel-consumer.c
@@
-15,15
+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>
#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"
@@
-47,12
+47,16
@@
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) {
+ PERROR("lttng_strndup");
+ goto error;
+ }
/* Create directory */
ret = run_as_mkdir_recursive(pathname, S_IRWXU | S_IRWXG, uid, gid);
if (ret < 0) {
/* Create directory */
ret = run_as_mkdir_recursive(pathname, S_IRWXU | S_IRWXG, uid, gid);
if (ret < 0) {
- if (
ret != -
EEXIST) {
+ if (
errno !=
EEXIST) {
ERR("Trace directory creation error");
goto error;
}
ERR("Trace directory creation error");
goto error;
}
@@
-64,7
+68,11
@@
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) {
+ PERROR("lttng_strndup");
+ goto error;
+ }
DBG3("Kernel network consumer subdir path: %s", pathname);
}
DBG3("Kernel network consumer subdir path: %s", pathname);
}
@@
-99,13
+107,13
@@
int kernel_consumer_add_channel(struct consumer_socket *sock,
if (monitor) {
pathname = create_channel_path(consumer, session->uid, session->gid);
if (monitor) {
pathname = create_channel_path(consumer, session->uid, session->gid);
- if (!pathname) {
- ret = -1;
- goto error;
- }
} else {
/* Empty path. */
} else {
/* Empty path. */
- pathname = "";
+ pathname = strdup("");
+ }
+ if (!pathname) {
+ ret = -1;
+ goto error;
}
/* Prep channel message structure */
}
/* Prep channel message structure */
@@
-136,6
+144,7
@@
int kernel_consumer_add_channel(struct consumer_socket *sock,
health_code_update();
error:
health_code_update();
error:
+ free(pathname);
return ret;
}
return ret;
}
@@
-162,13
+171,13
@@
int kernel_consumer_add_metadata(struct consumer_socket *sock,
if (monitor) {
pathname = create_channel_path(consumer, session->uid, session->gid);
if (monitor) {
pathname = create_channel_path(consumer, session->uid, session->gid);
- if (!pathname) {
- ret = -1;
- goto error;
- }
} else {
/* Empty path. */
} else {
/* Empty path. */
- pathname = "";
+ pathname = strdup("");
+ }
+ if (!pathname) {
+ ret = -1;
+ goto error;
}
/* Prep channel message structure */
}
/* Prep channel message structure */
@@
-215,6
+224,7
@@
int kernel_consumer_add_metadata(struct consumer_socket *sock,
health_code_update();
error:
health_code_update();
error:
+ free(pathname);
return ret;
}
return ret;
}
@@
-328,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;
}
@@
-338,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:
@@
-371,14
+382,11
@@
int kernel_consumer_send_session(struct consumer_socket *sock,
DBG("Sending session stream to kernel consumer");
DBG("Sending session stream to kernel consumer");
- if (session->metadata_stream_fd >= 0) {
+ if (session->metadata_stream_fd >= 0
&& session->metadata
) {
ret = kernel_consumer_add_metadata(sock, session, monitor);
if (ret < 0) {
goto error;
}
ret = kernel_consumer_add_metadata(sock, session, monitor);
if (ret < 0) {
goto error;
}
-
- /* Flag that at least the metadata has been sent to the consumer. */
- session->consumer_fds_sent = 1;
}
/* Send channel and streams of it */
}
/* Send channel and streams of it */
@@
-402,6
+410,7
@@
int kernel_consumer_send_session(struct consumer_socket *sock,
DBG("Kernel consumer FDs of metadata and channel streams sent");
DBG("Kernel consumer FDs of metadata and channel streams sent");
+ session->consumer_fds_sent = 1;
return 0;
error:
return 0;
error:
@@
-419,6
+428,7
@@
int kernel_consumer_destroy_channel(struct consumer_socket *socket,
DBG("Sending kernel consumer destroy channel key %d", channel->fd);
DBG("Sending kernel consumer destroy channel key %d", channel->fd);
+ memset(&msg, 0, sizeof(msg));
msg.cmd_type = LTTNG_CONSUMER_DESTROY_CHANNEL;
msg.u.destroy_channel.key = channel->fd;
msg.cmd_type = LTTNG_CONSUMER_DESTROY_CHANNEL;
msg.u.destroy_channel.key = channel->fd;
@@
-447,6
+457,7
@@
int kernel_consumer_destroy_metadata(struct consumer_socket *socket,
DBG("Sending kernel consumer destroy channel key %d", metadata->fd);
DBG("Sending kernel consumer destroy channel key %d", metadata->fd);
+ memset(&msg, 0, sizeof(msg));
msg.cmd_type = LTTNG_CONSUMER_DESTROY_CHANNEL;
msg.u.destroy_channel.key = metadata->fd;
msg.cmd_type = LTTNG_CONSUMER_DESTROY_CHANNEL;
msg.u.destroy_channel.key = metadata->fd;
This page took
0.026067 seconds
and
4
git commands to generate.