Commit 72f04da4 authored by Douglas Gilbert's avatar Douglas Gilbert Committed by Jens Axboe

tools/io_uring: fix compile breakage

It would seem none of the kernel continuous integration does this:
    $ cd tools/io_uring
    $ make

Otherwise 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_".
Signed-off-by: default avatarDouglas Gilbert <dgilbert@interlog.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent f5cac8b1
...@@ -130,7 +130,7 @@ static int io_uring_register_files(struct submitter *s) ...@@ -130,7 +130,7 @@ static int io_uring_register_files(struct submitter *s)
s->nr_files); s->nr_files);
} }
static int gettid(void) static int lk_gettid(void)
{ {
return syscall(__NR_gettid); return syscall(__NR_gettid);
} }
...@@ -281,7 +281,7 @@ static void *submitter_fn(void *data) ...@@ -281,7 +281,7 @@ static void *submitter_fn(void *data)
struct io_sq_ring *ring = &s->sq_ring; struct io_sq_ring *ring = &s->sq_ring;
int ret, prepped; int ret, prepped;
printf("submitter=%d\n", gettid()); printf("submitter=%d\n", lk_gettid());
srand48_r(pthread_self(), &s->rand); srand48_r(pthread_self(), &s->rand);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment