Merge pull request #12 from ifplusor/fix-cq-entries

fix: the entries field of cq is not set
Iceber · Jun 9, 2022 · 30825ba · 30825ba
2 parents dce5d2f + ca187d3
commit 30825ba
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/mmap.go b/mmap.go
@@ -85,6 +85,7 @@ func mmapCQ(iour *IOURing) (err error) {
 	cq.head = (*uint32)(unsafe.Pointer(cq.ptr + uintptr(params.CQOffset.Head)))
 	cq.tail = (*uint32)(unsafe.Pointer(cq.ptr + uintptr(params.CQOffset.Tail)))
 	cq.mask = (*uint32)(unsafe.Pointer(cq.ptr + uintptr(params.CQOffset.RingMask)))
+	cq.entries = (*uint32)(unsafe.Pointer(cq.ptr + uintptr(params.CQOffset.RingEntries)))
 	cq.flags = (*uint32)(unsafe.Pointer(cq.ptr + uintptr(params.CQOffset.Flags)))
 	cq.overflow = (*uint32)(unsafe.Pointer(cq.ptr + uintptr(params.CQOffset.Overflow)))
 

diff --git a/syscall/io_uring_setup.go b/syscall/io_uring_setup.go
@@ -61,15 +61,15 @@ type SubmissionQueueRingOffset struct {
 
 // CompletionQueueRingOffset describes the offsets of various ring buffer fields
 type CompletionQueueRingOffset struct {
-	Head     uint32
-	Tail     uint32
-	RingMask uint32
-	Entries  uint32
-	Overflow uint32
-	Cqes     uint32
-	Flags    uint32
-	Resv1    uint32
-	Resv2    uint64
+	Head        uint32
+	Tail        uint32
+	RingMask    uint32
+	RingEntries uint32
+	Overflow    uint32
+	Cqes        uint32
+	Flags       uint32
+	Resv1       uint32
+	Resv2       uint64
 }
 
 func IOURingSetup(entries uint, params *IOURingParams) (int, error) {

diff --git a/types.go b/types.go
@@ -135,9 +135,9 @@ type CompletionQueue struct {
 	head     *uint32
 	tail     *uint32
 	mask     *uint32
-	overflow *uint32
 	entries  *uint32
 	flags    *uint32
+	overflow *uint32
 
 	cqes []iouring_syscall.CompletionQueueEvent
 }