X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=libustcomm%2Fustcomm.c;h=155dfd0087c53aaba52fa866f87f9eca7a1c457d;hb=43550d379ea53556183002632da0d23c0c417d03;hp=c76413861cb418cf142c75b14192d85e1216b5a5;hpb=0e4b45ace8b034dc4352a30d89b74f5e59e2e27d;p=ust.git

diff --git a/libustcomm/ustcomm.c b/libustcomm/ustcomm.c
index c764138..155dfd0 100644
--- a/libustcomm/ustcomm.c
+++ b/libustcomm/ustcomm.c
@@ -37,22 +37,6 @@
 
 #define UNIX_PATH_MAX 108
 
-#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
- * block.
- */
-
-//static void bt(void)
-//{
-//	void *buffer[100];
-//	int result;
-//
-//	result = backtrace(&buffer, 100);
-//	backtrace_symbols_fd(buffer, result, STDERR_FILENO);
-//}
-
 static int mkdir_p(const char *path, mode_t mode)
 {
 	const char *path_p;
@@ -102,20 +86,6 @@ static int mkdir_p(const char *path, mode_t mode)
 	return retval;
 }
 
-char *strdup_malloc(const char *s)
-{
-	char *retval;
-
-	if(s == NULL)
-		return NULL;
-
-	retval = (char *) malloc(strlen(s)+1);
-
-	strcpy(retval, s);
-
-	return retval;
-}
-
 static int signal_process(pid_t pid)
 {
 	return 0;
@@ -277,9 +247,13 @@ static int recv_message_fd(int fd, char **recv_buf, int *recv_buf_size, int *rec
 				*recv_buf_size = 0;
 				return 0;
 			}
-			/* real error */
-			PERROR("recv");
-			return -1;
+			else if(errno == EINTR) {
+				return -1;
+			}
+			else {
+				PERROR("recv");
+				return -1;
+			}
 		}
 		if(result == 0) {
 			return 0;
@@ -378,15 +352,18 @@ int ustcomm_recv_message(struct ustcomm_server *server, char **msg, struct ustco
 			idx++;
 		}
 
-		while((result = poll(fds, n_fds, timeout)) == -1 && errno == EINTR)
-			/* nothing */;
-		if(result == -1) {
+		result = poll(fds, n_fds, timeout);
+		if(result == -1 && errno == EINTR) {
+			/* That's ok. ustd receives signals to notify it must shutdown. */
+			retval = -1;
+			goto free_conn_table_return;
+		}
+		else if(result == -1) {
 			PERROR("poll");
 			retval = -1;
 			goto free_conn_table_return;
 		}
-
-		if(result == 0) {
+		else if(result == 0) {
 			retval = 0;
 			goto free_conn_table_return;
 		}
@@ -957,7 +934,7 @@ int free_ustcomm_client_poll(void *data)
 	return 0;
 }
 
-void ustcomm_mp_add_app_clients(struct mpentries *ent, struct ustcomm_app *app, int (*cb)(struct ustcomm_connection *conn, char *msg))
+void ustcomm_mp_add_app_clients(struct mpentries *ent, struct ustcomm_app *app, int (*cb)(char *recvbuf, struct ustcomm_source *src))
 {
 	struct ustcomm_connection *conn;