Try blocking locks again.

Author: ncruces

.github/workflows/test.yml

@@ -22,215 +22,10 @@ permissions:
 
 jobs:
   test:
-    strategy:
-      matrix:
-        os: [macos-latest, ubuntu-latest, windows-latest]
-    runs-on: ${{ matrix.os }}
-    permissions:
-      contents: write
+    runs-on: windows-latest
 
     steps:
     - uses: actions/checkout@v4
-    - uses: actions/setup-go@v5
-      with: { go-version: stable }
-
-    - name: Format
-      run: gofmt -s -w . && git diff --exit-code
-      if: matrix.os != 'windows-latest'
-
-    - name: Tidy
-      run: go mod tidy && git diff --exit-code
-
-    - name: Download
-      run: go mod download
-
-    - name: Verify
-      run: go mod verify
-
-    - name: Vet
-      run: go vet ./...
-
-    - name: Build
-      run: go build -v ./...
-
-    - name: Test
-      run: go test -v ./... -bench . -benchtime=1x
-
-    - name: Test BSD locks
-      run: go test -v -tags sqlite3_flock ./...
-      if: matrix.os != 'windows-latest'
-
-    - name: Test dot locks
-      run: go test -v -tags sqlite3_dotlk ./...
-      if: matrix.os != 'windows-latest'
-
-    - name: Test modules
-      shell: bash
-      run: |
-        go work init .
-        go work use -r embed gormlite
-        go test -v ./embed/bcw2/...
-
-    - name: Test GORM
-      shell: bash
-      run: gormlite/test.sh
-      if: matrix.os != 'windows-latest'
-
-    - name: Collect coverage
-      run: |
-        go get -tool github.com/dave/courtney@v0.4.4
-        go tool courtney
-      if: |
-        github.event_name == 'push' &&
-        matrix.os == 'ubuntu-latest'
-
-    - uses: ncruces/go-coverage-report@v0
-      with:
-        coverage-file: coverage.out
-        chart: true
-        amend: true
-      if: |
-        github.event_name == 'push' &&
-        matrix.os == 'ubuntu-latest'
-
-  test-bsd:
-    strategy:
-      matrix:
-        os:
-          - name: freebsd
-            version: '14.2'
-            flags: '-test.v'
-          - name: netbsd
-            version: '10.1'
-            flags: '-test.v'
-          - name: freebsd
-            arch: arm64
-            version: '14.2'
-            flags: '-test.v -test.short'
-          - name: netbsd
-            arch: arm64
-            version: '10.1'
-            flags: '-test.v -test.short'
-          - name: openbsd
-            version: '7.7'
-            flags: '-test.v -test.short'
-    runs-on: ubuntu-latest
-    needs: test
-
-    steps:
-    - uses: actions/checkout@v4
-
-    - name: Build
-      env:
-        GOOS: ${{ matrix.os.name }}
-        GOARCH: ${{ matrix.os.arch }}
-        TESTFLAGS: ${{ matrix.os.flags }}
-      run: .github/workflows/build-test.sh
-
-    - name: Test
-      uses: cross-platform-actions/action@v0.28.0
-      with:
-        operating_system: ${{ matrix.os.name }}
-        architecture: ${{ matrix.os.arch }}
-        version: ${{ matrix.os.version }}
-        shell: bash
-        run: . ./test.sh
-        sync_files: runner-to-vm
-
-  test-vm:
-    strategy:
-      matrix:
-        os:
-          - name: dragonfly
-            action: 'vmactions/dragonflybsd-vm@v1'
-            tflags: '-test.v'
-          - name: illumos
-            action: 'vmactions/omnios-vm@v1'
-            tflags: '-test.v'
-          - name: solaris
-            action: 'vmactions/solaris-vm@v1'
-            bflags: '-tags sqlite3_dotlk'
-            tflags: '-test.v'
-    runs-on: ubuntu-latest
-    needs: test
-
-    steps:
-    - uses: actions/checkout@v4
-
-    - name: Build
-      env:
-        GOOS: ${{ matrix.os.name }}
-        BUILDFLAGS: ${{ matrix.os.bflags }}
-        TESTFLAGS:  ${{ matrix.os.tflags }}
-        VMACTIONS:  ${{ matrix.os.action }}
-      run: .github/workflows/build-test.sh
-
-    - name: Test
-      uses: ./.github/actions/vmactions
-
-  test-wasip1:
-    runs-on: ubuntu-latest
-    needs: test
-
-    steps:
-    - uses: bytecodealliance/actions/wasmtime/setup@v1
-    - uses: actions/checkout@v4
-    - uses: actions/setup-go@v5
-      with: { go-version: stable }
-
-    - name: Set path
-      run: echo "$(go env GOROOT)/lib/wasm" >> "$GITHUB_PATH"
-
-    - name: Test wasmtime
-      env:
-        GOOS: wasip1
-        GOARCH: wasm
-        GOWASIRUNTIME: wasmtime
-        GOWASIRUNTIMEARGS: '--env CI=true'
-      run: go test -v -short -tags sqlite3_dotlk -skip Example ./...
-
-  test-qemu:
-    runs-on: ubuntu-latest
-    needs: test
-
-    steps:
-    - uses: docker/setup-qemu-action@v3
-    - uses: actions/checkout@v4
-    - uses: actions/setup-go@v5
-      with: { go-version: stable }
-
-    - name: Test 386 (32-bit)
-      run: GOARCH=386 go test -v -short ./...
-
-    - name: Test riscv64 (interpreter)
-      run: GOARCH=riscv64 go test -v -short ./...
-
-    - name: Test ppc64le (interpreter)
-      run: GOARCH=ppc64le go test -v -short ./...
-
-    - name: Test s390x (big-endian)
-      run: GOARCH=s390x go test -v -short -tags sqlite3_dotlk ./...
-
-  test-linuxarm:
-    runs-on: ubuntu-24.04-arm
-    needs: test
-
-    steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-go@v5
-      with: { go-version: stable }
-
-    - name: Test
-      run: go test -v ./...
-
-  test-macintel:
-    runs-on: macos-13
-    needs: test
-
-    steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-go@v5
-      with: { go-version: stable }
 
     - name: Test
