fix xseg-tool rnd functions to check for error on submit

also changeg type of xqindex to uint64_t

diff --git a/xseg/peers/user/xseg-tool.c b/xseg/peers/user/xseg-tool.c
index 9e5e378..52a1f27 100644 (file)
--- a/xseg/peers/user/xseg-tool.c
+++ b/xseg/peers/user/xseg-tool.c
@@ -526,7 +526,6 @@ int cmd_rndwrite(long loops, int32_t seed, uint32_t targetlen, uint32_t chunksiz
                        req_target = xseg_get_target(xseg, submitted);
                        req_data = xseg_get_data(xseg, submitted);
 
-                       nr_submitted += 1;
                        reported = 0;
                        seed = random();
                        mkname(namebuf, targetlen, seed);
@@ -542,8 +541,12 @@ int cmd_rndwrite(long loops, int32_t seed, uint32_t targetlen, uint32_t chunksiz
                        submitted->flags |= XF_NOSYNC;
 
                        srl = xseg_submit(xseg, dstport, submitted);
-                       (void)srl;
-                       xseg_signal(xseg, dstport);
+                       if (srl == Noneidx) {
+                               xseg_put_request(xseg, submitted->portno, submitted);
+                       } else {
+                               nr_submitted += 1;
+                               xseg_signal(xseg, dstport);
+                       }
                }
 
                received = xseg_receive(xseg, srcport);
@@ -630,7 +633,6 @@ int cmd_rndread(long loops, int32_t seed, uint32_t targetlen, uint32_t chunksize
                        }
 
                        req_target = xseg_get_target(xseg, submitted);
-                       nr_submitted += 1;
                        reported = 0;
                        seed = random();
                        mkname(namebuf, targetlen, seed);
@@ -644,8 +646,12 @@ int cmd_rndread(long loops, int32_t seed, uint32_t targetlen, uint32_t chunksize
                        submitted->op = X_READ;
 
                        srl = xseg_submit(xseg, dstport, submitted);
-                       (void)srl;
-                       xseg_signal(xseg, dstport);
+                       if (srl == Noneidx) {
+                               xseg_put_request(xseg, submitted->portno, submitted);
+                       } else {
+                               nr_submitted += 1;
+                               xseg_signal(xseg, dstport);
+                       }
                }
 
                received = xseg_receive(xseg, srcport);

diff --git a/xseg/sys/util.h b/xseg/sys/util.h
index 17c9730..5af77c7 100644 (file)
--- a/xseg/sys/util.h
+++ b/xseg/sys/util.h
@@ -14,7 +14,6 @@ typedef uint64_t xpointer;
  * this should be the same as xqindex
  * and must fit into a ptr type
  */
-//FIXME xqindex is set to uint32_t
 typedef uint64_t xptr; 
 
 #define Noneidx ((xqindex)-1)

diff --git a/xseg/xtypes/xq.h b/xseg/xtypes/xq.h
index 81b771d..9bd1f53 100644 (file)
--- a/xseg/xtypes/xq.h
+++ b/xseg/xtypes/xq.h
@@ -3,7 +3,7 @@
 
 #include <sys/util.h>
 
-typedef uint32_t xqindex;
+typedef uint64_t xqindex;
 
 #include "xlock.h"