git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
netdev-pltap: Make access to AF_INET socket thread-safe.
[sliver-openvswitch.git]
/
lib
/
stream-fd.c
diff --git
a/lib/stream-fd.c
b/lib/stream-fd.c
index
90d328a
..
1171f32
100644
(file)
--- a/
lib/stream-fd.c
+++ b/
lib/stream-fd.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2008, 2009, 2010, 2012 Nicira, Inc.
+ * Copyright (c) 2008, 2009, 2010, 2012
, 2013
Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-24,10
+24,8
@@
#include <sys/types.h>
#include <unistd.h>
#include "fatal-signal.h"
#include <sys/types.h>
#include <unistd.h>
#include "fatal-signal.h"
-#include "leak-checker.h"
#include "poll-loop.h"
#include "socket-util.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"
@@
-90,38
+88,22
@@
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);
ssize_t retval;
static ssize_t
fd_recv(struct stream *stream, void *buffer, size_t n)
{
struct stream_fd *s = stream_fd_cast(stream);
ssize_t retval;
- if (STRESS(stream_flaky_recv)) {
- return -EIO;
- }
-
retval = read(s->fd, buffer, n);
return retval >= 0 ? retval : -errno;
}
retval = read(s->fd, buffer, n);
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);
ssize_t 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;
- if (STRESS(stream_flaky_send)) {
- return -EIO;
- }
-
retval = write(s->fd, buffer, n);
return (retval > 0 ? retval
: retval == 0 ? -EAGAIN
retval = write(s->fd, buffer, n);
return (retval > 0 ? retval
: retval == 0 ? -EAGAIN
@@
-234,7
+216,7
@@
pfd_accept(struct pstream *pstream, struct stream **new_streamp)
if (new_fd < 0) {
retval = errno;
if (retval != EAGAIN) {
if (new_fd < 0) {
retval = errno;
if (retval != EAGAIN) {
- VLOG_DBG_RL(&rl, "accept: %s", strerror(retval));
+ VLOG_DBG_RL(&rl, "accept: %s",
ovs_
strerror(retval));
}
return retval;
}
}
return retval;
}