-      run: go test -v ./...
+      run: go test -v ./tests/parallel -run Test_wal -count 10

util/osutil/osfs.go

@@ -32,10 +32,3 @@ func (FS) Stat(name string) (fs.FileInfo, error) {
 func (FS) ReadFile(name string) ([]byte, error) {
 	return os.ReadFile(name)
 }
-
-// OpenFile behaves the same as [os.OpenFile].
-//
-// Deprecated: use os.OpenFile instead.
-func OpenFile(name string, flag int, perm fs.FileMode) (*os.File, error) {
-	return os.OpenFile(name, flag, perm)
-}

vfs/os_windows.go

@@ -3,6 +3,7 @@
 package vfs
 
 import (
+	"math"
 	"os"
 	"time"
 
@@ -133,13 +134,7 @@ func osWriteLock(file *os.File, start, len uint32, timeout time.Duration) _Error
 }
 
 func osLock(file *os.File, flags, start, len uint32, timeout time.Duration, def _ErrorCode) _ErrorCode {
-	var err error
-	switch {
-	default:
-		err = osLockEx(file, flags|windows.LOCKFILE_FAIL_IMMEDIATELY, start, len)
-	case timeout < 0:
-		err = osLockEx(file, flags, start, len)
-	}
+	err := osLockEx(file, flags, start, len, timeout)
 	return osLockErrorCode(err, def)
 }
 
@@ -155,9 +150,40 @@ func osUnlock(file *os.File, start, len uint32) _ErrorCode {
 	return _OK
 }
 
-func osLockEx(file *os.File, flags, start, len uint32) error {
-	return windows.LockFileEx(windows.Handle(file.Fd()), flags,
-		0, len, 0, &windows.Overlapped{Offset: start})
+func osLockEx(file *os.File, flags, start, len uint32, timeout time.Duration) error {
+	event, err := windows.CreateEvent(nil, 1, 0, nil)
+	if err != nil {
+		return err
+	}
+	defer windows.CloseHandle(event)
+
+	fd := windows.Handle(file.Fd())
+	overlapped := &windows.Overlapped{
+		Offset: start,
+		HEvent: event,
+	}
+	if timeout == 0 {
+		flags |= windows.LOCKFILE_FAIL_IMMEDIATELY
+	}
+
+	err = windows.LockFileEx(fd, flags, 0, len, 0, overlapped)
+	if err != windows.ERROR_IO_PENDING {
+		return err
+	}
+	defer windows.CancelIoEx(fd, overlapped)
+
+	var ms uint32 = math.MaxUint32
+	if timeout > 0 {
+		ms = 10 + uint32(timeout/time.Millisecond)
+	}
+	rc, err := windows.WaitForSingleObject(event, ms)
+	if rc == windows.WAIT_OBJECT_0 {
+		return nil
+	}
+	if err != nil {
+		return err
+	}
+	return windows.Errno(rc)
 }
 
 func osLockErrorCode(err error, def _ErrorCode) _ErrorCode {

vfs/shm_windows.go

@@ -7,6 +7,7 @@ import (
 	"io"
 	"os"
 	"sync"
+	"time"
 
 	"github.com/tetratelabs/wazero/api"
 	"golang.org/x/sys/windows"
@@ -26,9 +27,12 @@ type vfsShm struct {
 	ptrs     []ptr_t
 	stack    [1]stk_t
 	fileLock bool
+	blocking bool
 	sync.Mutex
 }
 
+var _ blockingSharedMemory = &vfsShm{}
+
 func (s *vfsShm) Close() error {
 	// Unmap regions.
 	for _, r := range s.regions {
@@ -42,11 +46,19 @@ func (s *vfsShm) Close() error {
 
 func (s *vfsShm) shmOpen() _ErrorCode {
 	if s.File == nil {
-		f, err := os.OpenFile(s.path, os.O_RDWR|os.O_CREATE, 0666)
+		path, err := windows.UTF16PtrFromString(s.path)
+		if err != nil {
+			return _CANTOPEN
+		}
+		h, err := windows.CreateFile(path,
+			windows.GENERIC_READ|windows.GENERIC_WRITE,
+			windows.FILE_SHARE_READ|windows.FILE_SHARE_WRITE,
+			nil, windows.OPEN_ALWAYS,
+			windows.FILE_ATTRIBUTE_NORMAL|windows.FILE_FLAG_OVERLAPPED, 0)
 		if err != nil {
 			return _CANTOPEN
 		}
-		s.File = f
+		s.File = os.NewFile(uintptr(h), s.path)
 	}
 	if s.fileLock {
 		return _OK
@@ -60,7 +72,7 @@ func (s *vfsShm) shmOpen() _ErrorCode {
 			return _IOERR_SHMOPEN
 		}
 	}
-	rc := osReadLock(s.File, _SHM_DMS, 1, 0)
+	rc := osReadLock(s.File, _SHM_DMS, 1, time.Millisecond)
 	s.fileLock = rc == _OK
 	return rc
 }
@@ -128,6 +140,11 @@ func (s *vfsShm) shmMap(ctx context.Context, mod api.Module, id, size int32, ext
 }
 
 func (s *vfsShm) shmLock(offset, n int32, flags _ShmFlag) (rc _ErrorCode) {
+	var timeout time.Duration
+	if s.blocking {
+		timeout = time.Millisecond
+	}
+
 	switch {
 	case flags&_SHM_LOCK != 0:
 		defer s.shmAcquire(&rc)
@@ -139,9 +156,9 @@ func (s *vfsShm) shmLock(offset, n int32, flags _ShmFlag) (rc _ErrorCode) {
 	case flags&_SHM_UNLOCK != 0:
 		return osUnlock(s.File, _SHM_BASE+uint32(offset), uint32(n))
 	case flags&_SHM_SHARED != 0:
-		return osReadLock(s.File, _SHM_BASE+uint32(offset), uint32(n), 0)
+		return osReadLock(s.File, _SHM_BASE+uint32(offset), uint32(n), timeout)
 	case flags&_SHM_EXCLUSIVE != 0:
-		return osWriteLock(s.File, _SHM_BASE+uint32(offset), uint32(n), 0)
+		return osWriteLock(s.File, _SHM_BASE+uint32(offset), uint32(n), timeout)
 	default:
 		panic(util.AssertErr())
 	}
@@ -172,3 +189,7 @@ func (s *vfsShm) shmUnmap(delete bool) {
 		os.Remove(s.path)
 	}
 }
+
+func (s *vfsShm) shmEnableBlocking(block bool) {
+	s.blocking = block
+}