Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
runtime: co-exist with NPTL's pthread_cancel.
NPTL uses SIGRTMIN (signal 32) to effect thread cancellation. Go's runtime replaces NPTL's signal handler with its own, and ends up aborting if a C library that ends up calling pthread_cancel is used. This patch prevents runtime from replacing NPTL's handler. Fixes #6997. R=golang-codereviews, iant, dvyukov CC=golang-codereviews https://golang.org/cl/47540043
- Loading branch information
1 parent
d1ba298
commit c4770b9
Showing
4 changed files
with
68 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
// Copyright 2014 The Go Authors. All rights reserved. | ||
// Use of this source code is governed by a BSD-style | ||
// license that can be found in the LICENSE file. | ||
|
||
#include <pthread.h> | ||
#include <stdio.h> | ||
#include <unistd.h> | ||
|
||
static pthread_t thread; | ||
|
||
static void* threadfunc(void* dummy) { | ||
while(1) { | ||
sleep(1); | ||
} | ||
} | ||
|
||
int StartThread() { | ||
return pthread_create(&thread, NULL, &threadfunc, NULL); | ||
} | ||
|
||
int CancelThread() { | ||
void *r; | ||
pthread_cancel(thread); | ||
pthread_join(thread, &r); | ||
return (r == PTHREAD_CANCELED); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
// Copyright 2014 The Go Authors. All rights reserved. | ||
// Use of this source code is governed by a BSD-style | ||
// license that can be found in the LICENSE file. | ||
|
||
// Test that pthread_cancel works as expected | ||
// (NPTL uses SIGRTMIN to implement thread cancellation) | ||
// See http://golang.org/issue/6997 | ||
package cgotest | ||
|
||
/* | ||
#cgo CFLAGS: -pthread | ||
#cgo LDFLAGS: -pthread | ||
extern int StartThread(); | ||
extern int CancelThread(); | ||
*/ | ||
import "C" | ||
|
||
import "testing" | ||
import "time" | ||
|
||
func test6997(t *testing.T) { | ||
r := C.StartThread() | ||
if r != 0 { | ||
t.Error("pthread_create failed") | ||
} | ||
c := make(chan C.int) | ||
go func() { | ||
time.Sleep(500 * time.Millisecond) | ||
c <- C.CancelThread() | ||
}() | ||
|
||
select { | ||
case r = <-c: | ||
if r == 0 { | ||
t.Error("pthread finished but wasn't cancelled??") | ||
} | ||
case <-time.After(5 * time.Second): | ||
t.Error("hung in pthread_cancel/pthread_join") | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters