refresh (create temporary patch)

diff --git a/meta b/meta
index b3e4fe1a179a4094ff2582699eeea671f6117e33..52d401dd4879f8c26909c552bf92c8901e4a5095 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,10 @@
 Version: 1
-Previous: 644c03cb9565f4998f63ea74dff0259b6feb9ea7
-Head: 43d3fe1f5693bfe8b7066689556b5bdcbe58b1d2
+Previous: c4e2c9d7482d48700a3a1d142de64ba71909e5bd
+Head: 1f7a6858b53b83c6650156674224032f455fd80d
 Applied:
   rs-iomap: d25c8115399392055d5c4fac68cc089a3d0cd330
   riostream: 43d3fe1f5693bfe8b7066689556b5bdcbe58b1d2
+  refresh-temp: 1f7a6858b53b83c6650156674224032f455fd80d
 Unapplied:
   resv-rs-len: 7b6ff5c4894f54b221d877adcd709795dffb2fe9
   rs-target-sgl: 7a07c80f2242e80c076dcf3ec6bb4c94626b284f

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..cb75e7f
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,102 @@
+Bottom: 68c25eb4f121a64106e4108dc0c4df1f41520f04
+Top:    d3d4f66f3e75f36cefcf2fd634292f5d4d22bd3d
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2012-10-24 15:12:09 -0700
+
+Refresh of riostream
+
+---
+
+diff --git a/Makefile.am b/Makefile.am
+index 4a8b9bc..d72016d 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -28,7 +28,8 @@ src_librspreload_la_LIBADD = $(top_builddir)/src/librdmacm.la
+ 
+ bin_PROGRAMS = examples/ucmatose examples/rping examples/udaddy examples/mckey \
+              examples/rdma_client examples/rdma_server examples/rdma_xclient \
+-             examples/rdma_xserver examples/rstream examples/rcopy
++             examples/rdma_xserver examples/rstream examples/rcopy \
++             examples/riostream
+ examples_ucmatose_SOURCES = examples/cmatose.c examples/common.c
+ examples_ucmatose_LDADD = $(top_builddir)/src/librdmacm.la
+ examples_rping_SOURCES = examples/rping.c
+@@ -47,6 +48,8 @@ examples_rdma_xserver_SOURCES = examples/rdma_xserver.c
+ examples_rdma_xserver_LDADD = $(top_builddir)/src/librdmacm.la
+ examples_rstream_SOURCES = examples/rstream.c
+ examples_rstream_LDADD = $(top_builddir)/src/librdmacm.la
++examples_riostream_SOURCES = examples/riostream.c
++examples_riostream_LDADD = $(top_builddir)/src/librdmacm.la
+ examples_rcopy_SOURCES = examples/rcopy.c
+ examples_rcopy_LDADD = $(top_builddir)/src/librdmacm.la
+ 
+diff --git a/man/riostream.1 b/man/riostream.1
+new file mode 100644
+index 0000000..14e77fa
+--- /dev/null
++++ b/man/riostream.1
+@@ -0,0 +1,64 @@
++.TH "RIOSTREAM" 1 "2012-10-24" "librdmacm" "librdmacm" librdmacm
++.SH NAME
++riostream \- zero-copy streaming over RDMA ping-pong test.
++.SH SYNOPSIS
++.sp
++.nf
++\fIriostream\fR [-s server_address] [-b bind_address] [-B buffer_size]
++                      [-I iterations] [-C transfer_count]
++                      [-S transfer_size] [-p server_port] [-T test_option]
++.fi
++.SH "DESCRIPTION"
++Uses the streaming over RDMA protocol (rsocket) to connect and exchange
++data between a client and server application.
++.SH "OPTIONS"
++.TP
++\-s server_address
++The network name or IP address of the server system listening for
++connections.  The used name or address must route over an RDMA device.
++This option must be specified by the client.
++.TP
++\-b bind_address
++The local network address to bind to.
++.TP
++\-B buffer_size
++Indicates the size of the send and receive network buffers.
++.TP
++\-I iterations
++The number of times that the specified number of messages will be
++exchanged between the client and server.  (default 1000)
++.TP
++\-C transfer_count
++The number of messages to transfer from the client to the server and
++back again on each iteration.  (default 1)
++.TP
++\-S transfer_size
++The size of each send transfer, in bytes.  (default 1000)  If 'all'
++is specified, rstream will run a series of tests of various sizes.
++.TP
++\-p server_port
++The server's port number.
++.TP
++\-T test_option
++Specifies test parameters.  Available options are:
++.P
++a | async - uses asynchronous operation (e.g. select / poll)
++.P
++b | blocking - uses blocking calls
++.P
++n | nonblocking - uses non-blocking calls
++.P
++v | verify - verifies data transfers
++.SH "NOTES"
++Basic usage is to start riostream on a server system, then run
++riostream -s server_name on a client system.  By default, riostream
++will run a series of latency and bandwidth performance tests.
++Specifying a different iterations, transfer_count, or transfer_size
++will run a user customized test using default values where none
++have been specified.
++.P
++Because this test maps RDMA resources to userspace, users must ensure
++that they have available system resources and permissions.  See the
++libibverbs README file for additional details.
++.SH "SEE ALSO"
++rdma_cm(7) rstream(1)