X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ustd%2Fustd.c;h=2393ea3d45b5befa4c01cc628eeb57279b48cea4;hb=775c8a3f299e02caae0bc6faf316c44cc020efe1;hp=ddbb18bfead46869bf02b43a4c328a2d534697a9;hpb=ed1317e78616d3fb99791d4effef7473317c41ec;p=lttng-ust.git

diff --git a/ustd/ustd.c b/ustd/ustd.c
index ddbb18bf..2393ea3d 100644
--- a/ustd/ustd.c
+++ b/ustd/ustd.c
@@ -35,6 +35,7 @@
 #include "ustd.h"
 #include "localerr.h"
 #include "ustcomm.h"
+#include "share.h"
 
 /* return value: 0 = subbuffer is finished, it won't produce data anymore
  *               1 = got subbuffer successfully
@@ -58,68 +59,32 @@ pthread_mutex_t active_buffers_mutex = PTHREAD_MUTEX_INITIALIZER;
 /* Whether a request to end the program was received. */
 sig_atomic_t terminate_req = 0;
 
-int test_sigpipe(void)
-{
-	sigset_t sigset;
-	int result;
-
-	result = sigemptyset(&sigset);
-	if(result == -1) {
-		perror("sigemptyset");
-		return -1;
-	}
-	result = sigaddset(&sigset, SIGPIPE);
-	if(result == -1) {
-		perror("sigaddset");
-		return -1;
-	}
-
-	result = sigtimedwait(&sigset, NULL, &(struct timespec){0,0});
-	if(result == -1 && errno == EAGAIN) {
-		/* no signal received */
-		return 0;
-	}
-	else if(result == -1) {
-		perror("sigtimedwait");
-		return -1;
-	}
-	else if(result == SIGPIPE) {
-		/* received sigpipe */
-		return 1;
-	}
-	else {
-		assert(0);
-	}
-}
-
 int get_subbuffer(struct buffer_info *buf)
 {
-	char *send_msg;
-	char *received_msg;
-	char *rep_code;
+	char *send_msg=NULL;
+	char *received_msg=NULL;
+	char *rep_code=NULL;
 	int retval;
 	int result;
 
 	asprintf(&send_msg, "get_subbuffer %s", buf->name);
 	result = ustcomm_send_request(&buf->conn, send_msg, &received_msg);
-	free(send_msg);
-	if(test_sigpipe()) {
-		WARN("process %d destroyed before we could connect to it", buf->pid);
-		return GET_SUBBUF_DONE;
+	if((result == -1 && errno == EPIPE) || result == 0) {
+		DBG("app died while being traced");
+		retval = GET_SUBBUF_DIED;
+		goto end;
 	}
 	else if(result < 0) {
 		ERR("get_subbuffer: ustcomm_send_request failed");
-		return -1;
-	}
-	else if(result == 0) {
-		DBG("app died while being traced");
-		return GET_SUBBUF_DIED;
+		retval = -1;
+		goto end;
 	}
 
 	result = sscanf(received_msg, "%as %ld", &rep_code, &buf->consumed_old);
 	if(result != 2 && result != 1) {
 		ERR("unable to parse response to get_subbuffer");
-		return -1;
+		retval = -1;
+		goto end_rep;
 	}
 
 	DBG("received msg is %s", received_msg);
@@ -129,7 +94,8 @@ int get_subbuffer(struct buffer_info *buf)
 		retval = GET_SUBBUF_OK;
 	}
 	else if(nth_token_is(received_msg, "END", 0) == 1) {
-		return GET_SUBBUF_DONE;
+		retval = GET_SUBBUF_DONE;
+		goto end_rep;
 	}
 	else {
 		DBG("error getting subbuffer %s", buf->name);
@@ -137,33 +103,44 @@ int get_subbuffer(struct buffer_info *buf)
 	}
 
 	/* FIMXE: free correctly the stuff */
-	free(received_msg);
-	free(rep_code);
+end_rep:
+	if(rep_code)
+		free(rep_code);
+end:
+	if(send_msg)
+		free(send_msg);
+	if(received_msg)
+		free(received_msg);
+
 	return retval;
 }
 
 int put_subbuffer(struct buffer_info *buf)
 {
-	char *send_msg;
-	char *received_msg;
-	char *rep_code;
+	char *send_msg=NULL;
+	char *received_msg=NULL;
+	char *rep_code=NULL;
 	int retval;
 	int result;
 
 	asprintf(&send_msg, "put_subbuffer %s %ld", buf->name, buf->consumed_old);
 	result = ustcomm_send_request(&buf->conn, send_msg, &received_msg);
+	if(result < 0 && errno == ECONNRESET) {
+		retval = PUT_SUBBUF_DIED;
+		goto end;
+	}
 	if(result < 0) {
 		ERR("put_subbuffer: send_message failed");
-		return -1;
+		retval = -1;
+		goto end;
 	}
-	free(send_msg);
 
 	result = sscanf(received_msg, "%as", &rep_code);
 	if(result != 1) {
 		ERR("unable to parse response to put_subbuffer");
-		return -1;
+		retval = -1;
+		goto end_rep;
 	}
-	free(received_msg);
 
 	if(!strcmp(rep_code, "OK")) {
 		DBG("subbuffer put %s", buf->name);
@@ -171,35 +148,21 @@ int put_subbuffer(struct buffer_info *buf)
 	}
 	else {
 		DBG("put_subbuffer: received error, we were pushed");
-		return PUT_SUBBUF_PUSHED;
+		retval = PUT_SUBBUF_PUSHED;
+		goto end_rep;
 	}
 
-	free(rep_code);
-	return retval;
-}
-
-/* This write is patient because it restarts if it was incomplete.
- */
-
-ssize_t patient_write(int fd, const void *buf, size_t count)
-{
-	const char *bufc = (const char *) buf;
-	int result;
-
-	for(;;) {
-		result = write(fd, bufc, count);
-		if(result <= 0) {
-			return result;
-		}
-		count -= result;
-		bufc += result;
+end_rep:
+	if(rep_code)
+		free(rep_code);
 
-		if(count == 0) {
-			break;
-		}
-	}
+end:
+	if(send_msg)
+		free(send_msg);
+	if(received_msg)
+		free(received_msg);
 
-	return bufc-(const char *)buf;
+	return retval;
 }
 
 void decrement_active_buffers(void *arg)
