stream-fd: Merge stream-fd-windows and stream-fd-unix.

There was not much difference between the two files after moving all of the Windows socket HANDLE polling functionality to poll-loop.c. So merge them together. Signed-off-by: Gurucharan Shetty <gshetty@nicira.com> Acked-by: Ben Pfaff <blp@nicira.com>
openvswitch · Oct 20, 2014 · c48f691 · c48f691
1 parent f0d2e45
commit c48f691
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 286 deletions.
diff --git a/lib/automake.mk b/lib/automake.mk
@@ -212,6 +212,7 @@ lib_libopenvswitch_la_SOURCES = \
 	lib/sset.h \
 	lib/stp.c \
 	lib/stp.h \
+	lib/stream-fd.c \
 	lib/stream-fd.h \
 	lib/stream-provider.h \
 	lib/stream-ssl.h \
@@ -265,16 +266,14 @@ lib_libopenvswitch_la_SOURCES += \
 	lib/getrusage-windows.c \
 	lib/latch-windows.c \
 	lib/route-table-stub.c \
-	lib/strsep.c \
-	lib/stream-fd-windows.c
+	lib/strsep.c
 else
 lib_libopenvswitch_la_SOURCES += \
 	lib/daemon-unix.c \
 	lib/latch-unix.c \
 	lib/signals.c \
 	lib/signals.h \
 	lib/socket-util-unix.c \
-	lib/stream-fd-unix.c \
 	lib/stream-unix.c
 endif
 

diff --git a/lib/stream-fd-windows.c b/lib/stream-fd-windows.c
diff --git a/lib/stream-fd-unix.c → lib/stream-fd.c b/lib/stream-fd-unix.c → lib/stream-fd.c
@@ -77,7 +77,7 @@ static void
 fd_close(struct stream *stream)
 {
     struct stream_fd *s = stream_fd_cast(stream);
-    close(s->fd);
+    closesocket(s->fd);
     free(s);
 }
 
@@ -93,21 +93,45 @@ fd_recv(struct stream *stream, void *buffer, size_t n)
 {
     struct stream_fd *s = stream_fd_cast(stream);
     ssize_t retval;
-
-    retval = read(s->fd, buffer, n);
-    return retval >= 0 ? retval : -errno;
+    int error;
+
+    retval = recv(s->fd, buffer, n, 0);
+    if (retval < 0) {
+        error = sock_errno();
+#ifdef _WIN32
+        if (error == WSAEWOULDBLOCK) {
+           error = EAGAIN;
+        }
+#endif
+        if (error != EAGAIN) {
+            VLOG_DBG_RL(&rl, "recv: %s", sock_strerror(error));
+        }
+        return -error;
+    }
+    return retval;
 }
 
 static ssize_t
 fd_send(struct stream *stream, const void *buffer, size_t n)
 {
     struct stream_fd *s = stream_fd_cast(stream);
     ssize_t retval;
-
-    retval = write(s->fd, buffer, n);
-    return (retval > 0 ? retval
-            : retval == 0 ? -EAGAIN
-            : -errno);
+    int error;
+
+    retval = send(s->fd, buffer, n, 0);
+    if (retval < 0) {
+        error = sock_errno();
+#ifdef _WIN32
+        if (error == WSAEWOULDBLOCK) {
+           error = EAGAIN;
+        }
+#endif
+        if (error != EAGAIN) {
+            VLOG_DBG_RL(&rl, "recv: %s", sock_strerror(error));
+        }
+        return -error;
+    }
+    return (retval > 0 ? retval : -EAGAIN);
 }
 
 static void
@@ -198,7 +222,7 @@ static void
 pfd_close(struct pstream *pstream)
 {
     struct fd_pstream *ps = fd_pstream_cast(pstream);
-    close(ps->fd);
+    closesocket(ps->fd);
     maybe_unlink_and_free(ps->unlink_path);
     free(ps);
 }
@@ -214,16 +238,21 @@ pfd_accept(struct pstream *pstream, struct stream **new_streamp)
 
     new_fd = accept(ps->fd, (struct sockaddr *) &ss, &ss_len);
     if (new_fd < 0) {
-        retval = errno;
+        retval = sock_errno();
+#ifdef _WIN32
+        if (retval == WSAEWOULDBLOCK) {
+            retval = EAGAIN;
+        }
+#endif
         if (retval != EAGAIN) {
-            VLOG_DBG_RL(&rl, "accept: %s", ovs_strerror(retval));
+            VLOG_DBG_RL(&rl, "accept: %s", sock_strerror(retval));
         }
         return retval;
     }
 
     retval = set_nonblocking(new_fd);
     if (retval) {
-        close(new_fd);
+        closesocket(new_fd);
         return retval;
     }