<a href="https://github.com/bytedance/sonic/blob/8c71eb047516a6b70f216887923f353f42d05

mmap_unix.go missing BSD in Go build tag about sonic HOT 4 CLOSED

vendion commented on August 16, 2024

mmap_unix.go missing BSD in Go build tag

from sonic.

Comments (4)

AsterDY commented on August 16, 2024

didn't try before. Are you interested in giving a PR?

from sonic.

vendion commented on August 16, 2024

Well it is a very simple change as the syscalls for the BSDs should match those for Darwin (based on BSD anyways) & Linux so something like this should be more than enough:

diff --git a/loader/mmap_unix.go b/loader/mmap_unix.go
index 3ea944e..1d15e54 100644
--- a/loader/mmap_unix.go
+++ b/loader/mmap_unix.go
@@ -1,5 +1,5 @@
-//go:build darwin || linux
-// +build darwin linux
+//go:build !windows
+// +build !windows

 /**
  * Copyright 2023 ByteDance Inc.

Unless you have reasons for being explict in this case.

from sonic.

vendion commented on August 16, 2024

I didn't submit a PR, as it's a one line change and that the formatting of the file doesn't follow the standard gofmt standard so the whole flie would end up being needlessly modified.

diff --git a/loader/mmap_unix.go b/loader/mmap_unix.go
index 3ea944e..1d15e54 100644
--- a/loader/mmap_unix.go
+++ b/loader/mmap_unix.go
@@ -1,5 +1,5 @@
-//go:build darwin || linux
-// +build darwin linux
+//go:build !windows
+// +build !windows

 /**
  * Copyright 2023 ByteDance Inc.
@@ -20,26 +20,25 @@
 package loader

 import (
-    `syscall`
+	"syscall"
 )

 const (
-    _AP = syscall.MAP_ANON  | syscall.MAP_PRIVATE
-    _RX = syscall.PROT_READ | syscall.PROT_EXEC
-    _RW = syscall.PROT_READ | syscall.PROT_WRITE
+	_AP = syscall.MAP_ANON | syscall.MAP_PRIVATE
+	_RX = syscall.PROT_READ | syscall.PROT_EXEC
+	_RW = syscall.PROT_READ | syscall.PROT_WRITE
 )

-
 func mmap(nb int) uintptr {
-    if m, _, e := syscall.RawSyscall6(syscall.SYS_MMAP, 0, uintptr(nb), _RW, _AP, 0, 0); e != 0 {
-        panic(e)
-    } else {
-        return m
-    }
+	if m, _, e := syscall.RawSyscall6(syscall.SYS_MMAP, 0, uintptr(nb), _RW, _AP, 0, 0); e != 0 {
+		panic(e)
+	} else {
+		return m
+	}
 }

 func mprotect(p uintptr, nb int) {
-    if _, _, err := syscall.RawSyscall(syscall.SYS_MPROTECT, p, uintptr(nb), _RX); err != 0 {
-        panic(err)
-    }
+	if _, _, err := syscall.RawSyscall(syscall.SYS_MPROTECT, p, uintptr(nb), _RX); err != 0 {
+		panic(err)
+	}
 }

from sonic.

AsterDY commented on August 16, 2024

ok，I will submit it

from sonic.

Recommend Projects