diff options
| author | Douglas Gilbert <dgilbert@interlog.com> | 2021-08-04 15:35:26 +0000 |
|---|---|---|
| committer | Douglas Gilbert <dgilbert@interlog.com> | 2021-08-04 15:35:26 +0000 |
| commit | cbde70fafd0ab9353e79b708621adf73420fdded (patch) | |
| tree | 907f91f8803a78d13acf373658cc655ce99c1bc6 /testing/sg_mrq_dd.cpp | |
| parent | bfbefdf2d9aa12107d08d796d6fc78862ab85402 (diff) | |
| download | sg3_utils-cbde70fafd0ab9353e79b708621adf73420fdded.tar.gz | |
sg_ses: guard against small '--maxlen=' values
In several utilities guard against '--maxlen=' < 4 or < 16
as they seem to serve no useful purpose other than finding
awkward corner cases that may trip up these utilities.
git-svn-id: https://svn.bingwo.ca/repos/sg3_utils/trunk@908 6180dd3e-e324-4e3e-922d-17de1ae2f315
Diffstat (limited to 'testing/sg_mrq_dd.cpp')
| -rw-r--r-- | testing/sg_mrq_dd.cpp | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/testing/sg_mrq_dd.cpp b/testing/sg_mrq_dd.cpp index 4dc1f54c..65dc27fe 100644 --- a/testing/sg_mrq_dd.cpp +++ b/testing/sg_mrq_dd.cpp @@ -30,7 +30,7 @@ * */ -static const char * version_str = "1.33 20210730"; +static const char * version_str = "1.34 20210801"; #define _XOPEN_SOURCE 600 #ifndef _GNU_SOURCE @@ -1002,7 +1002,9 @@ calc_duration_throughput(int contin) static void print_stats(const char * str) { - bool show_slice = (gcoll.cp_ver_arr.size() > 1); + bool show_slice = ((gcoll.cp_ver_arr.size() > 1) && + (gcoll.cp_ver_arr[1].state != + cp_ver_pair_t::my_state::empty)); int k = 0; int64_t infull, outfull; @@ -1060,6 +1062,7 @@ siginfo_handler(int sig) print_stats(" "); } +#if 0 static void siginfo2_handler(int sig) { @@ -1069,6 +1072,7 @@ siginfo2_handler(int sig) calc_duration_throughput(1); print_stats(" "); } +#endif static void install_handler(int sig_num, void (*sig_handler) (int sig)) @@ -1502,10 +1506,12 @@ sig_listen_thread(struct global_collection * clp) raise(SIGINT); break; } + if (SIGUSR2 == sig_number) + break; if (shutting_down) break; } /* end of while loop */ - if (clp->verbose > 1) + if (clp->verbose > 3) pr2serr_lk("%s: exiting\n", __func__); } @@ -4200,7 +4206,7 @@ main(int argc, char * argv[]) install_handler(SIGQUIT, interrupt_handler); install_handler(SIGPIPE, interrupt_handler); install_handler(SIGUSR1, siginfo_handler); - install_handler(SIGUSR2, siginfo2_handler); + // install_handler(SIGUSR2, siginfo2_handler); num_ifiles = clp->inf_v.size(); num_ofiles = clp->outf_v.size(); @@ -4462,6 +4468,7 @@ main(int argc, char * argv[]) sigemptyset(&signal_set); sigaddset(&signal_set, SIGINT); + sigaddset(&signal_set, SIGUSR2); res = sigprocmask(SIG_BLOCK, &signal_set, &orig_signal_set); if (res < 0) { |