X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=libustcomm%2Fustcomm.c;h=6044c271fa7101d585261d44b1c24f401dfd2ef4;hb=3a54945e83cfa6d87fa2e2d849e715127d76476a;hp=3b53471ac6d69c81acd1379351d985b9b8ed177b;hpb=803a4f584bbc64ff44173ced627636f9e6db6618;p=lttng-ust.git

diff --git a/libustcomm/ustcomm.c b/libustcomm/ustcomm.c
index 3b53471a..6044c271 100644
--- a/libustcomm/ustcomm.c
+++ b/libustcomm/ustcomm.c
@@ -89,7 +89,7 @@ static int send_message_fd(int fd, const char *msg)
 {
 	int result;
 
-	result = send(fd, msg, strlen(msg), 0);
+	result = send(fd, msg, strlen(msg), MSG_NOSIGNAL);
 	if(result == -1) {
 		PERROR("send");
 		return -1;
@@ -390,13 +390,24 @@ 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);
+	result = send(conn->fd, req, strlen(req), MSG_NOSIGNAL);
 	if(result == -1) {
-		PERROR("send");
+		if(errno != EPIPE)
+			PERROR("send");
 		return -1;
 	}
 
@@ -406,7 +417,8 @@ int ustcomm_send_request(struct ustcomm_connection *conn, const char *req, char
 	*reply = (char *) malloc(MSG_MAX+1);
 	result = recv(conn->fd, *reply, MSG_MAX, 0);
 	if(result == -1) {
-		PERROR("recv");
+		if(errno != ECONNRESET)
+			PERROR("recv");
 		return -1;
 	}
 	else if(result == 0) {
@@ -494,7 +506,7 @@ int ustcomm_init_app(pid_t pid, struct ustcomm_app *handle)
 
 	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);
@@ -545,7 +557,6 @@ void ustcomm_fini_app(struct ustcomm_app *handle)
 	struct stat st;
 
 	/* Destroy socket */
-	ERR("socket path is: %s", handle->server.socketpath);
 	result = stat(handle->server.socketpath, &st);
 	if(result == -1) {
 		PERROR("stat (%s)", handle->server.socketpath);