@@ -209,71 +172,13 @@ void decrement_active_buffers(void *arg)
 	pthread_mutex_unlock(&active_buffers_mutex);
 }
 
-void *consumer_thread(void *arg)
-{
-	struct buffer_info *buf = (struct buffer_info *) arg;
-	int result;
-
-	pthread_cleanup_push(decrement_active_buffers, NULL);
-
-	for(;;) {
-		/* get the subbuffer */
-		result = get_subbuffer(buf);
-		if(result == -1) {
-			ERR("error getting subbuffer");
-			continue;
-		}
-		else if(result == GET_SUBBUF_DONE) {
-			/* this is done */
-			break;
-		}
-		else if(result == GET_SUBBUF_DIED) {
-			finish_consuming_dead_subbuffer(buf);
-			break;
-		}
-
-		/* write data to file */
-		result = patient_write(buf->file_fd, buf->mem + (buf->consumed_old & (buf->n_subbufs * buf->subbuf_size-1)), buf->subbuf_size);
-		if(result == -1) {
-			PERROR("write");
-			/* FIXME: maybe drop this trace */
-		}
-
-		/* put the subbuffer */
-		result = put_subbuffer(buf);
-		if(result == -1) {
-			ERR("unknown error putting subbuffer (channel=%s)", buf->name);
-			break;
-		}
-		else if(result == PUT_SUBBUF_PUSHED) {
-			ERR("Buffer overflow (channel=%s), reader pushed. This channel will not be usable passed this point.", buf->name);
-			break;
-		}
-		else if(result == PUT_SUBBUF_DIED) {
-			WARN("application died while putting subbuffer");
-			/* FIXME: probably need to skip the first subbuffer in finish_consuming_dead_subbuffer */
-			finish_consuming_dead_subbuffer(buf);
-		}
-		else if(result == PUT_SUBBUF_OK) {
-		}
-	}
-
-	DBG("thread for buffer %s is stopping", buf->name);
-
-	/* FIXME: destroy, unalloc... */
-
-	pthread_cleanup_pop(1);
-
-	return NULL;
-}
-
 int create_dir_if_needed(char *dir)
 {
 	int result;
 	result = mkdir(dir, 0777);
 	if(result == -1) {
 		if(errno != EEXIST) {
-			perror("mkdir");
+			PERROR("mkdir");
 			return -1;
 		}
 	}
@@ -299,7 +204,7 @@ int is_directory(const char *dir)
 	return 1;
 }
 
