Merge pull request #9 from well-typed/dcoutts/issue-7

Support liburing >= 2.0 && < 2.7

.github/workflows/haskell.yml

@@ -24,7 +24,21 @@ jobs:
       matrix:
         ghc: ["9.2.8", "9.4.8", "9.6.4", "9.8.2"]
         cabal: ["3.10.2.1"]
-        os: [ubuntu-latest]
+        os: [ubuntu-latest] # ubuntu-latest = ubuntu-22.04
+        liburing: ["liburing-2.5"]
+        include:
+        - ghc: "9.6.4"
+          cabal: "3.10.2.1"
+          os: ubuntu-20.04
+          liburing: "liburing-2.1"
+        - ghc: "9.6.4"
+          cabal: "3.10.2.1"
+          os: ubuntu-20.04
+          liburing: "liburing-2.5"
+        - ghc: "9.6.4"
+          cabal: "3.10.2.1"
+          os: ubuntu-22.04
+          liburing: "liburing-2.1"
 
     steps:
     - name: Checkout repository
@@ -48,7 +62,7 @@ jobs:
         cd tmp
         git clone https://github.com/axboe/liburing.git
         cd liburing
-        git checkout liburing-2.5
+        git checkout ${{ matrix.liburing }}
         ./configure --cc=gcc --cxx=g++
         make -j$(nproc)
         sudo make install
@@ -73,11 +87,10 @@ jobs:
         cache-name: cache-cabal-build
       with:
         path: ${{ steps.setup-haskell.outputs.cabal-store }}
-        key: ${{ runner.os }}-${{ matrix.ghc }}-${{ env.cache-name }}-${{ hashFiles('**/*.cabal') }}-${{ hashFiles('**/cabal.project') }}
+        key: ${{ runner.os }}-${{ matrix.ghc }}-${{ matrix.liburing }}-${{ env.cache-name }}-${{ hashFiles('**/*.cabal') }}-${{ hashFiles('**/cabal.project') }}
         restore-keys: |
-          ${{ runner.os }}-${{ matrix.ghc }}-${{ env.cache-name }}-${{ hashFiles('**/*.cabal') }}-${{ hashFiles('**/cabal.project') }}
-          ${{ runner.os }}-${{ matrix.ghc }}-${{ env.cache-name }}-${{ hashFiles('**/*.cabal') }}-
-          ${{ runner.os }}-${{ matrix.ghc }}-${{ env.cache-name }}-
+          ${{ runner.os }}-${{ matrix.ghc }}-${{ matrix.liburing }}-${{ env.cache-name }}-${{ hashFiles('**/*.cabal') }}-
+          ${{ runner.os }}-${{ matrix.ghc }}-${{ matrix.liburing }}-${{ env.cache-name }}-
 
     - name: Install cabal dependencies
       id: build-dependencies

System/IO/BlockIO/URingFFI.hsc

@@ -36,8 +36,14 @@ data {-# CTYPE "liburing.h" "struct io_uring_sqe" #-} URingSQE
 foreign import capi unsafe "liburing.h io_uring_get_sqe"
   io_uring_get_sqe :: Ptr URing -> IO (Ptr URingSQE)
 
+#ifdef LIBURING_HAVE_DATA64
 foreign import capi unsafe "liburing.h io_uring_sqe_set_data64"
   io_uring_sqe_set_data :: Ptr URingSQE -> CULong -> IO ()
+#else
+io_uring_sqe_set_data :: Ptr URingSQE -> CULong -> IO ()
+io_uring_sqe_set_data p user_data =
+  do #{poke struct io_uring_cqe, user_data} p user_data
+#endif
 
 foreign import capi unsafe "liburing.h io_uring_prep_read"
   io_uring_prep_read :: Ptr URingSQE -> Fd -> Ptr Word8 -> CUInt -> CULong -> IO ()

blockio-uring.cabal

@@ -45,7 +45,7 @@ library
     , primitive  ^>=0.9
     , unix       ^>=2.8
 
-  pkgconfig-depends: liburing
+  pkgconfig-depends: liburing >= 2.0 && < 2.7
   default-language:  Haskell2010
   ghc-options:       -Wall