Nim-1.6 support (#4)

* Nim-1.6 support * macOS fix
2022-01-03 02:31:43 +01:00 · 2022-01-03 02:31:43 +01:00 · 26e3b1e15b
parent d0fc9cb4ab
commit 26e3b1e15b
6 changed files with 87 additions and 112 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@ -1,57 +1,57 @@
-name: Taskpools CI
-on: [push, pull_request]
+name: CI
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+  workflow_dispatch:

 jobs:
  build:
    strategy:
      fail-fast: false
-      max-parallel: 20
      matrix:
-        branch: [version-1-2, version-1-4]
        target:
          - os: linux
            cpu: amd64
-            TEST_LANG: c
-          - os: linux
-            cpu: amd64
-            TEST_LANG: cpp
          - os: linux
            cpu: i386
-            TEST_LANG: c
          - os: macos
            cpu: amd64
-            TEST_LANG: c
          - os: windows
            cpu: amd64
-            TEST_LANG: c
-          - os: windows
-            cpu: amd64
-            TEST_LANG: cpp
-          - os: windows
-            cpu: i386
-            TEST_LANG: c
+          #- os: windows
+            #cpu: i386
+        branch: [version-1-2, version-1-4, version-1-6, devel]
        include:
          - target:
              os: linux
            builder: ubuntu-18.04
+            shell: bash
          - target:
              os: macos
            builder: macos-10.15
+            shell: bash
          - target:
              os: windows
            builder: windows-2019
-    name: '${{ matrix.target.os }}-${{ matrix.target.cpu }}-${{ matrix.target.TEST_LANG }}-${{ matrix.target.BACKEND }} (${{ matrix.branch }})'
+            shell: msys2 {0}
+
+    defaults:
+      run:
+        shell: ${{ matrix.shell }}
+
+    name: '${{ matrix.target.os }}-${{ matrix.target.cpu }} (Nim ${{ matrix.branch }})'
    runs-on: ${{ matrix.builder }}
+    continue-on-error: ${{ matrix.branch == 'version-1-6' || matrix.branch == 'devel' }}
    steps:
      - name: Cancel Previous Runs
        uses: styfle/cancel-workflow-action@0.5.0
        with:
          access_token: ${{ github.token }}

-      - name: Checkout taskpools
+      - name: Checkout
        uses: actions/checkout@v2
-        with:
-          path: nim-taskpools

      - name: Install dependencies (Linux i386)
        if: runner.os == 'Linux' && matrix.target.cpu == 'i386'
@ -73,77 +73,61 @@ jobs:
          chmod 755 external/bin/gcc external/bin/g++
          echo '${{ github.workspace }}/external/bin' >> $GITHUB_PATH

-      - name: Install dependencies (Windows)
+      - name: MSYS2 (Windows i386)
+        if: runner.os == 'Windows' && matrix.target.cpu == 'i386'
+        uses: msys2/setup-msys2@v2
+        with:
+          path-type: inherit
+          msystem: MINGW32
+          install: >-
+            base-devel
+            git
+            mingw-w64-i686-toolchain
+
+      - name: MSYS2 (Windows amd64)
+        if: runner.os == 'Windows' && matrix.target.cpu == 'amd64'
+        uses: msys2/setup-msys2@v2
+        with:
+          path-type: inherit
+          install: >-
+            base-devel
+            git
+            mingw-w64-x86_64-toolchain
+
+      - name: Restore Nim DLLs dependencies (Windows) from cache
        if: runner.os == 'Windows'
-        shell: bash
+        id: windows-dlls-cache
+        uses: actions/cache@v2
+        with:
+          path: external/dlls
+          key: 'dlls'
+
+      - name: Install DLL dependencies (Windows)
+        if: >
+          steps.windows-dlls-cache.outputs.cache-hit != 'true' &&
+          runner.os == 'Windows'
        run: |
          mkdir external
-          if [[ '${{ matrix.target.cpu }}' == 'amd64' ]]; then
-            arch=64
-          else
-            arch=32
-          fi
-          curl -L "https://nim-lang.org/download/mingw$arch.7z" -o "external/mingw$arch.7z"
          curl -L "https://nim-lang.org/download/windeps.zip" -o external/windeps.zip
-          7z x "external/mingw$arch.7z" -oexternal/
          7z x external/windeps.zip -oexternal/dlls
-          echo '${{ github.workspace }}'"/external/mingw$arch/bin" >> $GITHUB_PATH
+
+      - name: Path to cached dependencies (Windows)
+        if: >
+          runner.os == 'Windows'
+        run: |
          echo '${{ github.workspace }}'"/external/dlls" >> $GITHUB_PATH

-      - name: Setup environment
-        shell: bash
-        run: echo '${{ github.workspace }}/nim/bin' >> $GITHUB_PATH
-
-      - name: Get latest Nim commit hash
-        id: versions
-        shell: bash
+      - name: Derive environment variables
        run: |
-          getHash() {
-            git ls-remote "https://github.com/$1" "${2:-HEAD}" | cut -f 1
-          }
-          nimHash=$(getHash nim-lang/Nim '${{ matrix.branch }}')
-          csourcesHash=$(getHash nim-lang/csources)
-          echo "::set-output name=nim::$nimHash"
-          echo "::set-output name=csources::$csourcesHash"
-      - name: Restore prebuilt Nim from cache
-        id: nim-cache
-        uses: actions/cache@v1
-        with:
-          path: nim
-          key: 'nim-${{ matrix.target.os }}-${{ matrix.target.cpu }}-${{ steps.versions.outputs.nim }}'
+          if [[ '${{ matrix.target.cpu }}' == 'amd64' ]]; then
+            PLATFORM=x64
+          else
+            PLATFORM=x86
+          fi
+          echo "PLATFORM=$PLATFORM" >> $GITHUB_ENV

-      - name: Restore prebuilt csources from cache
-        if: steps.nim-cache.outputs.cache-hit != 'true'
-        id: csources-cache
-        uses: actions/cache@v1
-        with:
-          path: csources/bin
-          key: 'csources-${{ matrix.target.os }}-${{ matrix.target.cpu }}-${{ steps.versions.outputs.csources }}'
-
-      - name: Checkout Nim csources
-        if: >
-          steps.csources-cache.outputs.cache-hit != 'true' &&
-          steps.nim-cache.outputs.cache-hit != 'true'
-        uses: actions/checkout@v2
-        with:
-          repository: nim-lang/csources
-          path: csources
-          ref: ${{ steps.versions.outputs.csources }}
-
-      - name: Checkout Nim
-        if: steps.nim-cache.outputs.cache-hit != 'true'
-        uses: actions/checkout@v2
-        with:
-          repository: nim-lang/Nim
-          path: nim
-          ref: ${{ steps.versions.outputs.nim }}
-
-      - name: Build Nim and associated tools
-        if: steps.nim-cache.outputs.cache-hit != 'true'
-        shell: bash
-        run: |
          ncpu=
-          ext=
+          MAKE_CMD="make"
          case '${{ runner.os }}' in
          'Linux')
            ncpu=$(nproc)
