X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=ustd%2Fustd.c;h=8205ed2b2b5e3c77cc6fa9ecae56e2c2ef7ed0ae;hb=3a7b90de71f2a82f73f06fb14a7b77805aea1064;hp=66b9dd382028befb523b1790fe3b2d7f992b29f6;hpb=811e4b93ba6acb72226a9243ae9a525f444e7e80;p=ust.git

diff --git a/ustd/ustd.c b/ustd/ustd.c
index 66b9dd3..8205ed2 100644
--- a/ustd/ustd.c
+++ b/ustd/ustd.c
@@ -2,6 +2,9 @@
 
 #include <sys/types.h>
 #include <sys/shm.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <pthread.h>
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -24,14 +27,159 @@ struct buffer_info {
 	int subbuf_size;
 
 	int file_fd; /* output file */
+
+	struct list_head list;
+
+	long consumed_old;
 };
 
+/* return value: 0 = subbuffer is finished, it won't produce data anymore
+ *               1 = got subbuffer successfully
+ *               <0 = error
+ */
+
+int get_subbuffer(struct buffer_info *buf)
+{
+	char *send_msg;
+	char *received_msg;
+	char *rep_code;
+	int retval;
+	int result;
+
+	asprintf(&send_msg, "get_subbuffer %s", buf->name);
+	result = send_message(buf->pid, send_msg, &received_msg);
+	if(result < 0) {
+		ERR("get_subbuffer: send_message failed");
+		return -1;
+	}
+	free(send_msg);
+
+	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;
+	}
+
+	DBG("received msg is %s", received_msg);
+
+	if(!strcmp(rep_code, "OK")) {
+		DBG("got subbuffer %s", buf->name);
+		retval = 1;
+	}
+	else if(nth_token_is(received_msg, "END", 0) == 1) {
+		return 0;
+	}
+	else {
+		DBG("error getting subbuffer %s", buf->name);
+		retval = -1;
+	}
+
+	/* FIMXE: free correctly the stuff */
+	free(received_msg);
+	free(rep_code);
+	return retval;
+}
+
+int put_subbuffer(struct buffer_info *buf)
+{
+	char *send_msg;
+	char *received_msg;
+	char *rep_code;
+	int retval;
+	int result;
+
+	asprintf(&send_msg, "put_subbuffer %s %ld", buf->name, buf->consumed_old);
+	result = send_message(buf->pid, send_msg, &received_msg);
+	if(result < 0) {
+		ERR("put_subbuffer: send_message failed");
+		return -1;
+	}
+	free(send_msg);
+
+	result = sscanf(received_msg, "%as", &rep_code);
+	if(result != 1) {
+		ERR("unable to parse response to put_subbuffer");
+		return -1;
+	}
+	free(received_msg);
+
+	if(!strcmp(rep_code, "OK")) {
+		DBG("subbuffer put %s", buf->name);
+		retval = 1;
+	}
+	else {
+		ERR("invalid response to put_subbuffer");
+	}
+
+	free(rep_code);
+	return retval;
+}
+
+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;
+
+		if(count == 0) {
+			break;
+		}
+	}
+
+	return bufc-(const char *)buf;
+}
+
+void *consumer_thread(void *arg)
+{
+	struct buffer_info *buf = (struct buffer_info *) arg;
+	int result;
+
+	for(;;) {
+		result = get_subbuffer(buf);
+		if(result == -1) {
+			ERR("error getting subbuffer");
+			continue;
+		}
+		if(result == 0) {
+			/* this is done */
+			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 */
+		}
+
+		result = put_subbuffer(buf);
+		if(result == -1) {
+			ERR("error putting subbuffer");
+			break;
+		}
+	}
+
+	DBG("thread for buffer %s is stopping", buf->name);
+
+	return NULL;
+}
+
 int add_buffer(pid_t pid, char *bufname)
 {
 	struct buffer_info *buf;
 	char *send_msg;
 	char *received_msg;
 	int result;
+	char *tmp;
+	int fd;
+	pthread_t thr;
 
 	buf = (struct buffer_info *) malloc(sizeof(struct buffer_info));
 	if(buf == NULL) {
@@ -90,6 +238,20 @@ int add_buffer(pid_t pid, char *bufname)
 	}
 	DBG("successfully attached memory");
 
+	/* open file for output */
+	asprintf(&tmp, "/tmp/trace/%s_0", buf->name);
+	result = fd = open(tmp, O_WRONLY | O_CREAT | O_TRUNC, 00600);
+	if(result == -1) {
+		PERROR("open");
+		return -1;
+	}
+	buf->file_fd = fd;
+	free(tmp);
+
+	//list_add(&buf->list, &buffers);
+
+	pthread_create(&thr, NULL, consumer_thread, buf);
+
 	return 0;
 }
 
@@ -104,26 +266,36 @@ int main(int argc, char **argv)
 		return 1;
 	}
 
+	/* app loop */
 	for(;;) {
 		char *recvbuf;
 
-		ustcomm_ustd_recv_message(&ustd, &recvbuf, NULL);
+		/* check for requests on our public socket */
+		result = ustcomm_ustd_recv_message(&ustd, &recvbuf, NULL, 100);
+		if(result == -1) {
+			ERR("error in ustcomm_ustd_recv_message");
+			continue;
+		}
+		if(result > 0) {
+			if(!strncmp(recvbuf, "collect", 7)) {
+				pid_t pid;
+				char *bufname;
+				int result;
 
-		if(!strncmp(recvbuf, "collect", 7)) {
-			pid_t pid;
-			char *bufname;
-			int result;
+				result = sscanf(recvbuf, "%*s %d %50as", &pid, &bufname);
+				if(result != 2) {
+					fprintf(stderr, "parsing error: %s\n", recvbuf);
+				}
 
-			result = sscanf(recvbuf, "%*s %d %50as", &pid, &bufname);
-			if(result != 2) {
-				fprintf(stderr, "parsing error: %s\n", recvbuf);
+				result = add_buffer(pid, bufname);
+				if(result < 0) {
+					ERR("error in add_buffer");
+					continue;
+				}
 			}
 
-			add_buffer(pid, bufname);
-			
+			free(recvbuf);
 		}
-
-		free(recvbuf);
 	}
 
 	return 0;