ops fixes and cleanup

elijahr · Sep 28, 2024 · d6aa78a · d6aa78a
1 parent ac930c7
commit d6aa78a
Show file tree

Hide file tree

Showing 13 changed files with 520 additions and 424 deletions.
diff --git a/.githooks/pre-commit b/.githooks/pre-commit
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -26,22 +26,22 @@ jobs:
       matrix:
         include:
           - runs-on: macos-latest
-            nim-version: 'ref:version-1-6'
+            nim-version: 'ref:version-2-0'
             sanitize-threads: 'yes'
             timeout-minutes: 20
 
           - runs-on: ubuntu-latest
-            nim-version: 'latest:1.6'
+            nim-version: 'latest:2.0'
             sanitize-threads: 'yes'
             timeout-minutes: 5
 
           - runs-on: ubuntu-latest
-            nim-version: 'latest:1.4'
+            nim-version: 'latest:1.6'
             sanitize-threads: 'no'
             timeout-minutes: 5
 
           - runs-on: ubuntu-latest
-            nim-version: 'latest:1.2'
+            nim-version: 'latest:1.4'
             sanitize-threads: 'no'
             timeout-minutes: 5
 
@@ -87,7 +87,7 @@ jobs:
       matrix:
         include:
           - arch: aarch64
-            nim-version: 'ref:version-1-6'
+            nim-version: 'ref:version-2-0'
 
     steps:
       # Optimization: re-use cached Nim->C compilation

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
diff --git a/.github/workflows/update-docs.yml b/.github/workflows/update-docs.yml
@@ -21,12 +21,12 @@ jobs:
         uses: asdf-vm/actions/install@v1
         with:
           tool_versions: |
-            nim latest:1.6
+            nim latest:2.0
 
       - name: Generate documentation
         run: |
           . "${HOME}/.asdf/asdf.sh"
-          asdf local nim latest:1.6
+          asdf local nim latest:2.0
           rm -rf htmldocs
           nim doc --out:htmldocs src/lockfreequeues.nim
           mv htmldocs/theindex.html htmldocs/index.html

diff --git a/.lintballrc.json b/.lintballrc.json
diff --git a/.yamllint.yml b/.yamllint.yml
diff --git a/README.md b/README.md
@@ -49,11 +49,3 @@ CI runs the test suite for both C and C++ targets on:
 - macOS `x86_64`
 
 The test suite is also run with [LLVM thread sanitization](https://clang.llvm.org/docs/ThreadSanitizer.html) to check for data races.
-
-### Linting
-
-This project uses [lintball](https://github.com/elijahr/lintball) to auto-format code. Please ensure your changeset passes linting. Enable the githooks with:
-
-```sh
-git config --local core.hooksPath .githooks
-```
diff --git a/lockfreequeues.nimble b/lockfreequeues.nimble
@@ -1,7 +1,7 @@
 import os
 
 # Package
-version       = "3.0.0"
+version       = "3.1.0"
 author        = "Elijah Shaw-Rutschman"
 description   = "Lock-free queue implementations for Nim."
 license       = "MIT"

diff --git a/src/lockfreequeues/mupsic.nim b/src/lockfreequeues/mupsic.nim
@@ -136,7 +136,7 @@ proc push*[N, P: static int, T](
       return false
 
     newTail = incOrReset(prevTail, 1, N)
-    # validateHeadAndTail(head, newTail, N)
+    assert validateHeadAndTail(head, newTail, N)
     self.queue.producerTails[self.idx].release(newTail)
 
     if self.queue.prevProducerIdx.compareExchangeWeak(
@@ -210,7 +210,7 @@ proc push*[N, P: static int, T](
         count = avail
 
     newTail = incOrReset(prevTail, count, N)
-    #  validateHeadAndTail(head, newTail, N)
+    assert validateHeadAndTail(head, newTail, N)
     self.queue.producerTails[self.idx].release(newTail)
 
     if self.queue.prevProducerIdx.compareExchangeWeak(