diff options
| author | Ian Lance Taylor <iant@google.com> | 2015-01-15 00:27:56 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2015-01-15 00:27:56 +0000 |
| commit | f8d9fa9e80b57f89e7877ce6cad8a3464879009b (patch) | |
| tree | 58a1724fee16d2b03c65678c4dd9b50bb97137a9 /libgo/go/time/internal_test.go | |
| parent | 6bd3f109d8d8fa58eeccd6b3504721b4f20c00c2 (diff) | |
| download | gcc-f8d9fa9e80b57f89e7877ce6cad8a3464879009b.zip gcc-f8d9fa9e80b57f89e7877ce6cad8a3464879009b.tar.gz gcc-f8d9fa9e80b57f89e7877ce6cad8a3464879009b.tar.bz2 | |
libgo, compiler: Upgrade libgo to Go 1.4, except for runtime.
This upgrades all of libgo other than the runtime package to
the Go 1.4 release. In Go 1.4 much of the runtime was
rewritten into Go. Merging that code will take more time and
will not change the API, so I'm putting it off for now.
There are a few runtime changes anyhow, to accomodate other
packages that rely on minor modifications to the runtime
support.
The compiler changes slightly to add a one-bit flag to each
type descriptor kind that is stored directly in an interface,
which for gccgo is currently only pointer types. Another
one-bit flag (gcprog) is reserved because it is used by the gc
compiler, but gccgo does not currently use it.
There is another error check in the compiler since I ran
across it during testing.
gotools/:
* Makefile.am (go_cmd_go_files): Sort entries. Add generate.go.
* Makefile.in: Rebuild.
From-SVN: r219627
Diffstat (limited to 'libgo/go/time/internal_test.go')
| -rw-r--r-- | libgo/go/time/internal_test.go | 53 |
1 files changed, 10 insertions, 43 deletions
diff --git a/libgo/go/time/internal_test.go b/libgo/go/time/internal_test.go index 2243d36..edd523b 100644 --- a/libgo/go/time/internal_test.go +++ b/libgo/go/time/internal_test.go @@ -4,11 +4,6 @@ package time -import ( - "errors" - "runtime" -) - func init() { // force US/Pacific for time zone tests ForceUSPacificForTesting() @@ -17,14 +12,14 @@ func init() { var Interrupt = interrupt var DaysIn = daysIn -func empty(now int64, arg interface{}) {} +func empty(arg interface{}, seq uintptr) {} // Test that a runtimeTimer with a duration so large it overflows // does not cause other timers to hang. // // This test has to be in internal_test.go since it fiddles with // unexported data structures. -func CheckRuntimeTimerOverflow() error { +func CheckRuntimeTimerOverflow() { // We manually create a runtimeTimer to bypass the overflow // detection logic in NewTimer: we're testing the underlying // runtime.addtimer function. @@ -35,17 +30,7 @@ func CheckRuntimeTimerOverflow() error { } startTimer(r) - timeout := 100 * Millisecond - switch runtime.GOOS { - // Allow more time for gobuilder to succeed. - case "windows": - timeout = Second - case "plan9": - // TODO(0intro): We don't know why it is needed. - timeout = 3 * Second - } - - // Start a goroutine that should send on t.C before the timeout. + // Start a goroutine that should send on t.C right away. t := NewTimer(1) defer func() { @@ -64,29 +49,11 @@ func CheckRuntimeTimerOverflow() error { startTimer(r) }() - // Try to receive from t.C before the timeout. It will succeed - // iff the previous sleep was able to finish. We're forced to - // spin and yield after trying to receive since we can't start - // any more timers (they might hang due to the same bug we're - // now testing). - stop := Now().Add(timeout) - for { - select { - case <-t.C: - return nil // It worked! - default: - if Now().After(stop) { - return errors.New("runtime timer stuck: overflow in addtimer") - } - // Issue 6874. This test previously called runtime.Gosched to try to yield - // to the goroutine servicing t, however the scheduler has a bias towards the - // previously running goroutine in an idle system. Combined with high load due - // to all CPUs busy running tests t's goroutine could be delayed beyond the - // timeout window. - // - // Calling runtime.GC() reduces the worst case lantency for scheduling t by 20x - // under the current Go 1.3 scheduler. - runtime.GC() - } - } + // If the test fails, we will hang here until the timeout in the testing package + // fires, which is 10 minutes. It would be nice to catch the problem sooner, + // but there is no reliable way to guarantee that timerproc schedules without + // doing something involving timerproc itself. Previous failed attempts have + // tried calling runtime.Gosched and runtime.GC, but neither is reliable. + // So we fall back to hope: We hope we don't hang here. + <-t.C } |