@ -153,29 +137,22 @@ jobs:
            ;;
          'Windows')
            ncpu=$NUMBER_OF_PROCESSORS
-            ext=.exe
+            MAKE_CMD="mingw32-make"
            ;;
          esac
          [[ -z "$ncpu" || $ncpu -le 0 ]] && ncpu=1
-          if [[ ! -e csources/bin/nim$ext ]]; then
-            make -C csources -j $ncpu CC=gcc ucpu='${{ matrix.target.cpu }}'
-          else
-            echo 'Using prebuilt csources'
-          fi
-          cp -v csources/bin/nim$ext nim/bin
-          cd nim
-          nim c koch
-          ./koch boot -d:release
-          ./koch tools -d:release
-          # clean up to save cache space
-          rm koch
-          rm -rf nimcache
-          rm -rf dist
-          rm -rf .git
+          echo "ncpu=$ncpu" >> $GITHUB_ENV
+          echo "MAKE_CMD=${MAKE_CMD}" >> $GITHUB_ENV

-      - name: Run taskpools tests
-        shell: bash
+      - name: Build Nim and Nimble
        run: |
-          export UCPU="$cpu"
-          cd nim-taskpools
-          nimble test
+          curl -O -L -s -S https://raw.githubusercontent.com/status-im/nimbus-build-system/master/scripts/build_nim.sh
+          env MAKE="${MAKE_CMD} -j${ncpu}" ARCH_OVERRIDE=${PLATFORM} NIM_COMMIT=${{ matrix.branch }} \
+            QUICK_AND_DIRTY_COMPILER=1 QUICK_AND_DIRTY_NIMBLE=1 CC=gcc \
+            bash build_nim.sh nim csources dist/nimble NimBinaries
+          echo '${{ github.workspace }}/nim/bin' >> $GITHUB_PATH
+
+      - name: Run tests
+        run: |
+          env TEST_LANG=c nimble test
+          env TEST_LANG=cpp nimble test
--- a/benchmarks/bouncing_producer_consumer/taskpool_bpc.nim
+++ b/benchmarks/bouncing_producer_consumer/taskpool_bpc.nim
@ -65,7 +65,7 @@ proc bpc_consume_nopoll(usec: int32) =

    dummy_cpt()

