projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
netdev: Abstract "features" interface away from OpenFlow 1.0.
[openvswitch]
/
lib
/
stream-fd.c
diff --git
a/lib/stream-fd.c
b/lib/stream-fd.c
index cc897b3d9f56186e31da32212eac3c85a9aa8fdd..7bf5ebd4dc5f903001115218160b17acee0827aa 100644
(file)
--- a/
lib/stream-fd.c
+++ b/
lib/stream-fd.c
@@
-28,12
+28,13
@@
#include "leak-checker.h"
#include "poll-loop.h"
#include "socket-util.h"
#include "leak-checker.h"
#include "poll-loop.h"
#include "socket-util.h"
+#include "stress.h"
#include "util.h"
#include "stream-provider.h"
#include "stream.h"
#include "util.h"
#include "stream-provider.h"
#include "stream.h"
-
#include "vlog.h"
#include "vlog.h"
-#define THIS_MODULE VLM_stream_fd
+
+VLOG_DEFINE_THIS_MODULE(stream_fd);
/* Active file descriptor stream. */
/* Active file descriptor stream. */
@@
-44,7
+45,7
@@
struct stream_fd
char *unlink_path;
};
char *unlink_path;
};
-static struct stream_class stream_fd_class;
+static
const
struct stream_class stream_fd_class;
static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(10, 25);
static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(10, 25);
@@
-96,19
+97,39
@@
fd_connect(struct stream *stream)
return check_connection_completion(s->fd);
}
return check_connection_completion(s->fd);
}
+STRESS_OPTION(
+ stream_flaky_recv, "simulate failure of fd stream recvs",
+ 100, 0, -1, 0);
+
static ssize_t
fd_recv(struct stream *stream, void *buffer, size_t n)
{
struct stream_fd *s = stream_fd_cast(stream);
static ssize_t
fd_recv(struct stream *stream, void *buffer, size_t n)
{
struct stream_fd *s = stream_fd_cast(stream);
- ssize_t retval = read(s->fd, buffer, n);
+ ssize_t retval;
+
+ if (STRESS(stream_flaky_recv)) {
+ return -EIO;
+ }
+
+ retval = read(s->fd, buffer, n);
return retval >= 0 ? retval : -errno;
}
return retval >= 0 ? retval : -errno;
}
+STRESS_OPTION(
+ stream_flaky_send, "simulate failure of fd stream sends",
+ 100, 0, -1, 0);
+
static ssize_t
fd_send(struct stream *stream, const void *buffer, size_t n)
{
struct stream_fd *s = stream_fd_cast(stream);
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 = write(s->fd, buffer, n);
+ ssize_t retval;
+
+ if (STRESS(stream_flaky_send)) {
+ return -EIO;
+ }
+
+ retval = write(s->fd, buffer, n);
return (retval > 0 ? retval
: retval == 0 ? -EAGAIN
: -errno);
return (retval > 0 ? retval
: retval == 0 ? -EAGAIN
: -errno);
@@
-133,7
+154,7
@@
fd_wait(struct stream *stream, enum stream_wait_type wait)
}
}
}
}
-static struct stream_class stream_fd_class = {
+static
const
struct stream_class stream_fd_class = {
"fd", /* name */
NULL, /* open */
fd_close, /* close */
"fd", /* name */
NULL, /* open */
fd_close, /* close */
@@
-214,7
+235,7
@@
pfd_accept(struct pstream *pstream, struct stream **new_streamp)
new_fd = accept(ps->fd, (struct sockaddr *) &ss, &ss_len);
if (new_fd < 0) {
new_fd = accept(ps->fd, (struct sockaddr *) &ss, &ss_len);
if (new_fd < 0) {
-
int
retval = errno;
+ retval = errno;
if (retval != EAGAIN) {
VLOG_DBG_RL(&rl, "accept: %s", strerror(retval));
}
if (retval != EAGAIN) {
VLOG_DBG_RL(&rl, "accept: %s", strerror(retval));
}