examples/sg_tst_excl: add -xx option; work on other sg_tst_excl*

git-svn-id: https://svn.bingwo.ca/repos/sg3_utils/trunk@530 6180dd3e-e324-4e3e-922d-17de1ae2f315

3 files changed, 91 insertions, 30 deletions

diff --git a/examples/sg_tst_excl.cpp b/examples/sg_tst_excl.cpp
index 14024105..b19d4a21 100644
--- a/examples/sg_tst_excl.cpp
+++ b/examples/sg_tst_excl.cpp
@@ -46,7 +46,7 @@
 #include "sg_lib.h"
 #include "sg_io_linux.h"
 
-static const char * version_str = "1.06 20131030";
+static const char * version_str = "1.07 20131110";
 static const char * util_name = "sg_tst_excl";
 
 /* This is a test program for checking O_EXCL on open() works. It uses
@@ -107,7 +107,7 @@ usage(void)
 {
     printf("Usage: %s [-b] [-f] [-h] [-l <lba>] [-n <n_per_thr>] "
            "[-t <num_thrs>]\n"
-           "                   [-V] [-w <wait_ms>] [-x] "
+           "                   [-V] [-w <wait_ms>] [-x] [-xx] "
            "<sg_disk_device>\n", util_name);
     printf("  where\n");
     printf("    -b                block on open (def: O_NONBLOCK)\n");
@@ -128,10 +128,14 @@ usage(void)
            DEF_WAIT_MS);
     printf("    -x                don't use O_EXCL on first thread "
            "(def: use\n"
-           "                      O_EXCL on all threads)\n\n");
+           "                      O_EXCL on all threads)\n"
+           "    -xx               don't use O_EXCL on any thread\n\n");
     printf("Test O_EXCL open flag with Linux sg driver. Each open/close "
            "cycle with the\nO_EXCL flag does a double increment on "
-           "lba (using its first 4 bytes).\n");
+           "lba (using its first 4 bytes).\nEach increment uses a READ_16, "
+           "READ_16, increment, WRITE_16 cycle. The two\nREAD_16s are "
+           "launched asynchronously. Note that '-xx' will run test\n"
+           "without any O_EXCL flags.\n");
 }
 
 
@@ -206,13 +210,17 @@ do_rd_inc_wr_twice(const char * dev_name, unsigned int lba, int block,
 
         // queue up two READ_16s to same LBA
         if (write(sg_fd, &pt, sizeof(pt)) < 0) {
+            console_mutex.lock();
             perror("do_rd_inc_wr_twice: write(sg, READ_16)");
+            console_mutex.unlock();
             close(sg_fd);
             return -1;
         }
         pt2 = pt;
         if (write(sg_fd, &pt2, sizeof(pt2)) < 0) {
+            console_mutex.lock();
             perror("do_rd_inc_wr_twice: write(sg, READ_16) 2");
+            console_mutex.unlock();
             close(sg_fd);
             return -1;
         }
@@ -228,7 +236,9 @@ do_rd_inc_wr_twice(const char * dev_name, unsigned int lba, int block,
                 sleep(0);                   // process yield ??
         }
         if (res < 0) {
+            console_mutex.lock();
             perror("do_rd_inc_wr_twice: read(sg, READ_16)");
+            console_mutex.unlock();
             close(sg_fd);
             return -1;
         }
@@ -239,11 +249,15 @@ do_rd_inc_wr_twice(const char * dev_name, unsigned int lba, int block,
             ok = 1;
             break;
         case SG_LIB_CAT_RECOVERED:
-            printf("Recovered error on READ_16, continuing\n");
+            console_mutex.lock();
+            fprintf(stderr, "Recovered error on READ_16, continuing\n");
+            console_mutex.unlock();
             ok = 1;
             break;
         default: /* won't bother decoding other categories */
+            console_mutex.lock();
             sg_chk_n_print3("READ_16 command error", &pt, 1);
