X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fstream-fd.c;h=7bf5ebd4dc5f903001115218160b17acee0827aa;hb=ef13dc11ad6ec612954bd5b59751cc437f504e65;hp=94c84340966e67994af4c7b831395fb870483aba;hpb=539e96f62300e4afab00e5906a28e3b89301d62e;p=openvswitch

diff --git a/lib/stream-fd.c b/lib/stream-fd.c
index 94c84340..7bf5ebd4 100644
--- a/lib/stream-fd.c
+++ b/lib/stream-fd.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009 Nicira Networks.
+ * Copyright (c) 2008, 2009, 2010 Nicira Networks.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,18 +21,20 @@
 #include <poll.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/socket.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 "stress.h"
 #include "util.h"
 #include "stream-provider.h"
 #include "stream.h"
-
 #include "vlog.h"
-#define THIS_MODULE VLM_stream_fd
+
+VLOG_DEFINE_THIS_MODULE(stream_fd);
 
 /* Active file descriptor stream. */
 
@@ -43,7 +45,7 @@ struct stream_fd
     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);
 
@@ -95,19 +97,39 @@ fd_connect(struct stream *stream)
     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 = 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;
 }
 
+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 = 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);
@@ -132,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 */
@@ -213,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) {
-        int retval = errno;
+        retval = errno;
         if (retval != EAGAIN) {
             VLOG_DBG_RL(&rl, "accept: %s", strerror(retval));
         }