X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=libustcomm%2Fustcomm.c;h=d537eebf8a7164b0acf02c415889e6fb632e62fb;hb=93e5ce29599beb7b32858b3074b8433dfffdab34;hp=8324f21decad53d79a8659657bb2d000e90c914b;hpb=ce2ccc12dddef07259e349d0b10504585ce6ee20;p=ust.git

diff --git a/libustcomm/ustcomm.c b/libustcomm/ustcomm.c
index 8324f21..d537eeb 100644
--- a/libustcomm/ustcomm.c
+++ b/libustcomm/ustcomm.c
@@ -15,6 +15,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+/* API used by UST components to communicate with each other via sockets. */
+
 #define _GNU_SOURCE
 #include <sys/types.h>
 #include <signal.h>
@@ -247,9 +249,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;
@@ -348,15 +354,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;
 		}
@@ -927,7 +936,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;