X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=libustcomm%2Fustcomm.c;h=e8558255e573f8f3cdf26d92ae3178bfc87026cc;hb=d6d27063c1bef41888d6310d992106c205859353;hp=630f90609cb403ec136f8120edb8b85c171f99ee;hpb=08230db7e2e536bddf0015fa663b6d10abea30f1;p=ust.git

diff --git a/libustcomm/ustcomm.c b/libustcomm/ustcomm.c
index 630f906..e855825 100644
--- a/libustcomm/ustcomm.c
+++ b/libustcomm/ustcomm.c
@@ -23,6 +23,7 @@
 #include <sys/un.h>
 #include <unistd.h>
 #include <poll.h>
+#include <sys/stat.h>
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -30,11 +31,12 @@
 #include <execinfo.h>
 
 #include "ustcomm.h"
-#include "localerr.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
@@ -50,6 +52,55 @@
 //	backtrace_symbols_fd(buffer, result, STDERR_FILENO);
 //}
 
+static int mkdir_p(const char *path, mode_t mode)
+{
+	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;
@@ -66,37 +117,40 @@ char *strdup_malloc(const char *s)
 
 static int signal_process(pid_t pid)
 {
-	int result;
-
-	result = kill(pid, UST_SIGNAL);
-	if(result == -1) {
-		PERROR("kill");
-		return -1;
-	}
-
-	/* FIXME: should wait in a better way */
-	//sleep(1);
-
 	return 0;
 }
 
 int pid_is_online(pid_t pid) {
-	return kill(pid, UST_SIGNAL) != -1;
+	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), 0);
+	/* 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;
 }
 
@@ -109,8 +163,18 @@ int ustcomm_request_consumer(pid_t pid, const char *channel)
 	char *msg=NULL;
 	int retval = 0;
 	struct ustcomm_connection conn;
+	char *explicit_daemon_socket_path;
+
+	explicit_daemon_socket_path = getenv("UST_DAEMON_SOCKET");
+	if(explicit_daemon_socket_path) {
+		/* user specified explicitly a socket path */
+		result = snprintf(path, UNIX_PATH_MAX, "%s", explicit_daemon_socket_path);
+	}
+	else {
+		/* just use the default path */
+		result = snprintf(path, UNIX_PATH_MAX, "%s/ustd", SOCK_DIR);
+	}
 
-	result = snprintf(path, UNIX_PATH_MAX, "%s/ustd", SOCK_DIR);
 	if(result >= UNIX_PATH_MAX) {
 		ERR("string overflow allocating socket name");
 		return -1;
@@ -142,30 +206,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(src)
-		src->fd = fd;
+		if(buf[buf_used_size-1] == 0) {
+			goto ret;
+		}
+	}
+
+ret:
+	*msg = buf;
+	DBG("received message \"%s\"", buf);
 
 	return 1;
+
 }
 
 int ustcomm_send_reply(struct ustcomm_server *server, char *msg, struct ustcomm_source *src)
@@ -181,6 +282,23 @@ int ustcomm_send_reply(struct ustcomm_server *server, char *msg, struct ustcomm_
 	return 0;
 } 
 
+/* Called after a fork. */
+
+int ustcomm_close_all_connections(struct ustcomm_server *server)
+{
+	struct ustcomm_connection *conn;
+	struct ustcomm_connection *deletable_conn = NULL;
+
+	list_for_each_entry(conn, &server->connections, list) {
+		free(deletable_conn);
+		deletable_conn = conn;
+		close(conn->fd);
+		list_del(&conn->list);
+	}
+
+	return 0;
+}
+
 /* @timeout: max blocking time in milliseconds, -1 means infinity
  *
  * returns 1 to indicate a message was received
@@ -253,8 +371,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_fd(fds[idx].fd, msg);
+				if(src)
+					src->fd = fds[idx].fd;
+
+				if(retval == 0) {
 					/* connection finished */
 					close(fds[idx].fd);
 
@@ -351,8 +472,7 @@ static int init_named_socket(const char *name, char **path_out)
 	}
 
 	if(path_out) {
-		*path_out = "";
-		*path_out = strdupa(addr.sun_path);
+		*path_out = strdup(addr.sun_path);
 	}
 
 	return fd;
@@ -363,31 +483,36 @@ static int init_named_socket(const char *name, char **path_out)
 	return -1;
 }
 
+/*
+ * Return value:
+ *   0: Success, but no reply because recv() returned 0
+ *   1: Success
+ *   -1: Error
+ *
+ * On error, the error message is printed, except on
+ * ECONNRESET, which is normal when the application dies.
+ */
+
 int ustcomm_send_request(struct ustcomm_connection *conn, const char *req, char **reply)
 {
 	int result;
 
-	result = send(conn->fd, req, strlen(req), 0);
-	if(result == -1) {
-		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) {
-		PERROR("recv");
 		return -1;
 	}
 	else if(result == 0) {
 		return 0;
 	}
 	
-	(*reply)[result] = '\0';
-
 	return 1;
 }
 
