X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=fd.c;h=dd07466cef2623e5aaa053178d7eda9e992e3dcd;hp=4928850e38d7d01688702d8acb8e898da53e284d;hb=b3fd38bd1965ca8fec37cdd94552dc0f62f41372;hpb=c430e588047c5db3eb0d043c4dd1378680ec2bcf

diff --git a/fd.c b/fd.c
index 4928850e..dd07466c 100644
--- a/fd.c
+++ b/fd.c
@@ -20,6 +20,7 @@
 
 #include "para.h"
 
+#include <fcntl.h>
 #include <sys/select.h>
 
 #include "error.h"
@@ -46,8 +47,8 @@ int file_exists(const char *fn)
  * \param n the highest-numbered descriptor in any of the two sets, plus 1
  * \param readfds fds that should be checked for readability
  * \param writefds fds that should be checked for writablility
- * \param timeout upper bound on the amount of time elapsed before select()
- *  returns
+ * \param timeout_tv upper bound on the amount of time elapsed before select()
+ * returns
  *
  * \return The return value of the underlying select() call.
  *
@@ -55,15 +56,16 @@ int file_exists(const char *fn)
  * \sa select(2) select_tut(2)
  */
 int para_select(int n, fd_set *readfds, fd_set *writefds,
-		struct timeval *timeout)
+		struct timeval *timeout_tv)
 {
 	int ret, err;
 	do {
-		ret = select(n, readfds, writefds, NULL, timeout);
+		ret = select(n, readfds, writefds, NULL, timeout_tv);
 		err = errno;
 	} while (ret < 0 && err == EINTR);
 	if (ret < 0)
-		PARA_CRIT_LOG("select error (%s)\n", strerror(err));
+		PARA_CRIT_LOG("select error: %s, max_fileno: %d\n",
+			strerror(err), n);
 	return ret;
 }
 
@@ -93,9 +95,48 @@ int mark_fd_nonblock(int fd)
  *
  * This wrapper for FD_SET() passes its first two arguments to \p FD_SET. Upon
  * return, \a max_fileno contains the maximum of the old_value and \a fd.
+ *
+ * \sa para_select
 */
 void para_fd_set(int fd, fd_set *fds, int *max_fileno)
 {
+
+	if (fd < 0 || fd >= FD_SETSIZE) {
+		PARA_EMERG_LOG("fatal: tried to add invalid fd %d\n", fd);
+		exit(EXIT_FAILURE);
+	}
+#if 0
+	{
+		int flags = fcntl(fd, F_GETFL);
+		if (!(flags & O_NONBLOCK)) {
+			PARA_EMERG_LOG("fd %d is a blocking file descriptor\n", fd);
+			exit(EXIT_FAILURE);
+		}
+	}
+#endif
 	FD_SET(fd, fds);
-	*max_fileno = MAX(*max_fileno, fd);
+	*max_fileno = PARA_MAX(*max_fileno, fd);
+}
+
+/**
+ * paraslash's wrapper for fread(3)
+ *
+ * \param dest destination pointer
+ * \param nbytes size of one element
+ * \param nmemb number of elements to write
+ * \param stream the input stream
+ *
+ * \return negative on errors, zero on end of file, and the number of bytes
+ * (not elements) read on success.
+ *
+ * \sa fread(3)
+ */
+__must_check int para_fread(void *dest, size_t nbytes, size_t nmemb, FILE *stream)
+{
+	size_t res = fread(dest, nbytes, nmemb, stream);
+	if (res == nmemb)
+		return nbytes * nmemb;
+	if (feof(stream))
+		return 0;
+	return -E_FREAD;
 }