-int add_buffer(pid_t pid, char *bufname)
+struct buffer_info *connect_buffer(pid_t pid, const char *bufname)
 {
 	struct buffer_info *buf;
 	char *send_msg;
@@ -307,13 +212,12 @@ int add_buffer(pid_t pid, char *bufname)
 	int result;
 	char *tmp;
 	int fd;
-	pthread_t thr;
 	struct shmid_ds shmds;
 
 	buf = (struct buffer_info *) malloc(sizeof(struct buffer_info));
 	if(buf == NULL) {
 		ERR("add_buffer: insufficient memory");
-		return -1;
+		return NULL;
 	}
 
 	buf->name = bufname;
@@ -323,7 +227,7 @@ int add_buffer(pid_t pid, char *bufname)
 	result = ustcomm_connect_app(buf->pid, &buf->conn);
 	if(result) {
 		WARN("unable to connect to process, it probably died before we were able to connect");
-		return -1;
+		return NULL;
 	}
 
 	/* get pidunique */
@@ -332,13 +236,13 @@ int add_buffer(pid_t pid, char *bufname)
 	free(send_msg);
 	if(result == -1) {
 		ERR("problem in ustcomm_send_request(get_pidunique)");
-		return -1;
+		return NULL;
 	}
 
 	result = sscanf(received_msg, "%lld", &buf->pidunique);
 	if(result != 1) {
 		ERR("unable to parse response to get_pidunique");
-		return -1;
+		return NULL;
 	}
 	free(received_msg);
 	DBG("got pidunique %lld", buf->pidunique);
@@ -349,13 +253,13 @@ int add_buffer(pid_t pid, char *bufname)
 	free(send_msg);
 	if(result == -1) {
 		ERR("problem in ustcomm_send_request(get_shmid)");
-		return -1;
+		return NULL;
 	}
 
 	result = sscanf(received_msg, "%d %d", &buf->shmid, &buf->bufstruct_shmid);
 	if(result != 2) {
 		ERR("unable to parse response to get_shmid");
-		return -1;
+		return NULL;
 	}
 	free(received_msg);
 	DBG("got shmids %d %d", buf->shmid, buf->bufstruct_shmid);
@@ -366,13 +270,13 @@ int add_buffer(pid_t pid, char *bufname)
 	free(send_msg);
 	if(result == -1) {
 		ERR("problem in ustcomm_send_request(g_n_subbufs)");
-		return -1;
+		return NULL;
 	}
 
 	result = sscanf(received_msg, "%d", &buf->n_subbufs);
 	if(result != 1) {
 		ERR("unable to parse response to get_n_subbufs");
-		return -1;
+		return NULL;
 	}
 	free(received_msg);
 	DBG("got n_subbufs %d", buf->n_subbufs);
@@ -385,7 +289,7 @@ int add_buffer(pid_t pid, char *bufname)
 	result = sscanf(received_msg, "%d", &buf->subbuf_size);
 	if(result != 1) {
 		ERR("unable to parse response to get_subbuf_size");
-		return -1;
+		return NULL;
 	}
 	free(received_msg);
 	DBG("got subbuf_size %d", buf->subbuf_size);
@@ -393,23 +297,23 @@ int add_buffer(pid_t pid, char *bufname)
 	/* attach memory */
 	buf->mem = shmat(buf->shmid, NULL, 0);
 	if(buf->mem == (void *) 0) {
-		perror("shmat");
-		return -1;
+		PERROR("shmat");
+		return NULL;
 	}
 	DBG("successfully attached buffer memory");
 
 	buf->bufstruct_mem = shmat(buf->bufstruct_shmid, NULL, 0);
 	if(buf->bufstruct_mem == (void *) 0) {
-		perror("shmat");
-		return -1;
+		PERROR("shmat");
+		return NULL;
 	}
 	DBG("successfully attached buffer bufstruct memory");
 
 	/* obtain info on the memory segment */
 	result = shmctl(buf->shmid, IPC_STAT, &shmds);
 	if(result == -1) {
-		perror("shmctl");
-		return -1;
+		PERROR("shmctl");
+		return NULL;
 	}
 	buf->memlen = shmds.shm_segsz;
 
@@ -422,7 +326,7 @@ int add_buffer(pid_t pid, char *bufname)
 		result = create_dir_if_needed(USTD_DEFAULT_TRACE_PATH);
 		if(result == -1) {
 			ERR("could not create directory %s", USTD_DEFAULT_TRACE_PATH);
-			return -1;
+			return NULL;
 		}
 
 		trace_path = USTD_DEFAULT_TRACE_PATH;
@@ -433,7 +337,7 @@ int add_buffer(pid_t pid, char *bufname)
 	if(result == -1) {
 		ERR("could not create directory %s", tmp);
 		free(tmp);
-		return -1;
+		return NULL;
 	}
 	free(tmp);
 
@@ -442,7 +346,7 @@ int add_buffer(pid_t pid, char *bufname)
 	if(result == -1) {
 		PERROR("open");
 		ERR("failed opening trace file %s", tmp);
-		return -1;
+		return NULL;
 	}
 	buf->file_fd = fd;
 	free(tmp);
@@ -451,7 +355,115 @@ int add_buffer(pid_t pid, char *bufname)
 	active_buffers++;
 	pthread_mutex_unlock(&active_buffers_mutex);
 
-	pthread_create(&thr, NULL, consumer_thread, buf);
+	return buf;
+}
+
+int consumer_loop(struct buffer_info *buf)
+{
+	int result;
+
+	pthread_cleanup_push(decrement_active_buffers, NULL);
+
+	for(;;) {
+		/* get the subbuffer */
+		result = get_subbuffer(buf);
+		if(result == -1) {
+			ERR("error getting subbuffer");
+			continue;
+		}
+		else if(result == GET_SUBBUF_DONE) {
+			/* this is done */
+			break;
+		}
+		else if(result == GET_SUBBUF_DIED) {
+			finish_consuming_dead_subbuffer(buf);
+			break;
+		}
+
+		/* write data to file */
+		result = patient_write(buf->file_fd, buf->mem + (buf->consumed_old & (buf->n_subbufs * buf->subbuf_size-1)), buf->subbuf_size);
+		if(result == -1) {
+			PERROR("write");
+			/* FIXME: maybe drop this trace */
+		}
+
+		/* put the subbuffer */
+		/* FIXME: we actually should unput the buffer before consuming... */
+		result = put_subbuffer(buf);
+		if(result == -1) {
+			ERR("unknown error putting subbuffer (channel=%s)", buf->name);
+			break;
+		}
+		else if(result == PUT_SUBBUF_PUSHED) {
+			ERR("Buffer overflow (channel=%s), reader pushed. This channel will not be usable passed this point.", buf->name);
+			break;
+		}
+		else if(result == PUT_SUBBUF_DIED) {
+			WARN("application died while putting subbuffer");
+			/* FIXME: probably need to skip the first subbuffer in finish_consuming_dead_subbuffer */
+			finish_consuming_dead_subbuffer(buf);
+			break;
+		}
+		else if(result == PUT_SUBBUF_OK) {
+		}
+	}
+
+	DBG("thread for buffer %s is stopping", buf->name);
+
+	/* FIXME: destroy, unalloc... */
+
+	pthread_cleanup_pop(1);
+
+	return 0;
+}
+
+void free_buffer(struct buffer_info *buf)
+{
+}
+
+struct consumer_thread_args {
+	pid_t pid;
+	const char *bufname;
+};
+
+void *consumer_thread(void *arg)
+{
+	struct buffer_info *buf = (struct buffer_info *) arg;
+	struct consumer_thread_args *args = (struct consumer_thread_args *) arg;
+
+	DBG("GOT ARGS: pid %d bufname %s", args->pid, args->bufname);
+
+	buf = connect_buffer(args->pid, args->bufname);
+	if(buf == NULL) {
+		ERR("failed to connect to buffer");
+		goto end;
+	}
+
+	consumer_loop(buf);
+
+	free_buffer(buf);
+
+	end:
+	/* bufname is free'd in free_buffer() */
+	free(args);
+	return NULL;
+}
+
+int start_consuming_buffer(pid_t pid, const char *bufname)
+{
+	pthread_t thr;
+	struct consumer_thread_args *args;
+
+	DBG("beginning of start_consuming_buffer: args: pid %d bufname %s", pid, bufname);
+
+	args = (struct consumer_thread_args *) malloc(sizeof(struct consumer_thread_args));
+
+	args->pid = pid;
+	args->bufname = strdup(bufname);
+	DBG("beginning2 of start_consuming_buffer: args: pid %d bufname %s", args->pid, args->bufname);
+
+	pthread_create(&thr, NULL, consumer_thread, args);
+	DBG("end of start_consuming_buffer: args: pid %d bufname %s", args->pid, args->bufname);
 
 	return 0;
 }
