Skip to content

Commit 9b3ccc0

Browse files
davecheneydavecheney
committed
syscall: split implementation of Pipe/Pipe2 per GOOS
Updates #9974 This proposal moves the definition of Pipe an Pipe2 from the generic syscall_linux.go to the GOOS specific variants. This is in preparation for the arm64 port. For platforms where pipe2(2) is not supported in the minimum 2.6.23 kernel, amd64 and 386, we retain pipe(2). For all other platforms pipe(2) is removed and Pipe forwards to pipe2(2). Because mksycall.pl does not sort symbols before generating the output file the diff includes some unavoidable code moves as Pipe and Pipe2 are processed latter in the run. Discussion: https://groups.google.com/forum/#!topic/golang-dev/zpeFtN2z5Fc Change-Id: Ie26d6761eeb9760dbaff974ee8bc0d57a9ceaee4 Reviewed-on: https://go-review.googlesource.com/5833 Reviewed-by: Brad Fitzpatrick <[email protected]> Run-TryBot: Brad Fitzpatrick <[email protected]>
1 parent 7ce0261 commit 9b3ccc0

10 files changed

+170
-126
lines changed

‎src/syscall/syscall_linux.go

-26
Original file line numberDiff line numberDiff line change
@@ -29,32 +29,6 @@ func Openat(dirfd int, path string, flags int, mode uint32) (fd int, err error)
2929
return openat(dirfd, path, flags|O_LARGEFILE, mode)
3030
}
3131

32-
//sysnb pipe(p *[2]_C_int) (err error)
33-
34-
func Pipe(p []int) (err error) {
35-
if len(p) != 2 {
36-
return EINVAL
37-
}
38-
var pp [2]_C_int
39-
err = pipe(&pp)
40-
p[0] = int(pp[0])
41-
p[1] = int(pp[1])
42-
return
43-
}
44-
45-
//sysnb pipe2(p *[2]_C_int, flags int) (err error)
46-
47-
func Pipe2(p []int, flags int) (err error) {
48-
if len(p) != 2 {
49-
return EINVAL
50-
}
51-
var pp [2]_C_int
52-
err = pipe2(&pp, flags)
53-
p[0] = int(pp[0])
54-
p[1] = int(pp[1])
55-
return
56-
}
57-
5832
//sys utimes(path string, times *[2]Timeval) (err error)
5933

6034
func Utimes(path string, tv []Timeval) (err error) {

‎src/syscall/syscall_linux_386.go

+26
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,32 @@ func NsecToTimeval(nsec int64) (tv Timeval) {
2828
return
2929
}
3030

31+
//sysnb pipe(p *[2]_C_int) (err error)
32+
33+
func Pipe(p []int) (err error) {
34+
if len(p) != 2 {
35+
return EINVAL
36+
}
37+
var pp [2]_C_int
38+
err = pipe(&pp)
39+
p[0] = int(pp[0])
40+
p[1] = int(pp[1])
41+
return
42+
}
43+
44+
//sysnb pipe2(p *[2]_C_int, flags int) (err error)
45+
46+
func Pipe2(p []int, flags int) (err error) {
47+
if len(p) != 2 {
48+
return EINVAL
49+
}
50+
var pp [2]_C_int
51+
err = pipe2(&pp, flags)
52+
p[0] = int(pp[0])
53+
p[1] = int(pp[1])
54+
return
55+
}
56+
3157
// 64-bit file system and 32-bit uid calls
3258
// (386 default is 32-bit file system and 16-bit uid).
3359
//sys Chown(path string, uid int, gid int) (err error) = SYS_CHOWN32

‎src/syscall/syscall_linux_amd64.go

+26
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,32 @@ func NsecToTimeval(nsec int64) (tv Timeval) {
9797
return
9898
}
9999

100+
//sysnb pipe(p *[2]_C_int) (err error)
101+
102+
func Pipe(p []int) (err error) {
103+
if len(p) != 2 {
104+
return EINVAL
105+
}
106+
var pp [2]_C_int
107+
err = pipe(&pp)
108+
p[0] = int(pp[0])
109+
p[1] = int(pp[1])
110+
return
111+
}
112+
113+
//sysnb pipe2(p *[2]_C_int, flags int) (err error)
114+
115+
func Pipe2(p []int, flags int) (err error) {
116+
if len(p) != 2 {
117+
return EINVAL
118+
}
119+
var pp [2]_C_int
120+
err = pipe2(&pp, flags)
121+
p[0] = int(pp[0])
122+
p[1] = int(pp[1])
123+
return
124+
}
125+
100126
func (r *PtraceRegs) PC() uint64 { return r.Rip }
101127

102128
func (r *PtraceRegs) SetPC(pc uint64) { r.Rip = pc }

‎src/syscall/syscall_linux_arm.go

+24
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,30 @@ func NsecToTimeval(nsec int64) (tv Timeval) {
2323
return
2424
}
2525

26+
func Pipe(p []int) (err error) {
27+
if len(p) != 2 {
28+
return EINVAL
29+
}
30+
var pp [2]_C_int
31+
err = pipe2(&pp, 0)
32+
p[0] = int(pp[0])
33+
p[1] = int(pp[1])
34+
return
35+
}
36+
37+
//sysnb pipe2(p *[2]_C_int, flags int) (err error)
38+
39+
func Pipe2(p []int, flags int) (err error) {
40+
if len(p) != 2 {
41+
return EINVAL
42+
}
43+
var pp [2]_C_int
44+
err = pipe2(&pp, flags)
45+
p[0] = int(pp[0])
46+
p[1] = int(pp[1])
47+
return
48+
}
49+
2650
// Underlying system call writes to newoffset via pointer.
2751
// Implemented in assembly to avoid allocation.
2852
func seek(fd int, offset int64, whence int) (newoffset int64, err Errno)

‎src/syscall/syscall_linux_ppc64x.go

+24
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,30 @@ func NsecToTimeval(nsec int64) (tv Timeval) {
8080
return
8181
}
8282

83+
func Pipe(p []int) (err error) {
84+
if len(p) != 2 {
85+
return EINVAL
86+
}
87+
var pp [2]_C_int
88+
err = pipe2(&pp, 0)
89+
p[0] = int(pp[0])
90+
p[1] = int(pp[1])
91+
return
92+
}
93+
94+
//sysnb pipe2(p *[2]_C_int, flags int) (err error)
95+
96+
func Pipe2(p []int, flags int) (err error) {
97+
if len(p) != 2 {
98+
return EINVAL
99+
}
100+
var pp [2]_C_int
101+
err = pipe2(&pp, flags)
102+
p[0] = int(pp[0])
103+
p[1] = int(pp[1])
104+
return
105+
}
106+
83107
func (r *PtraceRegs) PC() uint64 { return r.Nip }
84108

85109
func (r *PtraceRegs) SetPC(pc uint64) { r.Nip = pc }

‎src/syscall/zsyscall_linux_386.go

+20-20
Original file line numberDiff line numberDiff line change
@@ -41,26 +41,6 @@ func openat(dirfd int, path string, flags int, mode uint32) (fd int, err error)
4141

4242
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
4343

44-
func pipe(p *[2]_C_int) (err error) {
45-
_, _, e1 := RawSyscall(SYS_PIPE, uintptr(unsafe.Pointer(p)), 0, 0)
46-
if e1 != 0 {
47-
err = e1
48-
}
49-
return
50-
}
51-
52-
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
53-
54-
func pipe2(p *[2]_C_int, flags int) (err error) {
55-
_, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
56-
if e1 != 0 {
57-
err = e1
58-
}
59-
return
60-
}
61-
62-
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
63-
6444
func utimes(path string, times *[2]Timeval) (err error) {
6545
var _p0 *byte
6646
_p0, err = BytePtrFromString(path)
@@ -1396,6 +1376,26 @@ func Munlockall() (err error) {
13961376

13971377
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
13981378

1379+
func pipe(p *[2]_C_int) (err error) {
1380+
_, _, e1 := RawSyscall(SYS_PIPE, uintptr(unsafe.Pointer(p)), 0, 0)
1381+
if e1 != 0 {
1382+
err = e1
1383+
}
1384+
return
1385+
}
1386+
1387+
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
1388+
1389+
func pipe2(p *[2]_C_int, flags int) (err error) {
1390+
_, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
1391+
if e1 != 0 {
1392+
err = e1
1393+
}
1394+
return
1395+
}
1396+
1397+
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
1398+
13991399
func Chown(path string, uid int, gid int) (err error) {
14001400
var _p0 *byte
14011401
_p0, err = BytePtrFromString(path)

‎src/syscall/zsyscall_linux_amd64.go

+20-20
Original file line numberDiff line numberDiff line change
@@ -41,26 +41,6 @@ func openat(dirfd int, path string, flags int, mode uint32) (fd int, err error)
4141

4242
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
4343

44-
func pipe(p *[2]_C_int) (err error) {
45-
_, _, e1 := RawSyscall(SYS_PIPE, uintptr(unsafe.Pointer(p)), 0, 0)
46-
if e1 != 0 {
47-
err = e1
48-
}
49-
return
50-
}
51-
52-
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
53-
54-
func pipe2(p *[2]_C_int, flags int) (err error) {
55-
_, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
56-
if e1 != 0 {
57-
err = e1
58-
}
59-
return
60-
}
61-
62-
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
63-
6444
func utimes(path string, times *[2]Timeval) (err error) {
6545
var _p0 *byte
6646
_p0, err = BytePtrFromString(path)
@@ -1959,3 +1939,23 @@ func mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int6
19591939
}
19601940
return
19611941
}
1942+
1943+
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
1944+
1945+
func pipe(p *[2]_C_int) (err error) {
1946+
_, _, e1 := RawSyscall(SYS_PIPE, uintptr(unsafe.Pointer(p)), 0, 0)
1947+
if e1 != 0 {
1948+
err = e1
1949+
}
1950+
return
1951+
}
1952+
1953+
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
1954+
1955+
func pipe2(p *[2]_C_int, flags int) (err error) {
1956+
_, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
1957+
if e1 != 0 {
1958+
err = e1
1959+
}
1960+
return
1961+
}

‎src/syscall/zsyscall_linux_arm.go

+10-20
Original file line numberDiff line numberDiff line change
@@ -41,26 +41,6 @@ func openat(dirfd int, path string, flags int, mode uint32) (fd int, err error)
4141

4242
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
4343

44-
func pipe(p *[2]_C_int) (err error) {
45-
_, _, e1 := RawSyscall(SYS_PIPE, uintptr(unsafe.Pointer(p)), 0, 0)
46-
if e1 != 0 {
47-
err = e1
48-
}
49-
return
50-
}
51-
52-
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
53-
54-
func pipe2(p *[2]_C_int, flags int) (err error) {
55-
_, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
56-
if e1 != 0 {
57-
err = e1
58-
}
59-
return
60-
}
61-
62-
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
63-
6444
func utimes(path string, times *[2]Timeval) (err error) {
6545
var _p0 *byte
6646
_p0, err = BytePtrFromString(path)
@@ -1396,6 +1376,16 @@ func Munlockall() (err error) {
13961376

13971377
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
13981378

1379+
func pipe2(p *[2]_C_int, flags int) (err error) {
1380+
_, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
1381+
if e1 != 0 {
1382+
err = e1
1383+
}
1384+
return
1385+
}
1386+
1387+
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
1388+
13991389
func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
14001390
r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
14011391
fd = int(r0)

‎src/syscall/zsyscall_linux_ppc64.go

+10-20
Original file line numberDiff line numberDiff line change
@@ -41,26 +41,6 @@ func openat(dirfd int, path string, flags int, mode uint32) (fd int, err error)
4141

4242
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
4343

44-
func pipe(p *[2]_C_int) (err error) {
45-
_, _, e1 := RawSyscall(SYS_PIPE, uintptr(unsafe.Pointer(p)), 0, 0)
46-
if e1 != 0 {
47-
err = e1
48-
}
49-
return
50-
}
51-
52-
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
53-
54-
func pipe2(p *[2]_C_int, flags int) (err error) {
55-
_, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
56-
if e1 != 0 {
57-
err = e1
58-
}
59-
return
60-
}
61-
62-
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
63-
6444
func utimes(path string, times *[2]Timeval) (err error) {
6545
var _p0 *byte
6646
_p0, err = BytePtrFromString(path)
@@ -1980,3 +1960,13 @@ func Time(t *Time_t) (tt Time_t, err error) {
19801960
}
19811961
return
19821962
}
1963+
1964+
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
1965+
1966+
func pipe2(p *[2]_C_int, flags int) (err error) {
1967+
_, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
1968+
if e1 != 0 {
1969+
err = e1
1970+
}
1971+
return
1972+
}

‎src/syscall/zsyscall_linux_ppc64le.go

+10-20
Original file line numberDiff line numberDiff line change
@@ -41,26 +41,6 @@ func openat(dirfd int, path string, flags int, mode uint32) (fd int, err error)
4141

4242
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
4343

44-
func pipe(p *[2]_C_int) (err error) {
45-
_, _, e1 := RawSyscall(SYS_PIPE, uintptr(unsafe.Pointer(p)), 0, 0)
46-
if e1 != 0 {
47-
err = e1
48-
}
49-
return
50-
}
51-
52-
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
53-
54-
func pipe2(p *[2]_C_int, flags int) (err error) {
55-
_, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
56-
if e1 != 0 {
57-
err = e1
58-
}
59-
return
60-
}
61-
62-
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
63-
6444
func utimes(path string, times *[2]Timeval) (err error) {
6545
var _p0 *byte
6646
_p0, err = BytePtrFromString(path)
@@ -1980,3 +1960,13 @@ func Time(t *Time_t) (tt Time_t, err error) {
19801960
}
19811961
return
19821962
}
1963+
1964+
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
1965+
1966+
func pipe2(p *[2]_C_int, flags int) (err error) {
1967+
_, _, e1 := RawSyscall(SYS_PIPE2, uintptr(unsafe.Pointer(p)), uintptr(flags), 0)
1968+
if e1 != 0 {
1969+
err = e1
1970+
}
1971+
return
1972+
}

0 commit comments

Comments
 (0)