Skip to content

Commit c698216

Browse files
talex5talex5
authored
Merge pull request #34 from talex5/release
Convert liburing to subtree
2 parents f23474a + 268ac87 commit c698216

File tree

158 files changed

+29949
-8
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

158 files changed

+29949
-8
lines changed

‎.gitmodules‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎README.md‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# ocaml-uring -- bindings to Linux io_uring
22

3-
These are OCaml bindings for the Linux [io_uring][] stack
3+
These are OCaml bindings for the Linux [io_uring][liburing] stack
44
(an alternative to using syscalls such as `select` or `epoll`).
55

66
The [Eio][] library provides a higher-level effects-based API
@@ -16,5 +16,11 @@ To use the library directly:
1616

1717
The `tests` directory contains some examples.
1818

19-
[io_uring]: https://github.com/axboe/liburing
19+
## License
20+
21+
This library is released under the ISC license (see [LICENSE.md](./LICENSE.md)),
22+
but note that the repository also vendors [liburing][] -
23+
see [vendor/liburing/README](./vendor/liburing/README).
24+
25+
[liburing]: https://github.com/axboe/liburing
2026
[Eio]: https://github.com/ocaml-multicore/eio

‎dune-project‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
(generate_opam_files true)
44
(formatting disabled)
55
(source (github ocaml-multicore/ocaml-uring))
6-
(license ISC)
6+
(license "(ISC AND MIT)")
77
(authors "Anil Madhavapeddy" "Sadiq Jaffer" "Thomas Leonard")
88
(maintainers "[email protected]")
99
(package

‎uring.opam‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description:
55
"Bindings to the Linux io_uring kernel IO interfaces. See https://github.com/ocaml-multicore/eio for a higher-level API using this."
66
maintainer: ["[email protected]"]
77
authors: ["Anil Madhavapeddy" "Sadiq Jaffer" "Thomas Leonard"]
8-
license: "ISC"
8+
license: "(ISC AND MIT)"
99
homepage: "https://github.com/ocaml-multicore/ocaml-uring"
1010
bug-reports: "https://github.com/ocaml-multicore/ocaml-uring/issues"
1111
depends: [

‎vendor/liburing‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎vendor/liburing/.gitignore‎

Lines changed: 124 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,124 @@
1+
*.rej
2+
*.orig
3+
*~
4+
/*.patch
5+
6+
*.o
7+
*.o[ls]
8+
9+
/src/liburing.a
10+
/src/liburing.so*
11+
/src/include/liburing/compat.h
12+
13+
/examples/io_uring-cp
14+
/examples/io_uring-test
15+
/examples/link-cp
16+
/examples/ucontext-cp
17+
18+
/test/232c93d07b74-test
19+
/test/35fa71a030ca-test
20+
/test/500f9fbadef8-test
21+
/test/7ad0e4b2f83c-test
22+
/test/8a9973408177-test
23+
/test/917257daa0fe-test
24+
/test/a0908ae19763-test
25+
/test/a4c0b3decb33-test
26+
/test/accept
27+
/test/accept-link
28+
/test/accept-reuse
29+
/test/accept-test
30+
/test/across-fork
31+
/test/b19062a56726-test
32+
/test/b5837bd5311d-test
33+
/test/ce593a6c480a-test
34+
/test/close-opath
35+
/test/config.local
36+
/test/connect
37+
/test/cq-full
38+
/test/cq-overflow
39+
/test/cq-overflow-peek
40+
/test/cq-peek-batch
41+
/test/cq-ready
42+
/test/cq-size
43+
/test/d4ae271dfaae-test
44+
/test/d77a67ed5f27-test
45+
/test/defer
46+
/test/double-poll-crash
47+
/test/eeed8b54e0df-test
48+
/test/eventfd
49+
/test/eventfd-disable
50+
/test/eventfd-ring
51+
/test/fadvise
52+
/test/fallocate
53+
/test/fc2a85cb02ef-test
54+
/test/file-register
55+
/test/file-update
56+
/test/files-exit-hang-poll
57+
/test/files-exit-hang-timeout
58+
/test/fixed-link
59+
/test/fsync
60+
/test/io-cancel
61+
/test/io_uring_enter
62+
/test/io_uring_register
63+
/test/io_uring_setup
64+
/test/iopoll
65+
/test/lfs-openat
66+
/test/lfs-openat-write
67+
/test/link
68+
/test/link-timeout
69+
/test/link_drain
70+
/test/madvise
71+
/test/nop
72+
/test/nop-all-sizes
73+
/test/open-close
74+
/test/openat2
75+
/test/personality
76+
/test/pipe-eof
77+
/test/pipe-reuse
78+
/test/poll
79+
/test/poll-cancel
80+
/test/poll-cancel-ton
81+
/test/poll-link
82+
/test/poll-many
83+
/test/poll-ring
84+
/test/poll-v-poll
85+
/test/probe
86+
/test/read-write
87+
/test/register-restrictions
88+
/test/rename
89+
/test/ring-leak
90+
/test/ring-leak2
91+
/test/self
92+
/test/send_recv
93+
/test/send_recvmsg
94+
/test/shared-wq
95+
/test/short-read
96+
/test/shutdown
97+
/test/sigfd-deadlock
98+
/test/socket-rw
99+
/test/socket-rw-eagain
100+
/test/splice
101+
/test/sq-full
102+
/test/sq-full-cpp
103+
/test/sq-poll-dup
104+
/test/sq-poll-kthread
105+
/test/sq-poll-share
106+
/test/sqpoll-sleep
107+
/test/sq-space_left
108+
/test/statx
109+
/test/stdout
110+
/test/submit-reuse
111+
/test/teardowns
112+
/test/thread-exit
113+
/test/timeout
114+
/test/timeout-new
115+
/test/timeout-overflow
116+
/test/unlink
117+
/test/wakeup-hang
118+
/test/*.dmesg
119+
120+
config-host.h
121+
config-host.mak
122+
config.log
123+
124+
liburing.pc

‎vendor/liburing/.travis.yml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
language: cpp
2+
os:
3+
- linux
4+
compiler:
5+
- clang
6+
- gcc
7+
env:
8+
matrix:
9+
- BUILD_ARCH="x86"
10+
- BUILD_ARCH="x86_64"
11+
global:
12+
- MAKEFLAGS="-j 2"
13+
matrix:
14+
exclude:
15+
- os: linux
16+
compiler: clang
17+
env: BUILD_ARCH="x86" # Only do the gcc x86 build to reduce clutter
18+
before_install:
19+
- EXTRA_CFLAGS="-Werror"
20+
script:
21+
- ./configure && make
22+
- sudo make runtests || true

0 commit comments

Comments
 (0)