X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=libustcomm%2Fustcomm.c;h=0d2ab339485cb666ba033b24d9896840a7d1c311;hb=da000ba4a6841b1bd55344c75c595aabdd830cd7;hp=4d6a6509dba71ac4a1333034de403930437f25b6;hpb=058a68cbea07bb2b276c12212ea6129f166b2893;p=ust.git

diff --git a/libustcomm/ustcomm.c b/libustcomm/ustcomm.c
index 4d6a650..0d2ab33 100644
--- a/libustcomm/ustcomm.c
+++ b/libustcomm/ustcomm.c
@@ -32,6 +32,7 @@
 
 #include "ustcomm.h"
 #include "usterr.h"
+#include "share.h"
 
 #define UNIX_PATH_MAX 108
 
@@ -74,19 +75,33 @@ 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 +157,67 @@ 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 1
+#define RECV_INITIAL_BUF_SIZE 10
+
+static int recv_message_fd(int fd, char **msg)
 {
 	int result;
+	int buf_alloc_size = 0;
+	char *buf = NULL;
+	int buf_used_size = 0;
 
-	*msg = (char *) malloc(MSG_MAX+1);
+	buf = malloc(RECV_INITIAL_BUF_SIZE);
+	buf_alloc_size = RECV_INITIAL_BUF_SIZE;
 
-	result = recv(fd, *msg, MSG_MAX, 0);
-	if(result == -1) {
-		PERROR("recv");
-		return -1;
-	}
+	for(;;) {
+		if(buf_used_size + RECV_INCREMENT > buf_alloc_size) {
+			char *new_buf;
+			buf_alloc_size *= 2;
+			new_buf = (char *) realloc(buf, buf_alloc_size);
+			if(new_buf == NULL) {
+				ERR("realloc returned NULL");
+				free(buf);
+				return -1;
+			}
+			buf = new_buf;
+		}
 
-	(*msg)[result] = '\0';
-	
-	DBG("ustcomm_app_recv_message: result is %d, message is %s", result, (*msg));
+		/* FIXME: this is really inefficient; but with count>1 we would
+		 * need a buffering mechanism */
+		result = recv(fd, buf+buf_used_size, RECV_INCREMENT, 0);
+		if(result == -1) {
+			free(buf);
+			if(errno != ECONNRESET)
+				PERROR("recv");
+			return -1;
+		}
+		if(result == 0) {
+			if(buf_used_size)
+				goto ret;
+			else {
+				free(buf);
+				return 0;
+			}
+		}
+
+		buf_used_size += result;
+
+		if(buf[buf_used_size-1] == 0) {
+			goto ret;
+		}
+	}
 
-	if(src)
-		src->fd = fd;
+ret:
+	*msg = buf;
+	DBG("received message \"%s\"", buf);
 
 	return 1;
+
 }
 
 int ustcomm_send_reply(struct ustcomm_server *server, char *msg, struct ustcomm_source *src)
@@ -270,7 +322,10 @@ 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);
+				retval = recv_message_fd(fds[idx].fd, msg);
+				if(src)
+					src->fd = fds[idx].fd;
+
 				if(**msg == 0) {
 					/* connection finished */
 					close(fds[idx].fd);
@@ -393,29 +448,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_fd(conn->fd, reply);
 	if(result == -1) {
-		if(errno != ECONNRESET)
-			PERROR("recv");
 		return -1;
 	}
 	else if(result == 0) {
 		return 0;
 	}
 	
-	(*reply)[result] = '\0';
-
 	return 1;
 }
 
@@ -449,7 +497,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;
 	}