Recent changes (master)

[Jens Axboe <axboe@xxxxxxxxx>]

The following changes since commit 24a24c12a04c45174c2d68ffb7fcb3f367e40dee:

  t/io_uring: clean up aio wait loop (2021-10-04 17:04:04 -0600)

are available in the Git repository at:

  git://git.kernel.dk/fio.git master

for you to fetch changes up to 09ee86fa431939cb8f634e9ee8e1fc8d9302ea59:

  t/io_uring: get rid of old debug printfs (2021-10-05 06:58:07 -0600)

----------------------------------------------------------------
Jens Axboe (2):
      t/io_uring: print submitter id with tid on startup
      t/io_uring: get rid of old debug printfs

 t/io_uring.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

---

Diff of recent changes:

diff --git a/t/io_uring.c b/t/io_uring.c
index f27a12c7..7ef2f6ce 100644
--- a/t/io_uring.c
+++ b/t/io_uring.c
@@ -552,7 +552,7 @@ static int submitter_init(struct submitter *s)
 	int i, nr_batch;
 
 	s->tid = gettid();
-	printf("submitter=%d\n", s->tid);
+	printf("submitter=%d, tid=%d\n", s->index, s->tid);
 
 	srand48(pthread_self());
 
@@ -951,7 +951,6 @@ static int setup_ring(struct submitter *s)
 	ptr = mmap(0, p.sq_off.array + p.sq_entries * sizeof(__u32),
 			PROT_READ | PROT_WRITE, MAP_SHARED | MAP_POPULATE, fd,
 			IORING_OFF_SQ_RING);
-	printf("sq_ring ptr = 0x%p\n", ptr);
 	sring->head = ptr + p.sq_off.head;
 	sring->tail = ptr + p.sq_off.tail;
 	sring->ring_mask = ptr + p.sq_off.ring_mask;
@@ -963,12 +962,10 @@ static int setup_ring(struct submitter *s)
 	s->sqes = mmap(0, p.sq_entries * sizeof(struct io_uring_sqe),
 			PROT_READ | PROT_WRITE, MAP_SHARED | MAP_POPULATE, fd,
 			IORING_OFF_SQES);
-	printf("sqes ptr    = 0x%p\n", s->sqes);
 
 	ptr = mmap(0, p.cq_off.cqes + p.cq_entries * sizeof(struct io_uring_cqe),
 			PROT_READ | PROT_WRITE, MAP_SHARED | MAP_POPULATE, fd,
 			IORING_OFF_CQ_RING);
-	printf("cq_ring ptr = 0x%p\n", ptr);
 	cring->head = ptr + p.cq_off.head;
 	cring->tail = ptr + p.cq_off.tail;
 	cring->ring_mask = ptr + p.cq_off.ring_mask;
@@ -1253,10 +1250,8 @@ int main(int argc, char *argv[])
 	printf("polled=%d, fixedbufs=%d, register_files=%d, buffered=%d, QD=%d\n", polled, fixedbufs, register_files, buffered, depth);
 	if (!aio)
 		printf("Engine=io_uring, sq_ring=%d, cq_ring=%d\n", *s->sq_ring.ring_entries, *s->cq_ring.ring_entries);
-#ifdef CONFIG_LIBAIO
 	else
-		printf("Engine=aio, ctx=%p\n", &s->aio_ctx);
-#endif
+		printf("Engine=aio\n");
 
 	for (j = 0; j < nthreads; j++) {
 		s = get_submitter(j);