mirror of https://github.com/golang/go.git
all: use one 'l' when cancelling everywhere except Solaris
Fixes #11626. Change-Id: I1b70c0844473c3b57a53d7cca747ea5cdc68d232 Reviewed-on: https://go-review.googlesource.com/14526 Run-TryBot: Rob Pike <r@golang.org> TryBot-Result: Gobot Gobot <gobot@golang.org> Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
This commit is contained in:
parent
f4f0344fe2
commit
67ddae87b9
|
|
@ -3,7 +3,7 @@
|
|||
// license that can be found in the LICENSE file.
|
||||
|
||||
// Test that pthread_cancel works as expected
|
||||
// (NPTL uses SIGRTMIN to implement thread cancellation)
|
||||
// (NPTL uses SIGRTMIN to implement thread cancelation)
|
||||
// See https://golang.org/issue/6997
|
||||
package cgotest
|
||||
|
||||
|
|
@ -32,7 +32,7 @@ func test6997(t *testing.T) {
|
|||
select {
|
||||
case r = <-c:
|
||||
if r == 0 {
|
||||
t.Error("pthread finished but wasn't cancelled??")
|
||||
t.Error("pthread finished but wasn't canceled??")
|
||||
}
|
||||
case <-time.After(30 * time.Second):
|
||||
t.Error("hung in pthread_cancel/pthread_join")
|
||||
|
|
|
|||
|
|
@ -1272,7 +1272,7 @@ func (z *Float) usub(x, y *Float) {
|
|||
ex = ey
|
||||
}
|
||||
|
||||
// operands may have cancelled each other out
|
||||
// operands may have canceled each other out
|
||||
if len(z.mant) == 0 {
|
||||
z.acc = Exact
|
||||
z.form = zero
|
||||
|
|
|
|||
|
|
@ -1272,7 +1272,7 @@ func (z *Float) usub(x, y *Float) {
|
|||
ex = ey
|
||||
}
|
||||
|
||||
// operands may have cancelled each other out
|
||||
// operands may have canceled each other out
|
||||
if len(z.mant) == 0 {
|
||||
z.acc = Exact
|
||||
z.form = zero
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ import "math"
|
|||
// 1/2
|
||||
// Im w = [ (r - x)/2 ] .
|
||||
//
|
||||
// Cancellation error in r-x or r+x is avoided by using the
|
||||
// Cancelation error in r-x or r+x is avoided by using the
|
||||
// identity 2 Re w Im w = y.
|
||||
//
|
||||
// Note that -w is also a square root of z. The root chosen
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ package math
|
|||
// = 1/sqrt(2) * (cos(x) + sin(x))
|
||||
// sin(x0) = sin(x)cos(pi/4)-cos(x)sin(pi/4)
|
||||
// = 1/sqrt(2) * (sin(x) - cos(x))
|
||||
// (To avoid cancellation, use
|
||||
// (To avoid cancelation, use
|
||||
// sin(x) +- cos(x) = -cos(2x)/(sin(x) -+ cos(x))
|
||||
// to compute the worse one.)
|
||||
//
|
||||
|
|
@ -188,7 +188,7 @@ func Y0(x float64) float64 {
|
|||
// = 1/sqrt(2) * (sin(x) + cos(x))
|
||||
// sin(x0) = sin(x)cos(3pi/4)-cos(x)sin(3pi/4)
|
||||
// = 1/sqrt(2) * (sin(x) - cos(x))
|
||||
// To avoid cancellation, use
|
||||
// To avoid cancelation, use
|
||||
// sin(x) +- cos(x) = -cos(2x)/(sin(x) -+ cos(x))
|
||||
// to compute the worse one.
|
||||
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ package math
|
|||
// = 1/sqrt(2) * (sin(x) - cos(x))
|
||||
// sin(x1) = sin(x)cos(3pi/4)-cos(x)sin(3pi/4)
|
||||
// = -1/sqrt(2) * (sin(x) + cos(x))
|
||||
// (To avoid cancellation, use
|
||||
// (To avoid cancelation, use
|
||||
// sin(x) +- cos(x) = -cos(2x)/(sin(x) -+ cos(x))
|
||||
// to compute the worse one.)
|
||||
//
|
||||
|
|
@ -197,7 +197,7 @@ func Y1(x float64) float64 {
|
|||
// = 1/sqrt(2) * (sin(x) - cos(x))
|
||||
// sin(x0) = sin(x)cos(3pi/4)-cos(x)sin(3pi/4)
|
||||
// = -1/sqrt(2) * (cos(x) + sin(x))
|
||||
// To avoid cancellation, use
|
||||
// To avoid cancelation, use
|
||||
// sin(x) +- cos(x) = -cos(2x)/(sin(x) -+ cos(x))
|
||||
// to compute the worse one.
|
||||
|
||||
|
|
|
|||
|
|
@ -208,7 +208,7 @@ func (s *ioSrv) ExecIO(o *operation, name string, submit func(o *operation) erro
|
|||
s.req <- ioSrvReq{o, nil}
|
||||
<-o.errc
|
||||
}
|
||||
// Wait for cancellation to complete.
|
||||
// Wait for cancelation to complete.
|
||||
fd.pd.WaitCanceled(int(o.mode))
|
||||
if o.errno != 0 {
|
||||
err = syscall.Errno(o.errno)
|
||||
|
|
@ -217,8 +217,8 @@ func (s *ioSrv) ExecIO(o *operation, name string, submit func(o *operation) erro
|
|||
}
|
||||
return 0, err
|
||||
}
|
||||
// We issued cancellation request. But, it seems, IO operation succeeded
|
||||
// before cancellation request run. We need to treat IO operation as
|
||||
// We issued a cancelation request. But, it seems, IO operation succeeded
|
||||
// before the cancelation request run. We need to treat the IO operation as
|
||||
// succeeded (the bytes are actually sent/recv from network).
|
||||
return int(o.qty), nil
|
||||
}
|
||||
|
|
|
|||
|
|
@ -225,7 +225,7 @@ func TestReverseProxyFlushInterval(t *testing.T) {
|
|||
}
|
||||
}
|
||||
|
||||
func TestReverseProxyCancellation(t *testing.T) {
|
||||
func TestReverseProxyCancelation(t *testing.T) {
|
||||
if runtime.GOOS == "plan9" {
|
||||
t.Skip("skipping test; see https://golang.org/issue/9554")
|
||||
}
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ var sigtable = [...]sigTabT{
|
|||
/* 33 */ {_SigNotify, "SIGLWP: reserved signal no longer used by"},
|
||||
/* 34 */ {_SigNotify, "SIGFREEZE: special signal used by CPR"},
|
||||
/* 35 */ {_SigNotify, "SIGTHAW: special signal used by CPR"},
|
||||
/* 36 */ {0, "SIGCANCEL: reserved signal for thread cancellation"},
|
||||
/* 36 */ {0, "SIGCANCEL: reserved signal for thread cancellation"}, // Oracle's spelling of cancelation.
|
||||
/* 37 */ {_SigNotify, "SIGLOST: resource lost (eg, record-lock lost)"},
|
||||
/* 38 */ {_SigNotify, "SIGXRES: resource control exceeded"},
|
||||
/* 39 */ {_SigNotify, "SIGJVM1: reserved signal for Java Virtual Machine"},
|
||||
|
|
|
|||
Loading…
Reference in New Issue