#include <common/defaults.h>
#include <common/common.h>
#include <common/consumer.h>
+#include <common/compat/poll.h>
#include <common/sessiond-comm/sessiond-comm.h>
#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;
}
}
+ /* Set up max poll set size */
+ lttng_poll_set_max_size();
+
if (strlen(command_sock_path) == 0) {
switch (opt_type) {
case LTTNG_CONSUMER_KERNEL:
}
lttng_consumer_set_error_sock(ctx, ret);
- /* Create the thread to manage the receive of fd */
- ret = pthread_create(&threads[0], NULL, lttng_consumer_thread_receive_fds,
+ /* Create thread to manage the polling/writing of trace metadata */
+ ret = pthread_create(&threads[0], NULL, consumer_thread_metadata_poll,
(void *) ctx);
if (ret != 0) {
perror("pthread_create");
goto error;
}
- /* Create thread to manage the polling/writing of traces */
- ret = pthread_create(&threads[1], NULL, lttng_consumer_thread_poll_fds,
+ /* Create thread to manage the polling/writing of trace data */
+ ret = pthread_create(&threads[1], NULL, consumer_thread_data_poll,
+ (void *) ctx);
+ if (ret != 0) {
+ perror("pthread_create");
+ goto error;
+ }
+
+ /* Create the thread to manage the receive of fd */
+ ret = pthread_create(&threads[2], NULL, consumer_thread_sessiond_poll,
(void *) ctx);
if (ret != 0) {
perror("pthread_create");
goto error;
}
- for (i = 0; i < 2; i++) {
+ for (i = 0; i < 3; i++) {
ret = pthread_join(threads[i], &status);
if (ret != 0) {
perror("pthread_join");