projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add new thread in consumer for metadata handling
[lttng-tools.git]
/
src
/
bin
/
lttng-consumerd
/
lttng-consumerd.c
diff --git
a/src/bin/lttng-consumerd/lttng-consumerd.c
b/src/bin/lttng-consumerd/lttng-consumerd.c
index 3bc700dc948594a937c2ef543a8cbe4c3d4212f7..5952334cd47fe1c1d882e9c7880e627218fb044b 100644
(file)
--- a/
src/bin/lttng-consumerd/lttng-consumerd.c
+++ b/
src/bin/lttng-consumerd/lttng-consumerd.c
@@
-43,17
+43,16
@@
#include <common/defaults.h>
#include <common/common.h>
#include <common/defaults.h>
#include <common/common.h>
-#include <common/
kernel-consumer/kernel-
consumer.h>
-#include <common/
kernel-ctl/kernel-ct
l.h>
+#include <common/consumer.h>
+#include <common/
compat/pol
l.h>
#include <common/sessiond-comm/sessiond-comm.h>
#include <common/sessiond-comm/sessiond-comm.h>
-#include <common/ust-consumer/ust-consumer.h>
#include "lttng-consumerd.h"
/* TODO : support UST (all direct kernel-ctl accesses). */
#include "lttng-consumerd.h"
/* TODO : support UST (all direct kernel-ctl accesses). */
-/* the two threads (receive fd
and poll
) */
-static pthread_t threads[
2
];
+/* the two threads (receive fd
, poll and metadata
) */
+static pthread_t threads[
3
];
/* to count the number of times the user pressed ctrl+c */
static int sigintcount = 0;
/* to count the number of times the user pressed ctrl+c */
static int sigintcount = 0;
@@
-285,6
+284,9
@@
int main(int argc, char **argv)
}
}
}
}
+ /* Set up max poll set size */
+ lttng_poll_set_max_size();
+
if (strlen(command_sock_path) == 0) {
switch (opt_type) {
case LTTNG_CONSUMER_KERNEL:
if (strlen(command_sock_path) == 0) {
switch (opt_type) {
case LTTNG_CONSUMER_KERNEL:
@@
-378,12
+380,12
@@
int main(int argc, char **argv)
}
}
ret = EXIT_SUCCESS;
}
}
ret = EXIT_SUCCESS;
- lttng_consumer_send_error(ctx, CONSUMERD_EXIT_SUCCESS);
+ lttng_consumer_send_error(ctx,
LTTCOMM_
CONSUMERD_EXIT_SUCCESS);
goto end;
error:
ret = EXIT_FAILURE;
goto end;
error:
ret = EXIT_FAILURE;
- lttng_consumer_send_error(ctx, CONSUMERD_EXIT_FAILURE);
+ lttng_consumer_send_error(ctx,
LTTCOMM_
CONSUMERD_EXIT_FAILURE);
end:
lttng_consumer_destroy(ctx);
end:
lttng_consumer_destroy(ctx);
This page took
0.023848 seconds
and
4
git commands to generate.