X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=ustd%2Fustd.c;h=ac60b3d9199414dd61187a65ec9b874d170a9dae;hb=6c42ce2c7f9c9f2c91170e87029c9c2702a76c6e;hp=95dbdcaeaceb8c9501c44132ff251e413028de00;hpb=7fc9284baa5c9fafbd23120b1ac064b402349fbc;p=ust.git

diff --git a/ustd/ustd.c b/ustd/ustd.c
index 95dbdca..ac60b3d 100644
--- a/ustd/ustd.c
+++ b/ustd/ustd.c
@@ -100,7 +100,7 @@ int get_subbuffer(struct buffer_info *buf)
 	}
 	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 {
@@ -465,7 +465,6 @@ int write_current_subbuffer(struct buffer_info *buf)
 	result = patient_write(buf->file_fd, subbuf_mem, cur_sb_size);
 	if(result == -1) {
 		PERROR("write");
-		/* FIXME: maybe drop this trace */
 		return -1;
 	}
 
@@ -495,8 +494,10 @@ int consumer_loop(struct buffer_info *buf)
 		}
 
 		/* 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);
@@ -548,9 +549,33 @@ void *consumer_thread(void *arg)
 {
 	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");
@@ -559,10 +584,10 @@ void *consumer_thread(void *arg)
 
 	consumer_loop(buf);
 
-	free((void *)args->bufname);
 	destroy_buffer(buf);
 
 	end:
+	free((void *)args->bufname);
 	free(args);
 	return NULL;
 }
@@ -692,6 +717,7 @@ int start_ustd(int fd)
 	int result;
 	sigset_t sigset;
 	struct sigaction sa;
+	int timeout = -1;
 
 	result = sigemptyset(&sigset);
 	if(result == -1) {
@@ -700,7 +726,7 @@ int start_ustd(int fd)
 	}
 	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");
@@ -767,12 +793,16 @@ int start_ustd(int fd)
 		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 */
+			printf("Caught signal\n");
+		}
+		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;
@@ -809,6 +839,7 @@ int start_ustd(int fd)
 				break;
 			}
 			pthread_mutex_unlock(&active_buffers_mutex);
+			timeout = 100;
 		}
 	}