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 <gshe...@nicira.com>
---
lib/automake.mk | 5 +-
lib/stream-fd-windows.c | 270 ---------------------------------
lib/{stream-fd-unix.c => stream-fd.c} | 55 +++++--
3 files changed, 44 insertions(+), 286 deletions(-)
delete mode 100644 lib/stream-fd-windows.c
rename lib/{stream-fd-unix.c => stream-fd.c} (86%)
diff --git a/lib/automake.mk b/lib/automake.mk
index ec4ad8e..b618f8f 100644
--- 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,8 +266,7 @@ 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 \
@@ -274,7 +274,6 @@ lib_libopenvswitch_la_SOURCES += \
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
deleted file mode 100644
index e366c71..0000000
--- a/lib/stream-fd-windows.c
+++ /dev/null
@@ -1,270 +0,0 @@
-/*
- * Copyright (c) 2014 Nicira, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <config.h>
-#include "stream-fd.h"
-#include <errno.h>
-#include <poll.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <winsock2.h>
-#include "fatal-signal.h"
-#include "poll-loop.h"
-#include "socket-util.h"
-#include "stream.h"
-#include "stream-provider.h"
-#include "util.h"
-#include "vlog.h"
-
-VLOG_DEFINE_THIS_MODULE(stream_fd_windows);
-
-/* Active file descriptor stream. */
-
-struct stream_fd
-{
- struct stream stream;
- int fd;
-};
-
-static const struct stream_class stream_fd_class;
-
-static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(10, 25);
-
-/* Creates a new stream named 'name' that will send and receive data on 'fd'
- * and stores a pointer to the stream in '*streamp'. Initial connection status
- * 'connect_status' is interpreted as described for stream_init().
- *
- * Returns 0 if successful, otherwise a positive errno value. (The current
- * implementation never fails.) */
-int
-new_fd_stream(const char *name, int fd, int connect_status,
- struct stream **streamp)
-{
- struct stream_fd *s;
-
- s = xmalloc(sizeof *s);
- stream_init(&s->stream, &stream_fd_class, connect_status, name);
- s->fd = fd;
- *streamp = &s->stream;
- return 0;
-}
-
-static struct stream_fd *
-stream_fd_cast(struct stream *stream)
-{
- stream_assert_class(stream, &stream_fd_class);
- return CONTAINER_OF(stream, struct stream_fd, stream);
-}
-
-static void
-fd_close(struct stream *stream)
-{
- struct stream_fd *s = stream_fd_cast(stream);
- closesocket(s->fd);
- free(s);
-}
-
-static int
-fd_connect(struct stream *stream)
-{
- struct stream_fd *s = stream_fd_cast(stream);
- return check_connection_completion(s->fd);
-}
-
-static ssize_t
-fd_recv(struct stream *stream, void *buffer, size_t n)
-{
- struct stream_fd *s = stream_fd_cast(stream);
- ssize_t retval;
-
- retval = recv(s->fd, buffer, n, 0);
- if (retval < 0) {
- retval = -sock_errno();
- }
- if (retval == -WSAEWOULDBLOCK) {
- return -EAGAIN;
- }
- 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 = send(s->fd, buffer, n, 0);
- if (retval < 0) {
- retval = -sock_errno();
- }
- if (retval == -WSAEWOULDBLOCK) {
- return -EAGAIN;
- }
-
- return retval;
-}
-
-static void
-fd_wait(struct stream *stream, enum stream_wait_type wait)
-{
- struct stream_fd *s = stream_fd_cast(stream);
- switch (wait) {
- case STREAM_CONNECT:
- case STREAM_SEND:
- poll_fd_wait(s->fd, POLLOUT);
- break;
-
- case STREAM_RECV:
- poll_fd_wait(s->fd, POLLIN);
- break;
-
- default:
- OVS_NOT_REACHED();
- }
-}
-
-static const struct stream_class stream_fd_class = {
- "fd", /* name */
- false, /* needs_probes */
- NULL, /* open */
- fd_close, /* close */
- fd_connect, /* connect */
- fd_recv, /* recv */
- fd_send, /* send */
- NULL, /* run */
- NULL, /* run_wait */
- fd_wait, /* wait */
-};
-
-/* Passive file descriptor stream. */
-
-struct fd_pstream
-{
- struct pstream pstream;
- int fd;
- int (*accept_cb)(int fd, const struct sockaddr_storage *, size_t ss_len,
- struct stream **);
- int (*set_dscp_cb)(int fd, uint8_t dscp);
- char *unlink_path;
-};
-
-static const struct pstream_class fd_pstream_class;
-
-static struct fd_pstream *
-fd_pstream_cast(struct pstream *pstream)
-{
- pstream_assert_class(pstream, &fd_pstream_class);
- return CONTAINER_OF(pstream, struct fd_pstream, pstream);
-}
-
-/* Creates a new pstream named 'name' that will accept new socket connections
- * on 'fd' and stores a pointer to the stream in '*pstreamp'.
- *
- * When a connection has been accepted, 'accept_cb' will be called with the new
- * socket fd 'fd' and the remote address of the connection 'sa' and 'sa_len'.
- * accept_cb must return 0 if the connection is successful, in which case it
- * must initialize '*streamp' to the new stream, or a positive errno value on
- * error. In either case accept_cb takes ownership of the 'fd' passed in.
- *
- * When '*pstreamp' is closed, then 'unlink_path' (if nonnull) will be passed
- * to fatal_signal_unlink_file_now() and freed with free().
- *
- * Returns 0 if successful, otherwise a positive errno value. (The current
- * implementation never fails.) */
-int
-new_fd_pstream(const char *name, int fd,
- int (*accept_cb)(int fd, const struct sockaddr_storage *ss,
- size_t ss_len, struct stream **streamp),
- int (*set_dscp_cb)(int fd, uint8_t dscp),
- char *unlink_path, struct pstream **pstreamp)
-{
- struct fd_pstream *ps = xmalloc(sizeof *ps);
- pstream_init(&ps->pstream, &fd_pstream_class, name);
- ps->fd = fd;
- ps->accept_cb = accept_cb;
- ps->set_dscp_cb = set_dscp_cb;
- ps->unlink_path = unlink_path;
- *pstreamp = &ps->pstream;
- return 0;
-}
-
-static void
-pfd_close(struct pstream *pstream)
-{
- struct fd_pstream *ps = fd_pstream_cast(pstream);
- closesocket(ps->fd);
- if (ps->unlink_path) {
- fatal_signal_unlink_file_now(ps->unlink_path);
- free(ps->unlink_path);
- }
- free(ps);
-}
-
-static int
-pfd_accept(struct pstream *pstream, struct stream **new_streamp)
-{
- struct fd_pstream *ps = fd_pstream_cast(pstream);
- struct sockaddr_storage ss;
- socklen_t ss_len = sizeof ss;
- int new_fd;
- int retval;
-
- new_fd = accept(ps->fd, (struct sockaddr *) &ss, &ss_len);
- if (new_fd < 0) {
- retval = sock_errno();
- if (retval == WSAEWOULDBLOCK) {
- return EAGAIN;
- }
- return retval;
- }
-
- retval = set_nonblocking(new_fd);
- if (retval) {
- closesocket(new_fd);
- return retval;
- }
-
- return ps->accept_cb(new_fd, &ss, ss_len, new_streamp);
-}
-
-static void
-pfd_wait(struct pstream *pstream)
-{
- struct fd_pstream *ps = fd_pstream_cast(pstream);
- poll_fd_wait(ps->fd, POLLIN);
-}
-
-static int
-pfd_set_dscp(struct pstream *pstream, uint8_t dscp)
-{
- struct fd_pstream *ps = fd_pstream_cast(pstream);
- if (ps->set_dscp_cb) {
- return ps->set_dscp_cb(ps->fd, dscp);
- }
- return 0;
-}
-
-static const struct pstream_class fd_pstream_class = {
- "pstream",
- false,
- NULL,
- pfd_close,
- pfd_accept,
- pfd_wait,
- pfd_set_dscp,
-};
diff --git a/lib/stream-fd-unix.c b/lib/stream-fd.c
similarity index 86%
rename from lib/stream-fd-unix.c
rename to lib/stream-fd.c
index 8062d2d..ead8c3e 100644
--- a/lib/stream-fd-unix.c
+++ b/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,9 +93,22 @@ 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
@@ -103,11 +116,22 @@ 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;
}
--
1.7.9.5
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
