tools/io_uring: fix compile breakage
PATCH 1/1 tools/io_uring: fix compile breakage
It would seem none of the kernel continuous integration does this:
$ cd tools/io_uring
$ makeOtherwise it may have noticed:
cc -Wall -Wextra -g -D_GNU_SOURCE -c -o io_uring-bench.o
io_uring-bench.c
io_uring-bench.c:133:12: error: static declaration of ‘gettid’
follows non-static declaration
133 | static int gettid(void)
| ^~~~~~
In file included from /usr/include/unistd.h:1170,
from io_uring-bench.c:27:
/usr/include/x86_64-linux-gnu/bits/unistd_ext.h:34:16: note:
previous declaration of ‘gettid’ was here
34 | extern __pid_t gettid (void) __THROW;
| ^~~~~~make: *** [<builtin>: io_uring-bench.o] Error 1
The problem on Ubuntu 20.04 (with lk 5.9.0-rc5) is that unistd.h already defines gettid(). So prefix the local definition with "lk_".
--- tools/io_uring/io_uring-bench.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/io_uring/io_uring-bench.c +2 -2
@@ -130,7 +130,7 @@ static int io_uring_register_files(struct submitter *s) s->nr_files); } -static int gettid (void ) +static int lk_gettid (void ) {return syscall (__NR_gettid); }
@@ -281,7 +281,7 @@ static void *submitter_fn(void *data)struct io_sq_ring *ring = &s->sq_ring;int ret, prepped; -printf ("submitter=%d\n" ,gettid ()); +printf ("submitter=%d\n" ,lk_gettid ());srand48_r (pthread_self (), &s->rand);
Signature · 1 line
2.25.1
Jens Axboe
maintainerQuoted 17 lines · Douglas Gilbert
It would seem none of the kernel continuous integration does this:
$ cd tools/io_uring $ makeOtherwise it may have noticed:
cc -Wall -Wextra -g -D_GNU_SOURCE -c -o io_uring-bench.o
io_uring-bench.c
io_uring-bench.c:133:12: error: static declaration of ‘gettid’
follows non-static declaration
133 | static int gettid(void)| ^~~~~~ In file included from /usr/include/unistd.h:1170, from io_uring-bench.c:27: /usr/include/x86_64-linux-gnu/bits/unistd_ext.h:34:16: note: previous declaration of ‘gettid’ was here 34 | extern __pid_t gettid (void) __THROW; | ^~~~~~
Quoted 5 lines
make: *** [<builtin>: io_uring-bench.o] Error 1
The problem on Ubuntu 20.04 (with lk 5.9.0-rc5) is that
unistd.halready definesgettid(). So prefix the local definition with "lk_".
Thanks Doug - I haven't really been maintaining the examples in the kernel, only in liburing. I'll apply this one, and hopefully sync them up for 5.10 in general.
Signature · 1 line
Jens Axboe