WIP: Try a fix for Linux os.Exit stalls.

dmitshur · dmitshur · commit aed37b54cfaa · 2018-02-16T12:51:56.000-05:00
diff --git a/compiler/natives/src/syscall/syscall.go b/compiler/natives/src/syscall/syscall.go
@@ -50,7 +50,7 @@ func use(p unsafe.Pointer) {
 }
 
 func Exit(code int) {
-	Syscall(SYS_EXIT, uintptr(code), 0, 0)
+	Syscall(exitTrap, uintptr(code), 0, 0)
 }
 
 // indexByte is copied from bytes package to avoid importing it (since the real syscall package doesn't).
diff --git a/compiler/natives/src/syscall/syscall_linux.go b/compiler/natives/src/syscall/syscall_linux.go
@@ -0,0 +1,5 @@
+// +build js
+
+package syscall
+
+const exitTrap = SYS_EXIT_GROUP
diff --git a/compiler/natives/src/syscall/syscall_nonlinux.go b/compiler/natives/src/syscall/syscall_nonlinux.go
@@ -0,0 +1,5 @@
+// +build js,!linux
+
+package syscall
+
+const exitTrap = SYS_EXIT
diff --git a/compiler/natives/src/syscall/syscall_unix.go b/compiler/natives/src/syscall/syscall_unix.go
@@ -66,7 +66,7 @@ func Syscall(trap, a1, a2, a3 uintptr) (r1, r2 uintptr, err Errno) {
 		printToConsole(slice)
 		return uintptr(array.Length()), 0, 0
 	}
-	if trap == SYS_EXIT {
+	if trap == exitTrap {
 		runtime.Goexit()
 	}
 	printWarning()

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ func use(p unsafe.Pointer) {`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`func Exit(code int) {`
`53`		`- Syscall(SYS_EXIT, uintptr(code), 0, 0)`
	`53`	`+ Syscall(exitTrap, uintptr(code), 0, 0)`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`// indexByte is copied from bytes package to avoid importing it (since the real syscall package doesn't).`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ func Syscall(trap, a1, a2, a3 uintptr) (r1, r2 uintptr, err Errno) {`
`66`	`66`	`printToConsole(slice)`
`67`	`67`	`return uintptr(array.Length()), 0, 0`
`68`	`68`	`}`
`69`		`- if trap == SYS_EXIT {`
	`69`	`+ if trap == exitTrap {`
`70`	`70`	`runtime.Goexit()`
`71`	`71`	`}`
`72`	`72`	`printWarning()`