Provide helpers for waiting on and reading a certain amount on a socket

src/libckpool.c

@@ -662,27 +662,59 @@ out:
 	return sockd;
 }
 
+int wait_read_select(int sockd, int timeout)
+{
+	tv_t tv_timeout;
+	fd_set readfs;
+	int ret;
+
+	tv_timeout.tv_sec = timeout;
+	tv_timeout.tv_usec = 0;
+
+retry:
+	FD_ZERO(&readfs);
+	FD_SET(sockd, &readfs);
+	ret = select(sockd + 1, &readfs, NULL, NULL, &tv_timeout);
+	if (unlikely(ret < 1 &&interrupted()))
+		goto retry;
+	return ret;
+}
+
+int read_length(int sockd, void *buf, int len)
+{
+	int ret, ofs = 0;
+
+	if (unlikely(len < 1)) {
+		LOGWARNING("Invalid read length of %d requested in read_length", len);
+		return -1;
+	}
+	while (len) {
+		ret = read(sockd, buf + ofs, len);
+		if (unlikely(ret < 0))
+			return -1;
+		ofs += ret;
+		len -= ret;
+	}
+	return ofs;
+}
+
 /* Use a standard message across the unix sockets:
  * 4 byte length of message as little endian encoded uint32_t followed by the
  * string. Return NULL in case of failure. */
 char *recv_unix_msg(int sockd)
 {
-	tv_t tv_timeout = {60, 0};
 	char *buf = NULL;
 	uint32_t msglen;
-	fd_set readfs;
+	int ret;
-	int ret, ofs;
 
-	FD_ZERO(&readfs);
+	ret = wait_read_select(sockd, 60);
-	FD_SET(sockd, &readfs);
+	if (unlikely(ret < 1)) {
-	ret = select(sockd + 1, &readfs, NULL, NULL, &tv_timeout);
-	if (ret < 1) {
 		LOGERR("Select1 failed in recv_unix_msg");
 		goto out;
 	}
 	/* Get message length */
-	ret = read(sockd, &msglen, 4);
+	ret = read_length(sockd, &msglen, 4);
-	if (ret < 4) {
+	if (unlikely(ret < 4)) {
 		LOGERR("Failed to read 4 byte length in recv_unix_msg");
 		goto out;
 	}
@@ -693,27 +725,15 @@ char *recv_unix_msg(int sockd)
 	}
 	buf = ckalloc(msglen + 1);
 	buf[msglen] = 0;
-	ofs = 0;
+	ret = wait_read_select(sockd, 60);
-	while (msglen) {
+	if (unlikely(ret < 1)) {
-		tv_timeout.tv_sec = 60;
+		LOGERR("Select2 failed in recv_unix_msg");
-		tv_timeout.tv_usec = 0;
+		goto out;
-
+	}
-		FD_ZERO(&readfs);
+	ret = read_length(sockd, buf, msglen);
-		FD_SET(sockd, &readfs);
+	if (unlikely(ret < 0)) {
-		ret = select(sockd + 1, &readfs, NULL, NULL, &tv_timeout);
+		LOGERR("Failed to read %d bytes in recv_unix_msg", msglen);
-		if (ret < 1) {
+		dealloc(buf);
-			LOGERR("Select2 failed in recv_unix_msg");
-			dealloc(buf);
-			goto out;
-		}
-		ret = read(sockd, buf + ofs, msglen);
-		if (unlikely(ret < 0)) {
-			LOGERR("Failed to read %d bytes in recv_unix_msg", msglen);
-			dealloc(buf);
-			goto out;
-		}
-		ofs += ret;
-		msglen -= ret;
 	}
 out:
 	return buf;

src/libckpool.h

@@ -267,6 +267,8 @@ void empty_socket(int fd);
 void close_unix_socket(const int sockd, const char *server_path);
 int open_unix_server(const char *server_path);
 int open_unix_client(const char *server_path);
+int wait_read_select(int sockd, int timeout);
+int read_length(int sockd, void *buf, int len);
 char *recv_unix_msg(int sockd);
 bool send_unix_msg(int sockd, const char *buf);
 bool send_proc(proc_instance_t *pi, const char *msg);