Changeset f854ee32 for libcfa/configure.ac

Timestamp:

Jul 24, 2020, 12:49:02 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

42cd451e

Parents:

54eb5ebd

Message:

Added support for using liburing to check for kernel support for IORING_OPs

File:

• libcfa/configure.ac (modified) (1 diff)

libcfa/configure.ac

@@ -128 +128 @@
 #io_uring 5.5 uses enum values
 #io_uring 5.6 and later uses probes
+define(ioring_ops, [IORING_OP_NOP,IORING_OP_READV,IORING_OP_WRITEV,IORING_OP_FSYNC,IORING_OP_READ_FIXED,IORING_OP_WRITE_FIXED,IORING_OP_POLL_ADD,IORING_OP_POLL_REMOVE,IORING_OP_SYNC_FILE_RANGE,IORING_OP_SENDMSG,IORING_OP_RECVMSG,IORING_OP_TIMEOUT,IORING_OP_TIMEOUT_REMOVE,IORING_OP_ACCEPT,IORING_OP_ASYNC_CANCEL,IORING_OP_LINK_TIMEOUT,IORING_OP_CONNECT,IORING_OP_FALLOCATE,IORING_OP_OPENAT,IORING_OP_CLOSE,IORING_OP_FILES_UPDATE,IORING_OP_STATX,IORING_OP_READ,IORING_OP_WRITE,IORING_OP_FADVISE,IORING_OP_MADVISE,IORING_OP_SEND,IORING_OP_RECV,IORING_OP_OPENAT2,IORING_OP_EPOLL_CTL,IORING_OP_SPLICE,IORING_OP_PROVIDE_BUFFERS,IORING_OP_REMOVE_BUFFER])
+
+define(ioring_from_decls, [
+        m4_foreach([op], [ioring_ops], [
+                AC_CHECK_DECL(op, [AC_DEFINE([CFA_HAVE_]op)], [], [[#include <linux/io_uring.h>]])
+        ])
+])
 
 AC_CHECK_HEADERS([linux/io_uring.h], [
         AC_DEFINE(CFA_HAVE_LINUX_IO_URING_H)
-        # AC_CHECK_HEADER([liburing.h], [
-        #       AC_CHECK_LIB([uring], [io_uring_get_probe])
-        # ])
-        m4_foreach([op], [IORING_OP_NOP,IORING_OP_READV,IORING_OP_WRITEV,IORING_OP_FSYNC,IORING_OP_READ_FIXED,IORING_OP_WRITE_FIXED,IORING_OP_POLL_ADD,IORING_OP_POLL_REMOVE,IORING_OP_SYNC_FILE_RANGE,IORING_OP_SENDMSG,IORING_OP_RECVMSG,IORING_OP_TIMEOUT,IORING_OP_TIMEOUT_REMOVE,IORING_OP_ACCEPT,IORING_OP_ASYNC_CANCEL,IORING_OP_LINK_TIMEOUT,IORING_OP_CONNECT,IORING_OP_FALLOCATE,IORING_OP_OPENAT,IORING_OP_CLOSE,IORING_OP_FILES_UPDATE,IORING_OP_STATX,IORING_OP_READ,IORING_OP_WRITE,IORING_OP_FADVISE,IORING_OP_MADVISE,IORING_OP_SEND,IORING_OP_RECV,IORING_OP_OPENAT2,IORING_OP_EPOLL_CTL,IORING_OP_SPLICE,IORING_OP_PROVIDE_BUFFERS,IORING_OP_REMOVE_BUFFER], [
-                AC_CHECK_DECL(op, [AC_DEFINE([CFA_HAVE_]op)], [], [[#include <linux/io_uring.h>]])
+        AC_CHECK_HEADER([liburing.h], [
+                AC_CHECK_LIB([uring], [io_uring_get_probe], [
+                        m4_foreach([op], [ioring_ops], [
+                                AC_CHECK_DECL(op, [
+                                        AC_RUN_IFELSE([
+                                                AC_LANG_PROGRAM(
+                                                        [[#include <liburing.h>]],
+                                                        [[int main() {]]
+                                                        [[      struct io_uring_probe *probe = io_uring_get_probe();]]
+                                                        [[      if(io_uring_opcode_supported(probe, ]]op[[))]]
+                                                        [[              return 0;]]
+                                                        [[      else]]
+                                                        [[              return 1;]]
+                                                        [[}]]
+                                                )
+                                        ],[
+                                                AC_DEFINE([CFA_HAVE_]op)
+                                        ],[
+                                                AC_MSG_FAILURE([Check support for] op [ with liburing failed])
+                                        ])
+                                ], [], [[#include <linux/io_uring.h>]])
+                        ])
+                ], [
+                        ioring_from_decls
+                ])
+        ], [
+                ioring_from_decls
         ])
 ])