Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings
/goPublic

Commit2041d55

Browse files
adgrsc
authored andcommitted
[release-branch.go1.1] syscall: prlimit argument error for Getrlimit and Setrlimit on Linux 32-bit
««« CL 11803043 / ba52f6399462syscall: prlimit argument error for Getrlimit and Setrlimit on Linux 32-bitThe rlimit arguments for prlimit are reversed for linux 32-bit (386 and arm).Getrlimit becomes Setrlimit and vice versa.Fixes#5949.R=iant, mikioh.mikioh, rscCC=golang-devhttps://golang.org/cl/11803043»»»Update#5928R=golang-dev, daveCC=golang-devhttps://golang.org/cl/11996043
1 parent3e91713 commit2041d55

File tree

3 files changed

+45
-4
lines changed

3 files changed

+45
-4
lines changed
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
// Copyright 2013 The Go Authors. All rights reserved.
2+
// Use of this source code is governed by a BSD-style
3+
// license that can be found in the LICENSE file.
4+
5+
package syscall_test
6+
7+
import (
8+
"syscall"
9+
"testing"
10+
)
11+
12+
funcTestRlimit(t*testing.T) {
13+
varrlimit,zero syscall.Rlimit
14+
err:=syscall.Getrlimit(syscall.RLIMIT_NOFILE,&rlimit)
15+
iferr!=nil {
16+
t.Fatalf("Getrlimit: save failed: %v",err)
17+
}
18+
ifzero==rlimit {
19+
t.Fatalf("Getrlimit: save failed: got zero value %#v",rlimit)
20+
}
21+
set:=rlimit
22+
set.Cur=set.Max-1
23+
err=syscall.Setrlimit(syscall.RLIMIT_NOFILE,&set)
24+
iferr!=nil {
25+
t.Fatalf("Setrlimit: set failed: %#v %v",set,err)
26+
}
27+
varget syscall.Rlimit
28+
err=syscall.Getrlimit(syscall.RLIMIT_NOFILE,&get)
29+
iferr!=nil {
30+
t.Fatalf("Getrlimit: get failed: %v",err)
31+
}
32+
set=rlimit
33+
set.Cur=set.Max-1
34+
ifset!=get {
35+
t.Fatalf("Rlimit: change failed: wanted %#v got %#v",set,get)
36+
}
37+
err=syscall.Setrlimit(syscall.RLIMIT_NOFILE,&rlimit)
38+
iferr!=nil {
39+
t.Fatalf("Setrlimit: restore failed: %#v %v",rlimit,err)
40+
}
41+
}

‎src/pkg/syscall/syscall_linux_386.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ const rlimInf32 = ^uint32(0)
7878
constrlimInf64=^uint64(0)
7979

8080
funcGetrlimit(resourceint,rlim*Rlimit) (errerror) {
81-
err=prlimit(0,resource,rlim,nil)
81+
err=prlimit(0,resource,nil,rlim)
8282
iferr!=ENOSYS {
8383
returnerr
8484
}
@@ -106,7 +106,7 @@ func Getrlimit(resource int, rlim *Rlimit) (err error) {
106106
//sysnb setrlimit(resource int, rlim *rlimit32) (err error) = SYS_SETRLIMIT
107107

108108
funcSetrlimit(resourceint,rlim*Rlimit) (errerror) {
109-
err=prlimit(0,resource,nil,rlim)
109+
err=prlimit(0,resource,rlim,nil)
110110
iferr!=ENOSYS {
111111
returnerr
112112
}

‎src/pkg/syscall/syscall_linux_arm.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ const rlimInf32 = ^uint32(0)
119119
constrlimInf64=^uint64(0)
120120

121121
funcGetrlimit(resourceint,rlim*Rlimit) (errerror) {
122-
err=prlimit(0,resource,rlim,nil)
122+
err=prlimit(0,resource,nil,rlim)
123123
iferr!=ENOSYS {
124124
returnerr
125125
}
@@ -147,7 +147,7 @@ func Getrlimit(resource int, rlim *Rlimit) (err error) {
147147
//sysnb setrlimit(resource int, rlim *rlimit32) (err error) = SYS_SETRLIMIT
148148

149149
funcSetrlimit(resourceint,rlim*Rlimit) (errerror) {
150-
err=prlimit(0,resource,nil,rlim)
150+
err=prlimit(0,resource,rlim,nil)
151151
iferr!=ENOSYS {
152152
returnerr
153153
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp