}
else if(!strcmp(received_msg, "NOTFOUND")) {
DBG("For buffer %s, the trace was not found. This likely means it was destroyed by the user.", buf->name);
- retval = GET_SUBBUF_DONE;
+ retval = GET_SUBBUF_DIED;
goto end_rep;
}
else {
result = patient_write(buf->file_fd, subbuf_mem, cur_sb_size);
if(result == -1) {
PERROR("write");
- /* FIXME: maybe drop this trace */
return -1;
}
}
/* write data to file */
- write_current_subbuffer(buf);
- /* FIXME: handle return value? */
+ result = write_current_subbuffer(buf);
+ if(result == -1) {
+ ERR("Failed writing a subbuffer to file (channel=%s). Dropping this buffer.", buf->name);
+ }
/* put the subbuffer */
result = put_subbuffer(buf);
{
struct buffer_info *buf = (struct buffer_info *) arg;
struct consumer_thread_args *args = (struct consumer_thread_args *) arg;
+ int result;
+ sigset_t sigset;
DBG("GOT ARGS: pid %d bufname %s", args->pid, args->bufname);
+ /* Block signals that should be handled by the main thread. */
+ result = sigemptyset(&sigset);
+ if(result == -1) {
+ PERROR("sigemptyset");
+ goto end;
+ }
+ result = sigaddset(&sigset, SIGTERM);
+ if(result == -1) {
+ PERROR("sigaddset");
+ goto end;
+ }
+ result = sigaddset(&sigset, SIGINT);
+ if(result == -1) {
+ PERROR("sigaddset");
+ goto end;
+ }
+ result = sigprocmask(SIG_BLOCK, &sigset, NULL);
+ if(result == -1) {
+ PERROR("sigprocmask");
+ goto end;
+ }
+
buf = connect_buffer(args->pid, args->bufname);
if(buf == NULL) {
ERR("failed to connect to buffer");
consumer_loop(buf);
- free(args->bufname);
destroy_buffer(buf);
end:
- /* bufname is free'd in free_buffer() */
+ free((void *)args->bufname);
free(args);
return NULL;
}
int result;
sigset_t sigset;
struct sigaction sa;
+ int timeout = -1;
result = sigemptyset(&sigset);
if(result == -1) {
}
sa.sa_handler = sigterm_handler;
sa.sa_mask = sigset;
- sa.sa_flags = SA_RESTART;
+ sa.sa_flags = 0;
result = sigaction(SIGTERM, &sa, NULL);
if(result == -1) {
PERROR("sigaction");
char *recvbuf;
/* check for requests on our public socket */
- result = ustcomm_ustd_recv_message(&ustd, &recvbuf, NULL, 100);
- if(result == -1) {
+ result = ustcomm_ustd_recv_message(&ustd, &recvbuf, NULL, timeout);
+ if(result == -1 && errno == EINTR) {
+ /* Caught signal */
+ }
+ else if(result == -1) {
ERR("error in ustcomm_ustd_recv_message");
goto loop_end;
}
- if(result > 0) {
+ else if(result > 0) {
if(!strncmp(recvbuf, "collect", 7)) {
pid_t pid;
char *bufname;
break;
}
pthread_mutex_unlock(&active_buffers_mutex);
+ timeout = 100;
}
}