-proc bpc_produce(n, d: int32) =
+proc bpc_produce(n, d: int32) {.gcsafe.} =
  if d > 0:
    # Create producer task
    tp.spawn bpc_produce(n, d-1)
--- a/examples/e01_simple_tasks.nim
+++ b/examples/e01_simple_tasks.nim
@ -1,5 +1,4 @@
 import ../taskpools/taskpools
-import std/macros

 block: # Async without result

--- a/taskpools.nimble
+++ b/taskpools.nimble
@ -1,7 +1,7 @@
 mode = ScriptMode.Verbose

 packageName   = "taskpools"
-version       = "0.0.1"
+version       = "0.0.2"
 author        = "Status Research & Development GmbH"
 description   = "lightweight, energy-efficient, easily auditable threadpool"
 license       = "MIT"
@ -16,14 +16,12 @@ proc test(flags, path: string) =
  #       but is much faster than -d:debug

  # Compilation language is controlled by TEST_LANG
-  var lang = "c"
-  if existsEnv"TEST_LANG":
-    lang = getEnv"TEST_LANG"
+  let lang = getEnv("TEST_LANG", "c")

  echo "\n========================================================================================"
  echo "Running [ ", lang, " ", flags, " ] ", path
  echo "========================================================================================"
-  exec "nim " & lang & " " & flags & " --verbosity:0 --hints:off --warnings:off --threads:on -d:release --stacktrace:on --linetrace:on --outdir:build -r " & path
+  exec "nim " & lang & " " & getEnv("NIMFLAGS") & " " & flags & " --verbosity:0 --hints:off --warnings:off --threads:on -d:release --stacktrace:on --linetrace:on --outdir:build -r --skipParentCfg --skipUserCfg " & path

 task test, "Run Taskpools tests":
  # Internal data structures
--- a/taskpools/primitives/affinity_posix.nim
+++ b/taskpools/primitives/affinity_posix.nim
@ -9,7 +9,7 @@
 # ----------------------------------------------------------------------------------

 type
-  Pthread {.importc: "pthread_t", header: "<sys/types.h>".} = distinct culong
+  Pthread {.importc: "pthread_t", header: "<sys/types.h>".} = object
  CpuSet {.byref, importc: "cpu_set_t", header: "<sched.h>".} = object

 proc pthread_self(): Pthread {.header: "<pthread.h>".}
--- a/taskpools/taskpools.nim
+++ b/taskpools/taskpools.nim
@ -59,7 +59,8 @@ else:
  import ./primitives/affinity_posix

 when (NimMajor,NimMinor,NimPatch) >= (1,6,0):
-  import std/tasks
+  import std/[isolation, tasks]
+  export isolation
 else:
  import ./shims_pre_1_6/tasks