@@ -528,7 +540,7 @@ int main(int argc, char **argv)
 
 	result = sigemptyset(&sigset);
 	if(result == -1) {
-		perror("sigemptyset");
+		PERROR("sigemptyset");
 		return 1;
 	}
 	sa.sa_handler = sigterm_handler;
@@ -554,17 +566,17 @@ int main(int argc, char **argv)
 	/* setup handler for SIGPIPE */
 	result = sigemptyset(&sigset);
 	if(result == -1) {
-		perror("sigemptyset");
+		PERROR("sigemptyset");
 		return 1;
 	}
 	result = sigaddset(&sigset, SIGPIPE);
 	if(result == -1) {
-		perror("sigaddset");
+		PERROR("sigaddset");
 		return 1;
 	}
 	result = sigprocmask(SIG_BLOCK, &sigset, NULL);
 	if(result == -1) {
-		perror("sigprocmask");
+		PERROR("sigprocmask");
 		return 1;
 	}
 
@@ -576,7 +588,7 @@ int main(int argc, char **argv)
 		result = ustcomm_ustd_recv_message(&ustd, &recvbuf, NULL, 100);
 		if(result == -1) {
 			ERR("error in ustcomm_ustd_recv_message");
-			continue;
+			goto loop_end;
 		}
 		if(result > 0) {
 			if(!strncmp(recvbuf, "collect", 7)) {
@@ -586,19 +598,25 @@ int main(int argc, char **argv)
 
 				result = sscanf(recvbuf, "%*s %d %50as", &pid, &bufname);
 				if(result != 2) {
-					fprintf(stderr, "parsing error: %s\n", recvbuf);
+					ERR("parsing error: %s", recvbuf);
+					goto free_bufname;
 				}
 
-				result = add_buffer(pid, bufname);
+				result = start_consuming_buffer(pid, bufname);
 				if(result < 0) {
 					ERR("error in add_buffer");
-					continue;
+					goto free_bufname;
 				}
+
+				free_bufname:
+				free(bufname);
 			}
 
 			free(recvbuf);
 		}
 
+		loop_end:
+
 		if(terminate_req) {
 			pthread_mutex_lock(&active_buffers_mutex);
 			if(active_buffers == 0) {