/* communication with splice */
static int thread_pipe[2];
+/* pipe to wake the poll thread when necessary */
+static int poll_pipe[2];
+
/* socket to communicate errors with sessiond */
static int error_socket = -1;
+/* to count the number of time the user pressed ctrl+c */
+static int sigintcount = 0;
+
/* Argument variables */
int opt_quiet;
int opt_verbose;
/* Opening the tracefile in write mode */
DBG("Opening %s for writing", tmp_fd->path_name);
ret = open(tmp_fd->path_name,
- O_WRONLY|O_CREAT, S_IRWXU|S_IRWXG|S_IRWXO);
+ O_WRONLY|O_CREAT|O_TRUNC, S_IRWXU|S_IRWXG|S_IRWXO);
if (ret < 0) {
ERR("Opening %s", tmp_fd->path_name);
perror("open");
*/
static void sighandler(int sig)
{
+ if (sig == SIGINT && sigintcount++ == 0) {
+ DBG("ignoring first SIGINT");
+ return;
+ }
+
cleanup();
return;
splice_error:
/* send the appropriate error description to sessiond */
switch(ret) {
- case EBADF:
- send_error(KCONSUMERD_SPLICE_EBADF);
- break;
- case EINVAL:
- send_error(KCONSUMERD_SPLICE_EINVAL);
- break;
- case ENOMEM:
- send_error(KCONSUMERD_SPLICE_ENOMEM);
- break;
- case ESPIPE:
- send_error(KCONSUMERD_SPLICE_ESPIPE);
- break;
+ case EBADF:
+ send_error(KCONSUMERD_SPLICE_EBADF);
+ break;
+ case EINVAL:
+ send_error(KCONSUMERD_SPLICE_EINVAL);
+ break;
+ case ENOMEM:
+ send_error(KCONSUMERD_SPLICE_ENOMEM);
+ break;
+ case ESPIPE:
+ send_error(KCONSUMERD_SPLICE_ESPIPE);
+ break;
}
end:
{
struct msghdr msg;
struct iovec iov[1];
- int ret, i;
+ int ret, i, tmp2;
struct cmsghdr *cmsg;
int nb_fd;
char tmp[CMSG_SPACE(size)];
DBG("Receive : expecting %d fds", nb_fd);
for (i = 0; i < nb_fd; i++) {
switch (cmd_type) {
- case LTTCOMM_ADD_STREAM:
- DBG("add_fd %s (%d)", buf[i].path_name, ((int *)CMSG_DATA(cmsg))[i]);
- ret = add_fd(&buf[i], ((int *)CMSG_DATA(cmsg))[i]);
- if (ret < 0) {
- send_error(KCONSUMERD_OUTFD_ERROR);
- goto end;
- }
- break;
- case LTTCOMM_UPDATE_STREAM:
- change_fd_state(buf[i].fd, buf[i].state);
- break;
- default:
- break;
+ case LTTCOMM_ADD_STREAM:
+ DBG("add_fd %s (%d)", buf[i].path_name, ((int *)CMSG_DATA(cmsg))[i]);
+ ret = add_fd(&buf[i], ((int *)CMSG_DATA(cmsg))[i]);
+ if (ret < 0) {
+ send_error(KCONSUMERD_OUTFD_ERROR);
+ goto end;
+ }
+ break;
+ case LTTCOMM_UPDATE_STREAM:
+ change_fd_state(buf[i].fd, buf[i].state);
+ break;
+ default:
+ break;
}
}
/* flag to tell the polling thread to update its fd array */
update_fd_array = 1;
- send_error(KCONSUMERD_SUCCESS_RECV_FD);
+ /* signal the poll thread */
+ tmp2 = write(poll_pipe[1], "4", 1);
} else {
ERR("Didn't received any fd");
send_error(KCONSUMERD_ERROR_RECV_FD);
/* Blocking call, waiting for transmission */
sock = lttcomm_accept_unix_sock(client_socket);
if (sock <= 0) {
- WARN("On accept, retrying");
+ WARN("On accept");
goto error;
}
while (1) {
struct ltt_kconsumerd_fd *iter;
int i = 0;
- if (*pollfd != NULL) {
- free(*pollfd);
- *pollfd = NULL;
- }
-
- if (*local_kconsumerd_fd != NULL) {
- free(*local_kconsumerd_fd);
- *local_kconsumerd_fd = NULL;
- }
-
- *pollfd = malloc(fds_count * sizeof(struct pollfd));
- if (*pollfd == NULL) {
- perror("pollfd malloc");
- goto error_mem;
- }
-
- *local_kconsumerd_fd = malloc(fds_count * sizeof(struct ltt_kconsumerd_fd));
- if (*local_kconsumerd_fd == NULL) {
- perror("local_kconsumerd_fd malloc");
- goto error_mem;
- }
DBG("Updating poll fd array");
pthread_mutex_lock(&kconsumerd_lock_fds);
del_fd(iter);
}
}
+ /*
+ * insert the poll_pipe at the end of the array and don't increment i
+ * so nb_fd is the number of real FD
+ */
+ (*pollfd)[i].fd = poll_pipe[0];
+ (*pollfd)[i].events = POLLIN;
+
update_fd_array = 0;
pthread_mutex_unlock(&kconsumerd_lock_fds);
return i;
-error_mem:
- return -ENOMEM;
}
/*
struct ltt_kconsumerd_fd **local_kconsumerd_fd = NULL;
/* local view of fds_count */
int nb_fd = 0;
+ char tmp;
+ int tmp2;
ret = pipe(thread_pipe);
if (ret < 0) {
* the ltt_fd_list has been updated, we need to update our
* local array as well
*/
- if (update_fd_array) {
+ if (update_fd_array == 1) {
+ if (pollfd != NULL) {
+ free(pollfd);
+ pollfd = NULL;
+ }
+ if (local_kconsumerd_fd != NULL) {
+ free(local_kconsumerd_fd);
+ local_kconsumerd_fd = NULL;
+ }
+ /* allocate for all fds + 1 for the poll_pipe */
+ pollfd = malloc((fds_count + 1) * sizeof(struct pollfd));
+ if (pollfd == NULL) {
+ perror("pollfd malloc");
+ goto end;
+ }
+ /* allocate for all fds + 1 for the poll_pipe */
+ local_kconsumerd_fd = malloc((fds_count + 1) * sizeof(struct ltt_kconsumerd_fd));
+ if (local_kconsumerd_fd == NULL) {
+ perror("local_kconsumerd_fd malloc");
+ goto end;
+ }
+
ret = update_poll_array(&pollfd, local_kconsumerd_fd);
if (ret < 0) {
ERR("Error in allocating pollfd or local_outfds");
}
/* poll on the array of fds */
- DBG("polling on %d fd", nb_fd);
- num_rdy = poll(pollfd, nb_fd, POLL_TIMEOUT);
+ DBG("polling on %d fd", nb_fd + 1);
+ num_rdy = poll(pollfd, nb_fd + 1, -1);
DBG("poll num_rdy : %d", num_rdy);
if (num_rdy == -1) {
perror("Poll error");
goto end;
}
+ /*
+ * if only the poll_pipe triggered poll to return just return to the
+ * beginning of the loop to update the array
+ */
+ if (num_rdy == 1 && pollfd[nb_fd].revents == POLLIN) {
+ DBG("poll_pipe wake up");
+ tmp2 = read(poll_pipe[0], &tmp, 1);
+ continue;
+ }
+
/* Take care of high priority channels first. */
for (i = 0; i < nb_fd; i++) {
switch(pollfd[i].revents) {
- case POLLERR:
- ERR("Error returned in polling fd %d.", pollfd[i].fd);
- num_hup++;
- send_error(KCONSUMERD_POLL_ERROR);
- break;
- case POLLHUP:
- ERR("Polling fd %d tells it has hung up.", pollfd[i].fd);
- num_hup++;
- break;
- case POLLNVAL:
- ERR("Polling fd %d tells fd is not open.", pollfd[i].fd);
- send_error(KCONSUMERD_POLL_NVAL);
- num_hup++;
- break;
- case POLLPRI:
- DBG("Urgent read on fd %d", pollfd[i].fd);
- high_prio = 1;
- ret = read_subbuffer(local_kconsumerd_fd[i]);
- /* it's ok to have an unavailable sub-buffer (FIXME : is it ?) */
- if (ret == EAGAIN) {
- ret = 0;
- }
- break;
+ case POLLERR:
+ ERR("Error returned in polling fd %d.", pollfd[i].fd);
+ num_hup++;
+ send_error(KCONSUMERD_POLL_ERROR);
+ break;
+ case POLLHUP:
+ ERR("Polling fd %d tells it has hung up.", pollfd[i].fd);
+ num_hup++;
+ break;
+ case POLLNVAL:
+ ERR("Polling fd %d tells fd is not open.", pollfd[i].fd);
+ send_error(KCONSUMERD_POLL_NVAL);
+ num_hup++;
+ break;
+ case POLLPRI:
+ DBG("Urgent read on fd %d", pollfd[i].fd);
+ high_prio = 1;
+ ret = read_subbuffer(local_kconsumerd_fd[i]);
+ /* it's ok to have an unavailable sub-buffer (FIXME : is it ?) */
+ if (ret == EAGAIN) {
+ ret = 0;
+ }
+ break;
}
}
}
/* Take care of low priority channels. */
- if (!high_prio) {
+ if (high_prio == 0) {
for (i = 0; i < nb_fd; i++) {
- switch(pollfd[i].revents) {
- case POLLIN:
- DBG("Normal read on fd %d", pollfd[i].fd);
- ret = read_subbuffer(local_kconsumerd_fd[i]);
- /* it's ok to have an unavailable subbuffer (FIXME : is it ?) */
- if (ret == EAGAIN) {
- ret = 0;
- }
- break;
+ if (pollfd[i].revents == POLLIN) {
+ DBG("Normal read on fd %d", pollfd[i].fd);
+ ret = read_subbuffer(local_kconsumerd_fd[i]);
+ /* it's ok to have an unavailable subbuffer (FIXME : is it ?) */
+ if (ret == EAGAIN) {
+ ret = 0;
+ }
}
}
}
}
switch (c) {
- case 0:
- fprintf(stderr, "option %s", long_options[option_index].name);
- if (optarg) {
- fprintf(stderr, " with arg %s\n", optarg);
- }
- break;
- case 'c':
- snprintf(command_sock_path, PATH_MAX, "%s", optarg);
- break;
- case 'e':
- snprintf(error_sock_path, PATH_MAX, "%s", optarg);
- break;
- case 'd':
- opt_daemon = 1;
- break;
- case 'h':
- usage();
- exit(EXIT_FAILURE);
- case 'q':
- opt_quiet = 1;
- break;
- case 'v':
- opt_verbose = 1;
- break;
- case 'V':
- fprintf(stdout, "%s\n", VERSION);
- exit(EXIT_SUCCESS);
- default:
- usage();
- exit(EXIT_FAILURE);
+ case 0:
+ fprintf(stderr, "option %s", long_options[option_index].name);
+ if (optarg) {
+ fprintf(stderr, " with arg %s\n", optarg);
+ }
+ break;
+ case 'c':
+ snprintf(command_sock_path, PATH_MAX, "%s", optarg);
+ break;
+ case 'e':
+ snprintf(error_sock_path, PATH_MAX, "%s", optarg);
+ break;
+ case 'd':
+ opt_daemon = 1;
+ break;
+ case 'h':
+ usage();
+ exit(EXIT_FAILURE);
+ case 'q':
+ opt_quiet = 1;
+ break;
+ case 'v':
+ opt_verbose = 1;
+ break;
+ case 'V':
+ fprintf(stdout, "%s\n", VERSION);
+ exit(EXIT_SUCCESS);
+ default:
+ usage();
+ exit(EXIT_FAILURE);
}
}
}
goto error;
}
+ /* create the pipe to wake to polling thread when needed */
+ ret = pipe(poll_pipe);
+ if (ret < 0) {
+ perror("Error creating poll pipe");
+ goto end;
+ }
+
/* Connect to the socket created by ltt-sessiond to report errors */
DBG("Connecting to error socket %s", error_sock_path);
error_socket = lttcomm_connect_unix_sock(error_sock_path);
projects / lttng-tools.git / blobdiff