@@ -421,7 +546,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;
 	}
 
@@ -450,6 +575,32 @@ int ustcomm_connect_app(pid_t pid, struct ustcomm_connection *conn)
 	return ustcomm_connect_path(path, conn, pid);
 }
 
+static int ensure_dir_exists(const char *dir)
+{
+	struct stat st;
+	int result;
+
+	if(!strcmp(dir, ""))
+		return -1;
+
+	result = stat(dir, &st);
+	if(result == -1 && errno != ENOENT) {
+		return -1;
+	}
+	else if(result == -1) {
+		/* ENOENT */
+		int result;
+
+		result = mkdir_p(dir, 0777);
+		if(result != 0) {
+			ERR("executing in recursive creation of directory %s", dir);
+			return -1;
+		}
+	}
+
+	return 0;
+}
+
 /* Called by an application to initialize its server so daemons can
  * connect to it.
  */
@@ -465,9 +616,15 @@ int ustcomm_init_app(pid_t pid, struct ustcomm_app *handle)
 		return -1;
 	}
 
+	result = ensure_dir_exists(SOCK_DIR);
+	if(result == -1) {
+		ERR("Unable to create socket directory %s", SOCK_DIR);
+		return -1;
+	}
+
 	handle->server.listen_fd = init_named_socket(name, &(handle->server.socketpath));
 	if(handle->server.listen_fd < 0) {
-		ERR("error initializing named socket");
+		ERR("Error initializing named socket (%s). Check that directory exists and that it is writable.", name);
 		goto free_name;
 	}
 	free(name);
@@ -485,34 +642,68 @@ free_name:
  * can connect to it.
  */
 
-int ustcomm_init_ustd(struct ustcomm_ustd *handle)
+int ustcomm_init_ustd(struct ustcomm_ustd *handle, const char *sock_path)
 {
-	int result;
 	char *name;
+	int retval = 0;
 
-	result = asprintf(&name, "%s/%s", SOCK_DIR, "ustd");
-	if(result >= UNIX_PATH_MAX) {
-		ERR("string overflow allocating socket name");
-		return -1;
+	if(sock_path) {
+		asprintf(&name, "%s", sock_path);
+	}
+	else {
+		int result;
+
+		/* Only check if socket dir exists if we are using the default directory */
+		result = ensure_dir_exists(SOCK_DIR);
+		if(result == -1) {
+			ERR("Unable to create socket directory %s", SOCK_DIR);
+			return -1;
+		}
+
+		asprintf(&name, "%s/%s", SOCK_DIR, "ustd");
 	}
 
 	handle->server.listen_fd = init_named_socket(name, &handle->server.socketpath);
 	if(handle->server.listen_fd < 0) {
 		ERR("error initializing named socket at %s", name);
+		retval = -1;
 		goto free_name;
 	}
-	free(name);
 
 	INIT_LIST_HEAD(&handle->server.connections);
 
-	return 0;
-
 free_name:
 	free(name);
-	return -1;
+
+	return retval;
+}
+
+void ustcomm_fini_app(struct ustcomm_app *handle)
+{
+	int result;
+	struct stat st;
+
+	/* Destroy socket */
+	result = stat(handle->server.socketpath, &st);
+	if(result == -1) {
+		PERROR("stat (%s)", handle->server.socketpath);
+		return;
+	}
+
+	/* Paranoid check before deleting. */
+	result = S_ISSOCK(st.st_mode);
+	if(!result) {
+		ERR("The socket we are about to delete is not a socket.");
+		return;
+	}
+
+	result = unlink(handle->server.socketpath);
+	if(result == -1) {
+		PERROR("unlink");
+	}
 }
 
-static char *find_tok(char *str)
+static const char *find_tok(const char *str)
 {
 	while(*str == ' ') {
 		str++;
@@ -524,7 +715,7 @@ static char *find_tok(char *str)
 	return str;
 }
 
-static char *find_sep(char *str)
+static const char *find_sep(const char *str)
 {
 	while(*str != ' ') {
 		str++;
@@ -536,11 +727,11 @@ static char *find_sep(char *str)
 	return str;
 }
 
-int nth_token_is(char *str, char *token, int tok_no)
+int nth_token_is(const char *str, const char *token, int tok_no)
 {
 	int i;
-	char *start;
-	char *end;
+	const char *start;
+	const char *end;
 
 	for(i=0; i<=tok_no; i++) {
 		str = find_tok(str);
@@ -565,12 +756,12 @@ int nth_token_is(char *str, char *token, int tok_no)
 	return 1;
 }
 
-char *nth_token(char *str, int tok_no)
+char *nth_token(const char *str, int tok_no)
 {
 	static char *retval = NULL;
 	int i;
-	char *start;
-	char *end;
+	const char *start;
+	const char *end;
 
 	for(i=0; i<=tok_no; i++) {
 		str = find_tok(str);