Skip to contentSkip to conversation

Small fixes for tests

PATCH Applied Ammar Faizi 2 participants 4 messages Oct 18, 2021 io_uring

lore
Share & tools
lore
#0 lore raw

cover Small fixes for tests

 test/timeout-overflow.c | 2 +-
 test/timeout.c          | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
Signature · 1 line
Ammar Faizi
#1 lore raw

PATCH 1/2 test/timeout: Fix `-Werror=maybe-uninitialized`

Fix this:

```
  timeout.c: In function ‘test_multi_timeout’:
  timeout.c:590:20: warning: ‘user_data’ may be used uninitialized in this function [-Wmaybe-uninitialized]
    590 |                 if (cqe->user_data != user_data) {
        |                    ^
  timeout.c:601:51: warning: ‘time’ may be used uninitialized in this function [-Wmaybe-uninitialized]
    601 |                 if (exp < time / 2 || exp > (time * 3) / 2) {
        |                                             ~~~~~~^~~~
```
Fixes 37136cb4423b27dac2fc663b6a0c513b6d7d7ad1 ("test/timeout: add multi timeout reqs test with different timeout")
Cc zhangyi (F) <[email protected]>
---
 test/timeout.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
test/timeout.c +2 -2
index f8ba973..8c35b00 100644
@@ -563,8 +563,8 @@ static int test_multi_timeout(struct io_uring *ring)
 
 	gettimeofday(&tv, NULL);
 	for (i = 0; i < 2; i++) {
-		unsigned int time;
-		__u64 user_data;
+		unsigned int time = 0;
+		__u64 user_data = 0;
 
 		ret = io_uring_wait_cqe(ring, &cqe);
 		if (ret < 0) {
Signature · 1 line
2.30.2
#2 lore raw

PATCH 2/2 test/timeout-overflow: Fix `-Werror=maybe-uninitialized`

In reply to Ammar Faizi

Fix this:

```
  In file included from timeout-overflow.c:12:
  timeout-overflow.c: In function ‘test_timeout_overflow’:
  ../src/include/liburing.h:406:9: error: ‘num’ may be used uninitialized in this function [-Werror=maybe-uninitialized]
    406 |         io_uring_prep_rw(IORING_OP_TIMEOUT, sqe, -1, ts, 1, count);
        |         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  timeout-overflow.c:104:26: note: ‘num’ was declared here
    104 |                 unsigned num;
        |                          ^~~
```
Fixes a4b465536021ee9c4d6d450a9461ddfc116d08b1 ("Add test for overflow of timeout request's sequence")
Cc yangerkun <[email protected]>
---
 test/timeout-overflow.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
test/timeout-overflow.c +1 -1
index f952f80..671f171 100644
@@ -101,7 +101,7 @@ static int test_timeout_overflow(void)
 
 	msec_to_ts(&ts, TIMEOUT_MSEC);
 	for (i = 0; i < 4; i++) {
-		unsigned num;
+		unsigned num = 0;
 		sqe = io_uring_get_sqe(&ring);
 		switch (i) {
 		case 0:
Signature · 1 line
2.30.2
maintainer Applied
#3 lore raw
In reply to Ammar Faizi
Quoted 4 lines · Ammar Faizi

test/timeout-overflow.c | 2 +-

 test/timeout.c          | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

Applied, thanks!

[1/2] test/timeout: Fix -Werror=maybe-uninitialized

      commit: 49e3095eb27febf4dd2639430cb554a5c694ccf9
[2/2] test/timeout-overflow: Fix `-Werror=maybe-uninitialized`
      commit: b3813170f9f24f9e18f068a7a1e29747417e360c

Best regards,

Signature · 1 line
Jens Axboe