From: Amaury Denoyelle Date: Thu, 19 Nov 2026 13:41:26 +0000 (+0100) Subject: MINOR: ncbuf/test: define max iteration to random insert test X-Git-Url: https://git.kaiwu.me/http/%22data:,//%22?a=commitdiff_plain;h=9d327e5d43a9b573f3d682a388ee53dff189de41;p=haproxy.git MINOR: ncbuf/test: define max iteration to random insert test To ensure random insert test does not run for too long, specify a maximum number of iteration. By default it is set to 10.000, which is sufficient to fill a 16kB buffer. It can also be overriden on the command-line using option '-i'. --- diff --git a/src/ncbuf.c b/src/ncbuf.c index 20807db8d..15a95b90c 100644 --- a/src/ncbuf.c +++ b/src/ncbuf.c @@ -910,7 +910,7 @@ static int ncbuf_test(ncb_sz_t head, int reset, int print_delay) return 1; } -int ncbuf_random_insert(ncb_sz_t head, int reset, int print_delay) +int ncbuf_random_insert(ncb_sz_t head, int reset, int print_delay, int max_iter) { char *data0; struct rand_off *roff, *roff_tmp = NULL; @@ -936,9 +936,14 @@ int ncbuf_random_insert(ncb_sz_t head, int reset, int print_delay) ret = ncb_add(&b, roff->off, data0, roff->len, NCB_ADD_COMPARE); BUG_ON(ret == NCB_RET_DATA_REJ); ncbuf_print_buf_delay(&b, bufsize, bufarea, __LINE__, print_delay); + + if (!--max_iter) { + fprintf(stderr, "max iteration limit reached\n"); + break; + } } - fprintf(stderr, "buf full, prepare for reverse random\n"); + fprintf(stderr, "iter=%d, prepare for reverse random\n", max_iter); ncbuf_print_buf(&b, bufsize, bufarea, __LINE__); /* insert the previously generated random offsets in the reverse order. @@ -958,7 +963,7 @@ int ncbuf_random_insert(ncb_sz_t head, int reset, int print_delay) roff = roff_tmp; } - if (!ncb_is_full(&b)) + if (!ncb_is_full(&b) && max_iter) abort(); fprintf(stderr, "done\n"); @@ -972,10 +977,11 @@ int main(int argc, char **argv) { int reset = 0; int print_delay = 100000; + int rand_max_iter = 10000; char c; opterr = 0; - while ((c = getopt(argc, argv, "h:s:rp::")) != -1) { + while ((c = getopt(argc, argv, "h:s:ri:p::")) != -1) { switch (c) { case 'h': bufhead = atoi(optarg); @@ -990,6 +996,9 @@ int main(int argc, char **argv) case 'r': reset = 1; break; + case 'i': + rand_max_iter = atoi(optarg); + break; case 'p': if (optarg) print_delay = atoi(optarg); @@ -1003,7 +1012,7 @@ int main(int argc, char **argv) } ncbuf_test(bufhead, reset, print_delay); - ncbuf_random_insert(bufhead, reset, print_delay); + ncbuf_random_insert(bufhead, reset, print_delay, rand_max_iter); free(bufarea); return EXIT_SUCCESS; }