X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=libustcomm%2Fustcomm.c;h=5f2517b169411dc24e2f66c6823962d629ebfdc4;hb=393bc3911a4d704f85d6331aca2fb4a5b57b5e8a;hp=fd5e360e343a7e495330115d060396bdf4179365;hpb=7e92827db5195a5b6afc110d0152eb2deef75638;p=ust.git

diff --git a/libustcomm/ustcomm.c b/libustcomm/ustcomm.c
index fd5e360..5f2517b 100644
--- a/libustcomm/ustcomm.c
+++ b/libustcomm/ustcomm.c
@@ -32,10 +32,11 @@
 
 #include "ustcomm.h"
 #include "usterr.h"
+#include "share.h"
 
 #define UNIX_PATH_MAX 108
 
-#define MSG_MAX 1000
+#define MSG_MAX 10000
 
 /* FIXME: ustcomm blocks on message sending, which might be problematic in
  * some cases. Fix the poll() usage so sends are buffered until they don't
@@ -51,6 +52,55 @@
 //	backtrace_symbols_fd(buffer, result, STDERR_FILENO);
 //}
 
+static int mkdir_p(const char *path, mode_t mode)
+{
+	const char *path_p;
+	char *tmp;
+
+	int retval = 0;
+	int result;
+
+	tmp = malloc(strlen(path) + 1);
+	if (tmp == NULL)
+		return -1;
+
+	/* skip first / */
+	path_p = path+1;
+
+	for(;;) {
+		while (*path_p != '/') {
+			if(*path_p == 0)
+				break;
+			++path_p;
+		}
+		if (*path_p == '/') {
+			strncpy(tmp, path, path_p - path);
+			tmp[path_p-path] = '\0';
+			if (tmp[path_p - path - 1] != '/') {
+				result = mkdir(tmp, mode);
+				if(result == -1) {
+					if (!(errno == EEXIST || errno == EACCES || errno == EROFS)) {
+						/* Then this is a real error */
+						retval = -1;
+						break;
+					}
+				}
+			}
+			/* pass / */
+			path_p++;
+		} else {
+			/* last component */
+			result = mkdir(path, mode);
+			if (result == -1)
+				retval = -1;
+			break;
+		}
+	}
+
+	free(tmp);
+	return retval;
+}
+
 char *strdup_malloc(const char *s)
 {
 	char *retval;
@@ -70,23 +120,44 @@ static int signal_process(pid_t pid)
 	return 0;
 }
 
+void ustcomm_init_connection(struct ustcomm_connection *conn)
+{
+	conn->recv_buf = NULL;
+	conn->recv_buf_size = 0;
+	conn->recv_buf_alloc = 0;
+}
+
 int pid_is_online(pid_t pid) {
 	return 1;
 }
 
+/* Send a message
+ *
+ * @fd: file descriptor to send to
+ * @msg: a null-terminated string containing the message to send
+ *
+ * Return value:
+ * -1: error
+ * 0: connection closed
+ * 1: success
+ */
+
 static int send_message_fd(int fd, const char *msg)
 {
 	int result;
 
-	result = send(fd, msg, strlen(msg), MSG_NOSIGNAL);
+	/* Send including the final \0 */
+	result = patient_send(fd, msg, strlen(msg)+1, MSG_NOSIGNAL);
 	if(result == -1) {
-		PERROR("send");
+		if(errno != EPIPE)
+			PERROR("send");
 		return -1;
 	}
 	else if(result == 0) {
 		return 0;
 	}
 
+	DBG("sent message \"%s\"", msg);
 	return 1;
 }
 
@@ -142,30 +213,89 @@ int ustcomm_request_consumer(pid_t pid, const char *channel)
 }
 
 /* returns 1 to indicate a message was received
- * returns 0 to indicate no message was received (cannot happen)
+ * returns 0 to indicate no message was received (end of stream)
  * returns -1 to indicate an error
  */
 