+            console_mutex.unlock();
             break;
         }
         if (ok) {
@@ -258,7 +272,9 @@ do_rd_inc_wr_twice(const char * dev_name, unsigned int lba, int block,
                     sleep(0);                   // process yield ??
             }
             if (res < 0) {
+                console_mutex.lock();
                 perror("do_rd_inc_wr_twice: read(sg, READ_16) 2");
+                console_mutex.unlock();
                 close(sg_fd);
                 return -1;
             }
@@ -270,11 +286,15 @@ do_rd_inc_wr_twice(const char * dev_name, unsigned int lba, int block,
                 ok = 1;
                 break;
             case SG_LIB_CAT_RECOVERED:
-                printf("Recovered error on READ_16, continuing 2\n");
+                console_mutex.lock();
+                fprintf(stderr, "Recovered error on READ_16, continuing 2\n");
+                console_mutex.unlock();
                 ok = 1;
                 break;
             default: /* won't bother decoding other categories */
+                console_mutex.lock();
                 sg_chk_n_print3("READ_16 command error 2", &pt, 1);
+                console_mutex.unlock();
                 break;
             }
         }
@@ -313,7 +333,9 @@ do_rd_inc_wr_twice(const char * dev_name, unsigned int lba, int block,
         pt.pack_id = id;
 
         if (ioctl(sg_fd, SG_IO, &pt) < 0) {
+            console_mutex.lock();
             perror("do_rd_inc_wr_twice: WRITE_16 SG_IO ioctl error");
+            console_mutex.unlock();
             close(sg_fd);
             return -1;
         }
@@ -324,11 +346,15 @@ do_rd_inc_wr_twice(const char * dev_name, unsigned int lba, int block,
             ok = 1;
             break;
         case SG_LIB_CAT_RECOVERED:
-            printf("Recovered error on WRITE_16, continuing\n");
+            console_mutex.lock();
+            fprintf(stderr, "Recovered error on WRITE_16, continuing\n");
+            console_mutex.unlock();
             ok = 1;
             break;
         default: /* won't bother decoding other categories */
+            console_mutex.lock();
             sg_chk_n_print3("WRITE_16 command error", &pt, 1);
+            console_mutex.unlock();
             break;
         }
         if (! ok) {
@@ -408,7 +434,7 @@ do_inquiry_prod_id(const char * dev_name, int block, int wait_ms,
         ok = 1;
         break;
     case SG_LIB_CAT_RECOVERED:
-        printf("Recovered error on INQUIRY, continuing\n");
+        fprintf(stderr, "Recovered error on INQUIRY, continuing\n");
         ok = 1;
         break;
     default: /* won't bother decoding other categories */
@@ -454,11 +480,12 @@ work_thread(const char * dev_name, unsigned int lba, int id, int block,
         if (res)
             ++thr_odd_count;
     }
-    if (k < num) {
-        console_mutex.lock();
-        cerr << "thread id=" << id << " failed k=" << k << '\n';
-        console_mutex.unlock();
-    }
+    console_mutex.lock();
+    if (k < num)
+        cerr << "thread id=" << id << " FAILed at iteration: " << k << '\n';
+    else
+        cerr << "thread id=" << id << " normal exit" << '\n';
+    console_mutex.unlock();
 
     odd_count_mutex.lock();
     odd_count += thr_odd_count;
@@ -478,7 +505,7 @@ main(int argc, char * argv[])
     int num_per_thread = DEF_NUM_PER_THREAD;
     int num_threads = DEF_NUM_THREADS;
     int wait_ms = DEF_WAIT_MS;
-    int exclude_o_excl = 0;
+    int no_o_excl = 0;
     char * dev_name = NULL;
     char b[64];
 
@@ -520,8 +547,12 @@ main(int argc, char * argv[])
                     wait_ms = atoi(argv[k]);
             } else
                 break;
-        } else if (0 == memcmp("-x", argv[k], 2))
-            ++exclude_o_excl;
+        } else if (0 == memcmp("-xxx", argv[k], 4))
+            no_o_excl += 3;
+        else if (0 == memcmp("-xx", argv[k], 3))
+            no_o_excl += 2;
+        else if (0 == memcmp("-x", argv[k], 2))
+            ++no_o_excl;
         else if (*argv[k] == '-') {
             printf("Unrecognized switch: %s\n", argv[k]);
             dev_name = NULL;
@@ -573,7 +604,12 @@ main(int argc, char * argv[])
         vector<thread *> vt;
 
         for (k = 0; k < num_threads; ++k) {
-            int excl = ((0 == k) && exclude_o_excl) ? 0 : 1;
+            int excl = 1;
+
+            if (no_o_excl > 1)
+                excl = 0;
+            else if ((0 == k) && (1 == no_o_excl))
+                excl = 0;
 
             thread * tp = new thread {work_thread, dev_name, lba, k, block,
                                       excl, num_per_thread, wait_ms};
@@ -587,7 +623,10 @@ main(int argc, char * argv[])
         for (k = 0; k < (int)vt.size(); ++k)
             delete vt[k];
 
-        cout << "Expecting odd count of 0, got " << odd_count << endl;
+        if (no_o_excl)
+            cout << "Odd count: " << odd_count << endl;
+        else
+            cout << "Expecting odd count of 0, got " << odd_count << endl;
         cout << "Number of EBUSYs: " << ebusy_count << endl;
         cout << "Number of EAGAINs: " << eagain_count << endl;
 
diff --git a/examples/sg_tst_excl2.cpp b/examples/sg_tst_excl2.cpp
index 435836f5..bf014528 100644
--- a/examples/sg_tst_excl2.cpp
+++ b/examples/sg_tst_excl2.cpp
@@ -46,7 +46,7 @@
 #include "sg_lib.h"
 #include "sg_pt.h"
 
-static const char * version_str = "1.05 20131029";
+static const char * version_str = "1.06 20131110";
 static const char * util_name = "sg_tst_excl2";
 
 /* This is a test program for checking O_EXCL on open() works. It uses
@@ -230,7 +230,9 @@ do_rd_inc_wr_twice(const char * dev_name, unsigned int lba, int block,
     if (sg_fd < 0) {
         snprintf(ebuff, EBUFF_SZ,
                  "do_rd_inc_wr_twice: error opening file: %s", dev_name);
+        console_mutex.lock();
         perror(ebuff);
+        console_mutex.unlock();
         return -1;
     }
 
@@ -243,13 +245,17 @@ do_rd_inc_wr_twice(const char * dev_name, unsigned int lba, int block,
         set_scsi_pt_data_in(ptp, lb, READ16_REPLY_LEN);
         res = do_scsi_pt(ptp, sg_fd, 20 /* secs timeout */, 1);
         if (res) {
+            console_mutex.lock();
             fprintf(stderr, "READ_16 do_scsi_pt() submission error\n");
+            console_mutex.unlock();
             res = pt_err(res);
             goto err;
         }
         cat = get_scsi_pt_result_category(ptp);
         if (SCSI_PT_RESULT_GOOD != cat) {
+            console_mutex.lock();
             fprintf(stderr, "READ_16 do_scsi_pt() category problem\n");
+            console_mutex.unlock();
             res = pt_cat_no_good(cat, ptp, sense_buffer);
             goto err;
         }
@@ -278,13 +284,17 @@ do_rd_inc_wr_twice(const char * dev_name, unsigned int lba, int block,
         set_scsi_pt_data_out(ptp, lb, WRITE16_REPLY_LEN);
         res = do_scsi_pt(ptp, sg_fd, 20 /* secs timeout */, 1);
         if (res) {
+            console_mutex.lock();
             fprintf(stderr, "WRITE_16 do_scsi_pt() submission error\n");
+            console_mutex.unlock();
             res = pt_err(res);
             goto err;
         }
         cat = get_scsi_pt_result_category(ptp);
         if (SCSI_PT_RESULT_GOOD != cat) {
+            console_mutex.lock();
             fprintf(stderr, "WRITE_16 do_scsi_pt() category problem\n");
+            console_mutex.unlock();
             res = pt_cat_no_good(cat, ptp, sense_buffer);
             goto err;
         }
@@ -391,11 +401,12 @@ work_thread(const char * dev_name, unsigned int lba, int id, int block,
         if (res)
             ++thr_odd_count;
     }
-    if (k < num) {
-        console_mutex.lock();
-        cerr << "thread id=" << id << " failed k=" << k << '\n';
-        console_mutex.unlock();
-    }
+    console_mutex.lock();
+    if (k < num)
+        cerr << "thread id=" << id << " FAILed at iteration: " << k << '\n';
+    else
+        cerr << "thread id=" << id << " normal exit" << '\n';
+    console_mutex.unlock();
 
     odd_count_mutex.lock();
     odd_count += thr_odd_count;
diff --git a/examples/sg_tst_excl3.cpp b/examples/sg_tst_excl3.cpp
index 58fdae75..078b1184 100644
--- a/examples/sg_tst_excl3.cpp
+++ b/examples/sg_tst_excl3.cpp
@@ -46,7 +46,7 @@
 #include "sg_lib.h"
 #include "sg_pt.h"
 
-static const char * version_str = "1.03 20131029";
+static const char * version_str = "1.04 20131110";
 static const char * util_name = "sg_tst_excl3";
 
 /* This is a test program for checking O_EXCL on open() works. It uses
@@ -236,7 +236,9 @@ do_rd_inc_wr_twice(const char * dev_name, int read_only, unsigned int lba,
     if (sg_fd < 0) {
         snprintf(ebuff, EBUFF_SZ,
                  "do_rd_inc_wr_twice: error opening file: %s", dev_name);
+        console_mutex.lock();
         perror(ebuff);
+        console_mutex.unlock();
         return -1;
     }
 
@@ -249,13 +251,17 @@ do_rd_inc_wr_twice(const char * dev_name, int read_only, unsigned int lba,
         set_scsi_pt_data_in(ptp, lb, READ16_REPLY_LEN);
         res = do_scsi_pt(ptp, sg_fd, 20 /* secs timeout */, 1);
         if (res) {
+            console_mutex.lock();
             fprintf(stderr, "READ_16 do_scsi_pt() submission error\n");
+            console_mutex.unlock();
             res = pt_err(res);
             goto err;
         }
         cat = get_scsi_pt_result_category(ptp);
         if (SCSI_PT_RESULT_GOOD != cat) {
+            console_mutex.lock();
             fprintf(stderr, "READ_16 do_scsi_pt() category problem\n");
+            console_mutex.unlock();
             res = pt_cat_no_good(cat, ptp, sense_buffer);
             goto err;
         }
@@ -287,13 +293,17 @@ do_rd_inc_wr_twice(const char * dev_name, int read_only, unsigned int lba,
         set_scsi_pt_data_out(ptp, lb, WRITE16_REPLY_LEN);
         res = do_scsi_pt(ptp, sg_fd, 20 /* secs timeout */, 1);
         if (res) {
+            console_mutex.lock();
             fprintf(stderr, "WRITE_16 do_scsi_pt() submission error\n");
+            console_mutex.unlock();
             res = pt_err(res);
             goto err;
         }
         cat = get_scsi_pt_result_category(ptp);
         if (SCSI_PT_RESULT_GOOD != cat) {
+            console_mutex.lock();
             fprintf(stderr, "WRITE_16 do_scsi_pt() category problem\n");
+            console_mutex.unlock();
             res = pt_cat_no_good(cat, ptp, sense_buffer);
             goto err;
         }
@@ -400,11 +410,12 @@ work_thread(const char * dev_name, unsigned int lba, int id, int block,
         if (res)
             ++thr_odd_count;
     }
-    if (k < num) {
-        console_mutex.lock();
-        cerr << "thread id=" << id << " failed k=" << k << '\n';
-        console_mutex.unlock();
-    }
+    console_mutex.lock();
+    if (k < num)
+        cerr << "thread id=" << id << " FAILed at iteration: " << k << '\n';
+    else
+        cerr << "thread id=" << id << " normal exit" << '\n';
+    console_mutex.unlock();
 
     odd_count_mutex.lock();
     odd_count += thr_odd_count;