projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Init the kconsumerd error socket
[lttng-tools.git]
/
liblttngkconsumerd
/
lttngkconsumerd.c
diff --git
a/liblttngkconsumerd/lttngkconsumerd.c
b/liblttngkconsumerd/lttngkconsumerd.c
index 5c9f613b11eddf48e4450e0cfd304b00c54d27e6..2e53f9a2dc00b5a123641e0a2314ec0418c78c87 100644
(file)
--- a/
liblttngkconsumerd/lttngkconsumerd.c
+++ b/
liblttngkconsumerd/lttngkconsumerd.c
@@
-18,6
+18,7
@@
*/
#define _GNU_SOURCE
*/
#define _GNU_SOURCE
+#include <assert.h>
#include <fcntl.h>
#include <poll.h>
#include <pthread.h>
#include <fcntl.h>
#include <poll.h>
#include <pthread.h>
@@
-27,14
+28,11
@@
#include <sys/socket.h>
#include <sys/types.h>
#include <unistd.h>
#include <sys/socket.h>
#include <sys/types.h>
#include <unistd.h>
-#include <urcu/list.h>
-#include <assert.h>
+#include <lttng-kernel-ctl.h>
+#include <lttng-sessiond-comm.h>
#include <lttng/lttng-kconsumerd.h>
#include <lttng/lttng-kconsumerd.h>
-
-#include "kernelctl.h"
-#include "lttngerr.h"
-#include "lttng-sessiond-comm.h"
+#include <lttngerr.h>
static struct lttng_kconsumerd_global_data {
/*
static struct lttng_kconsumerd_global_data {
/*
@@
-777,6
+775,7
@@
struct lttng_kconsumerd_local_data *lttng_kconsumerd_create(
goto error;
}
goto error;
}
+ ctx->kconsumerd_error_socket = -1;
/* assign the callbacks */
ctx->on_buffer_ready = buffer_ready;
ctx->on_recv_fd = recv_fd;
/* assign the callbacks */
ctx->on_buffer_ready = buffer_ready;
ctx->on_recv_fd = recv_fd;
@@
-871,6
+870,7
@@
void *lttng_kconsumerd_thread_receive_fds(void *data)
DBG("Sending ready command to ltt-sessiond");
ret = lttng_kconsumerd_send_error(ctx, KCONSUMERD_COMMAND_SOCK_READY);
DBG("Sending ready command to ltt-sessiond");
ret = lttng_kconsumerd_send_error(ctx, KCONSUMERD_COMMAND_SOCK_READY);
+ /* return < 0 on error, but == 0 is not fatal */
if (ret < 0) {
ERR("Error sending ready command to ltt-sessiond");
goto end;
if (ret < 0) {
ERR("Error sending ready command to ltt-sessiond");
goto end;
@@
-999,6
+999,7
@@
void lttng_kconsumerd_should_exit(struct lttng_kconsumerd_local_data *ctx)
/*
* Send return code to the session daemon.
/*
* Send return code to the session daemon.
+ * If the socket is not defined, we return 0, it is not a fatal error
*/
int lttng_kconsumerd_send_error(
struct lttng_kconsumerd_local_data *ctx, int cmd)
*/
int lttng_kconsumerd_send_error(
struct lttng_kconsumerd_local_data *ctx, int cmd)
This page took
0.023683 seconds
and
4
git commands to generate.