Commit 4c30ca06 authored by David Symonds's avatar David Symonds

time: split os-dependent part into sys.go.

R=rsc
CC=golang-dev
https://golang.org/cl/4259051
parent 9442e951
...@@ -8,6 +8,7 @@ TARG=time ...@@ -8,6 +8,7 @@ TARG=time
GOFILES=\ GOFILES=\
format.go\ format.go\
sleep.go\ sleep.go\
sys.go\
tick.go\ tick.go\
time.go\ time.go\
......
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
package time package time
import ( import (
"os"
"syscall" "syscall"
"sync" "sync"
"container/heap" "container/heap"
...@@ -47,30 +46,6 @@ func init() { ...@@ -47,30 +46,6 @@ func init() {
timers.Push(&Timer{t: forever}) // sentinel timers.Push(&Timer{t: forever}) // sentinel
} }
// Sleep pauses the current goroutine for at least ns nanoseconds.
// Higher resolution sleeping may be provided by syscall.Nanosleep
// on some operating systems.
func Sleep(ns int64) os.Error {
_, err := sleep(Nanoseconds(), ns)
return err
}
// sleep takes the current time and a duration,
// pauses for at least ns nanoseconds, and
// returns the current time and an error.
func sleep(t, ns int64) (int64, os.Error) {
// TODO(cw): use monotonic-time once it's available
end := t + ns
for t < end {
errno := syscall.Sleep(end - t)
if errno != 0 && errno != syscall.EINTR {
return 0, os.NewSyscallError("sleep", errno)
}
t = Nanoseconds()
}
return t, nil
}
// NewTimer creates a new Timer that will send // NewTimer creates a new Timer that will send
// the current time on its channel after at least ns nanoseconds. // the current time on its channel after at least ns nanoseconds.
func NewTimer(ns int64) *Timer { func NewTimer(ns int64) *Timer {
......
// Copyright 2009 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.
package time
import (
"os"
"syscall"
)
// Seconds reports the number of seconds since the Unix epoch,
// January 1, 1970 00:00:00 UTC.
func Seconds() int64 {
sec, _, err := os.Time()
if err != nil {
panic(err)
}
return sec
}
// Nanoseconds reports the number of nanoseconds since the Unix epoch,
// January 1, 1970 00:00:00 UTC.
func Nanoseconds() int64 {
sec, nsec, err := os.Time()
if err != nil {
panic(err)
}
return sec*1e9 + nsec
}
// Sleep pauses the current goroutine for at least ns nanoseconds.
// Higher resolution sleeping may be provided by syscall.Nanosleep
// on some operating systems.
func Sleep(ns int64) os.Error {
_, err := sleep(Nanoseconds(), ns)
return err
}
// sleep takes the current time and a duration,
// pauses for at least ns nanoseconds, and
// returns the current time and an error.
func sleep(t, ns int64) (int64, os.Error) {
// TODO(cw): use monotonic-time once it's available
end := t + ns
for t < end {
errno := syscall.Sleep(end - t)
if errno != 0 && errno != syscall.EINTR {
return 0, os.NewSyscallError("sleep", errno)
}
t = Nanoseconds()
}
return t, nil
}
...@@ -6,30 +6,6 @@ ...@@ -6,30 +6,6 @@
// displaying time. // displaying time.
package time package time
import (
"os"
)
// Seconds reports the number of seconds since the Unix epoch,
// January 1, 1970 00:00:00 UTC.
func Seconds() int64 {
sec, _, err := os.Time()
if err != nil {
panic(err)
}
return sec
}
// Nanoseconds reports the number of nanoseconds since the Unix epoch,
// January 1, 1970 00:00:00 UTC.
func Nanoseconds() int64 {
sec, nsec, err := os.Time()
if err != nil {
panic(err)
}
return sec*1e9 + nsec
}
// Days of the week. // Days of the week.
const ( const (
Sunday = iota Sunday = iota
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment