From e9fd706e4672727937737f9cc26a6f2627cb9617 Mon Sep 17 00:00:00 2001
From: Sean Hefty <sean.hefty@intel.com>
Date: Wed, 24 Oct 2012 15:43:26 -0700
Subject: [PATCH] refresh

---
 meta                 |  7 ++---
 patches/refresh-temp | 75 --------------------------------------------
 patches/riostream    | 44 ++++++++++++++++++++++----
 3 files changed, 41 insertions(+), 85 deletions(-)
 delete mode 100644 patches/refresh-temp

diff --git a/meta b/meta
index 1d85ac7c..7dc9eb2d 100644
--- a/meta
+++ b/meta
@@ -1,10 +1,9 @@
 Version: 1
-Previous: c258cb77c7886d5460129ba6b1f0cbf9f5dc9db3
-Head: 754e085031a6675d290731f065bfdc7b385ac354
+Previous: 51446f88bdcd870dd81d8ad29a4f0164a7a52ffe
+Head: 6beed5170066fd8cd5191b3a05279b63135af030
 Applied:
   rs-iomap: 7d5e6eaade683aea0fa189cffc3795b838a4f7e3
-  riostream: 680d2f3d3e1181dcab6cbb05ab86dbcf5e8e77ae
-  refresh-temp: 754e085031a6675d290731f065bfdc7b385ac354
+  riostream: 6beed5170066fd8cd5191b3a05279b63135af030
 Unapplied:
   resv-rs-len: 7b6ff5c4894f54b221d877adcd709795dffb2fe9
   rs-target-sgl: 7a07c80f2242e80c076dcf3ec6bb4c94626b284f
diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644
index 2d358dd7..00000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,75 +0,0 @@
-Bottom: 290fe24e03efaea623d11e18320c59024beb9fbe
-Top:    5e887c322398445ed683aadd30b904e4d2498f54
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-10-24 15:43:26 -0700
-
-Refresh of riostream
-
----
-
-diff --git a/examples/riostream.c b/examples/riostream.c
-index ab0dc77..7333a3d 100644
---- a/examples/riostream.c
-+++ b/examples/riostream.c
-@@ -235,6 +235,38 @@ static int do_poll(struct pollfd *fds)
- 	return ret == 1 ? 0 : ret;
- }
- 
-+static int send_msg(int size)
-+{
-+	struct pollfd fds;
-+	int offset, ret;
-+
-+	if (verify)
-+		format_buf(buf, size);
-+
-+	if (use_async) {
-+		fds.fd = rs;
-+		fds.events = POLLOUT;
-+	}
-+
-+	for (offset = 0; offset < size; ) {
-+		if (use_async) {
-+			ret = do_poll(&fds);
-+			if (ret)
-+				return ret;
-+		}
-+
-+		ret = rsend(rs, buf + offset, size - offset, flags);
-+		if (ret > 0) {
-+			offset += ret;
-+		} else if (errno != EWOULDBLOCK && errno != EAGAIN) {
-+			perror("rsend");
-+			return ret;
-+		}
-+	}
-+
-+	return 0;
-+}
-+
- static int send_xfer(int size)
- {
- 	struct pollfd fds;
-@@ -255,7 +287,7 @@ static int send_xfer(int size)
- 				return ret;
- 		}
- 
--		ret = rsend(rs, buf + offset, size - offset, flags);
-+		ret = riowrite(rs, buf + offset, size - offset, offset, flags);
- 		if (ret > 0) {
- 			offset += ret;
- 		} else if (errno != EWOULDBLOCK && errno != EAGAIN) {
-@@ -322,11 +354,11 @@ static int sync_test(void)
- {
- 	int ret;
- 
--	ret = dst_addr ? send_xfer(16) : recv_msg(16);
-+	ret = dst_addr ? send_msg(16) : recv_msg(16);
- 	if (ret)
- 		return ret;
- 
--	return dst_addr ? recv_msg(16) : send_xfer(16);
-+	return dst_addr ? recv_msg(16) : send_msg(16);
- }
- 
- static int run_test(void)
diff --git a/patches/riostream b/patches/riostream
index 552ad1d9..b3977a65 100644
--- a/patches/riostream
+++ b/patches/riostream
@@ -1,5 +1,5 @@
 Bottom: 0f29fc79a2e44b45051dc6d32b885f356ac262aa
-Top:    290fe24e03efaea623d11e18320c59024beb9fbe
+Top:    5e887c322398445ed683aadd30b904e4d2498f54
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-10-24 10:23:52 -0700
 
@@ -35,10 +35,10 @@ index 4a8b9bc..d72016d 100644
  
 diff --git a/examples/riostream.c b/examples/riostream.c
 new file mode 100644
-index 0000000..ab0dc77
+index 0000000..7333a3d
 --- /dev/null
 +++ b/examples/riostream.c
-@@ -0,0 +1,702 @@
+@@ -0,0 +1,734 @@
 +/*
 + * Copyright (c) 2011-2012 Intel Corporation.  All rights reserved.
 + *
@@ -276,6 +276,38 @@ index 0000000..ab0dc77
 +	return ret == 1 ? 0 : ret;
 +}
 +
++static int send_msg(int size)
++{
++	struct pollfd fds;
++	int offset, ret;
++
++	if (verify)
++		format_buf(buf, size);
++
++	if (use_async) {
++		fds.fd = rs;
++		fds.events = POLLOUT;
++	}
++
++	for (offset = 0; offset < size; ) {
++		if (use_async) {
++			ret = do_poll(&fds);
++			if (ret)
++				return ret;
++		}
++
++		ret = rsend(rs, buf + offset, size - offset, flags);
++		if (ret > 0) {
++			offset += ret;
++		} else if (errno != EWOULDBLOCK && errno != EAGAIN) {
++			perror("rsend");
++			return ret;
++		}
++	}
++
++	return 0;
++}
++
 +static int send_xfer(int size)
 +{
 +	struct pollfd fds;
@@ -296,7 +328,7 @@ index 0000000..ab0dc77
 +				return ret;
 +		}
 +
-+		ret = rsend(rs, buf + offset, size - offset, flags);
++		ret = riowrite(rs, buf + offset, size - offset, offset, flags);
 +		if (ret > 0) {
 +			offset += ret;
 +		} else if (errno != EWOULDBLOCK && errno != EAGAIN) {
@@ -363,11 +395,11 @@ index 0000000..ab0dc77
 +{
 +	int ret;
 +
-+	ret = dst_addr ? send_xfer(16) : recv_msg(16);
++	ret = dst_addr ? send_msg(16) : recv_msg(16);
 +	if (ret)
 +		return ret;
 +
-+	return dst_addr ? recv_msg(16) : send_xfer(16);
++	return dst_addr ? recv_msg(16) : send_msg(16);
 +}
 +
 +static int run_test(void)
-- 
2.41.0