-static int recv_message_fd(int fd, char **msg, struct ustcomm_source *src)
+#define RECV_INCREMENT 1000
+#define RECV_INITIAL_BUF_SIZE 10
+
+static int recv_message_fd(int fd, char **recv_buf, int *recv_buf_size, int *recv_buf_alloc, char **msg)
 {
 	int result;
 
-	*msg = (char *) malloc(MSG_MAX+1);
+	/* 1. Check if there is a message in the buf */
+	/* 2. If not, do:
+           2.1 receive chunk and put it in buffer
+	   2.2 process full message if there is one
+	   -- while no message arrived
+	*/
 
-	result = recv(fd, *msg, MSG_MAX, 0);
-	if(result == -1) {
-		PERROR("recv");
-		return -1;
-	}
+	for(;;) {
+		int i;
+		int nulfound = 0;
+
+		/* Search for full message in buffer */
+		for(i=0; i<*recv_buf_size; i++) {
+			if((*recv_buf)[i] == '\0') {
+				nulfound = 1;
+				break;
+			}
+		}
 
-	(*msg)[result] = '\0';
-	
-	DBG("ustcomm_app_recv_message: result is %d, message is %s", result, (*msg));
+		/* Process found message */
+		if(nulfound == 1) {
+			char *newbuf;
 
-	if(src)
-		src->fd = fd;
+			if(i == 0) {
+				/* problem */
+			}
+			*msg = strndup(*recv_buf, i);
+
+			/* Remove processed message from buffer */
+			newbuf = (char *) malloc(*recv_buf_size - (i+1));
+			memcpy(newbuf, *recv_buf + (i+1), *recv_buf_size - (i+1));
+			free(*recv_buf);
+			*recv_buf = newbuf;
+			*recv_buf_size -= (i+1);
+			*recv_buf_alloc -= (i+1);
+
+			return 1;
+		}
+
+		/* Receive a chunk from the fd */
+		if(*recv_buf_alloc - *recv_buf_size < RECV_INCREMENT) {
+			*recv_buf_alloc += RECV_INCREMENT - (*recv_buf_alloc - *recv_buf_size);
+			*recv_buf = (char *) realloc(*recv_buf, *recv_buf_alloc);
+		}
+
+		result = recv(fd, *recv_buf+*recv_buf_size, RECV_INCREMENT, 0);
+		if(result == -1) {
+			if(errno == ECONNRESET) {
+				*recv_buf_size = 0;
+				return 0;
+			}
+			/* real error */
+			PERROR("recv");
+			return -1;
+		}
+		if(result == 0) {
+			return 0;
+		}
+		*recv_buf_size += result;
+
+		/* Go back to the beginning to check if there is a full message in the buffer */
+	}
+
+	DBG("received message \"%s\"", *recv_buf);
 
 	return 1;
+
+}
+
+static int recv_message_conn(struct ustcomm_connection *conn, char **msg)
+{
+	return recv_message_fd(conn->fd, &conn->recv_buf, &conn->recv_buf_size, &conn->recv_buf_alloc, msg);
 }
 
 int ustcomm_send_reply(struct ustcomm_server *server, char *msg, struct ustcomm_source *src)
@@ -208,6 +338,7 @@ int ustcomm_close_all_connections(struct ustcomm_server *server)
 int ustcomm_recv_message(struct ustcomm_server *server, char **msg, struct ustcomm_source *src, int timeout)
 {
 	struct pollfd *fds;
+	struct ustcomm_connection **conn_table;
 	struct ustcomm_connection *conn;
 	int result;
 	int retval;
@@ -226,6 +357,12 @@ int ustcomm_recv_message(struct ustcomm_server *server, char **msg, struct ustco
 			return -1;
 		}
 
+		conn_table = (struct ustcomm_connection **) malloc(n_fds * sizeof(struct ustcomm_connection *));
+		if(conn_table == NULL) {
+			ERR("malloc returned NULL");
+			return -1;
+		}
+
 		/* special idx 0 is for listening socket */
 		fds[idx].fd = server->listen_fd;
 		fds[idx].events = POLLIN;
@@ -234,6 +371,7 @@ int ustcomm_recv_message(struct ustcomm_server *server, char **msg, struct ustco
 		list_for_each_entry(conn, &server->connections, list) {
 			fds[idx].fd = conn->fd;
 			fds[idx].events = POLLIN;
+			conn_table[idx] = conn;
 			idx++;
 		}
 
@@ -263,6 +401,7 @@ int ustcomm_recv_message(struct ustcomm_server *server, char **msg, struct ustco
 				return -1;
 			}
 
+			ustcomm_init_connection(newconn);
 			newconn->fd = newfd;
 
 			list_add(&newconn->list, &server->connections);
@@ -270,8 +409,11 @@ int ustcomm_recv_message(struct ustcomm_server *server, char **msg, struct ustco
 
 		for(idx=1; idx<n_fds; idx++) {
 			if(fds[idx].revents) {
-				retval = recv_message_fd(fds[idx].fd, msg, src);
-				if(**msg == 0) {
+				retval = recv_message_conn(conn_table[idx], msg);
+				if(src)
+					src->fd = fds[idx].fd;
+
+				if(retval == 0) {
 					/* connection finished */
 					close(fds[idx].fd);
 
@@ -393,29 +535,22 @@ int ustcomm_send_request(struct ustcomm_connection *conn, const char *req, char
 {
 	int result;
 
-	result = send(conn->fd, req, strlen(req), MSG_NOSIGNAL);
-	if(result == -1) {
-		if(errno != EPIPE)
-			PERROR("send");
-		return -1;
-	}
+	/* Send including the final \0 */
+	result = send_message_fd(conn->fd, req);
+	if(result != 1)
+		return result;
 
 	if(!reply)
 		return 1;
 
-	*reply = (char *) malloc(MSG_MAX+1);
-	result = recv(conn->fd, *reply, MSG_MAX, 0);
+	result = recv_message_conn(conn, reply);
 	if(result == -1) {
-		if(errno != ECONNRESET)
-			PERROR("recv");
 		return -1;
 	}
 	else if(result == 0) {
 		return 0;
 	}
 	
-	(*reply)[result] = '\0';
-
 	return 1;
 }
 
@@ -425,6 +560,8 @@ int ustcomm_connect_path(const char *path, struct ustcomm_connection *conn, pid_
 	int result;
 	struct sockaddr_un addr;
 
+	ustcomm_init_connection(conn);
+
 	result = fd = socket(PF_UNIX, SOCK_STREAM, 0);
 	if(result == -1) {
 		PERROR("socket");
@@ -449,7 +586,7 @@ int ustcomm_connect_path(const char *path, struct ustcomm_connection *conn, pid_
 
 	result = connect(fd, (struct sockaddr *)&addr, sizeof(addr));
 	if(result == -1) {
-		PERROR("connect");
+		PERROR("connect (path=%s)", path);
 		return -1;
 	}
 
@@ -492,17 +629,11 @@ static int ensure_dir_exists(const char *dir)
 	}
 	else if(result == -1) {
 		/* ENOENT */
-		char buf[200];
 		int result;
 
-		result = snprintf(buf, sizeof(buf), "mkdir -p \"%s\"", dir);
-		if(result >= sizeof(buf)) {
-			ERR("snprintf buffer overflow");
-			return -1;
-		}
-		result = system(buf);
+		result = mkdir_p(dir, 0777);
 		if(result != 0) {
-			ERR("executing command %s", buf);
+			ERR("executing in recursive creation of directory %s", dir);
 			return -1;
 		}
 	}
@@ -547,6 +678,16 @@ free_name:
 	return -1;
 }
 
+void ustcomm_free_app(struct ustcomm_app *app)
+{
+	int result;
+	result = close(app->server.listen_fd);
+	if(result == -1) {
+		PERROR("close");
+		return;
+	}
+}
+
 /* Used by the daemon to initialize its server so applications
  * can connect to it.
  */