diff options
| author | Douglas Gilbert <dgilbert@interlog.com> | 2021-03-29 01:27:17 +0000 |
|---|---|---|
| committer | Douglas Gilbert <dgilbert@interlog.com> | 2021-03-29 01:27:17 +0000 |
| commit | 93e55163dc9978093b46b7000ae4aa7e8fbb02d4 (patch) | |
| tree | bf0375f6bfa10f99184b094b0c1f6e12b8abbb0c /testing/sg_mrq_dd.cpp | |
| parent | 339d06ac2ba7a7126df065fa562baae738ce15a8 (diff) | |
| download | sg3_utils-93e55163dc9978093b46b7000ae4aa7e8fbb02d4.tar.gz | |
sg_vpd: fix vendor struct opts_t alignment; 3rd attempt to release 1.46
git-svn-id: https://svn.bingwo.ca/repos/sg3_utils/trunk@886 6180dd3e-e324-4e3e-922d-17de1ae2f315
Diffstat (limited to 'testing/sg_mrq_dd.cpp')
| -rw-r--r-- | testing/sg_mrq_dd.cpp | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/testing/sg_mrq_dd.cpp b/testing/sg_mrq_dd.cpp index 9ce3eb5b..bed16233 100644 --- a/testing/sg_mrq_dd.cpp +++ b/testing/sg_mrq_dd.cpp @@ -30,7 +30,7 @@ * */ -static const char * version_str = "1.22 20210321"; +static const char * version_str = "1.23 20210328"; #define _XOPEN_SOURCE 600 #ifndef _GNU_SOURCE @@ -62,7 +62,6 @@ static const char * version_str = "1.22 20210321"; #include <linux/major.h> /* for MEM_MAJOR, SCSI_GENERIC_MAJOR, etc */ #include <linux/fs.h> /* for BLKSSZGET and friends */ #include <sys/mman.h> /* for mmap() system call */ -#include <sys/random.h> /* for getrandom() system call */ #include <vector> #include <array> @@ -77,6 +76,10 @@ static const char * version_str = "1.22 20210321"; #include "config.h" #endif +#ifdef HAVE_GETRANDOM +#include <sys/random.h> /* for getrandom() system call */ +#endif + #ifndef HAVE_LINUX_SG_V4_HDR /* Kernel uapi header contain __user decorations on user space pointers * to indicate they are unsafe in the kernel space. However glibc takes @@ -1294,12 +1297,17 @@ read_write_thread(struct global_collection * clp, int id, bool singleton) rep->same_sg = true; } if (clp->in_flags.random) { - ssize_t ssz; +#ifdef HAVE_GETRANDOM + ssize_t ssz = getrandom(&rep->seed, sizeof(rep->seed), GRND_NONBLOCK); - ssz = getrandom(&rep->seed, sizeof(rep->seed), GRND_NONBLOCK); - if (ssz < (ssize_t)sizeof(rep->seed)) + if (ssz < (ssize_t)sizeof(rep->seed)) { pr2serr_lk("[%d] %s: getrandom() failed, ret=%d\n", id, __func__, (int)ssz); + rep->seed = (long)time(NULL); + } +#else + rep->seed = (long)time(NULL); /* use seconds since epoch as proxy */ +#endif if (vb > 1) pr2serr_lk("[%d] %s: seed=%ld\n", id, __func__, rep->seed); srand48_r(rep->seed, &rep->drand); |