2011-02-03 20:41:26 -07:00
|
|
|
// 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.
|
|
|
|
|
all: merge NaCl branch (part 1)
See golang.org/s/go13nacl for design overview.
This CL is the mostly mechanical changes from rsc's Go 1.2 based NaCl branch, specifically 39cb35750369 to 500771b477cf from https://code.google.com/r/rsc-go13nacl. This CL does not include working NaCl support, there are probably two or three more large merges to come.
CL 15750044 is not included as it involves more invasive changes to the linker which will need to be merged separately.
The exact change lists included are
15050047: syscall: support for Native Client
15360044: syscall: unzip implementation for Native Client
15370044: syscall: Native Client SRPC implementation
15400047: cmd/dist, cmd/go, go/build, test: support for Native Client
15410048: runtime: support for Native Client
15410049: syscall: file descriptor table for Native Client
15410050: syscall: in-memory file system for Native Client
15440048: all: update +build lines for Native Client port
15540045: cmd/6g, cmd/8g, cmd/gc: support for Native Client
15570045: os: support for Native Client
15680044: crypto/..., hash/crc32, reflect, sync/atomic: support for amd64p32
15690044: net: support for Native Client
15690048: runtime: support for fake time like on Go Playground
15690051: build: disable various tests on Native Client
LGTM=rsc
R=rsc
CC=golang-codereviews
https://golang.org/cl/68150047
2014-02-25 07:47:42 -07:00
|
|
|
// +build darwin dragonfly freebsd linux nacl netbsd openbsd solaris
|
build: add build comments to core packages
The go/build package already recognizes
system-specific file names like
mycode_darwin.go
mycode_darwin_386.go
mycode_386.s
However, it is also common to write files that
apply to multiple architectures, so a recent CL added
to go/build the ability to process comments
listing a set of conditions for building. For example:
// +build darwin freebsd openbsd/386
says that this file should be compiled only on
OS X, FreeBSD, or 32-bit x86 OpenBSD systems.
These conventions are not yet documented
(hence this long CL description).
This CL adds build comments to the multi-system
files in the core library, a step toward making it
possible to use go/build to build them.
With this change go/build can handle crypto/rand,
exec, net, path/filepath, os/user, and time.
os and syscall need additional adjustments.
R=golang-dev, r, gri, r, gustavo
CC=golang-dev
https://golang.org/cl/5011046
2011-09-15 14:48:57 -06:00
|
|
|
|
2011-02-03 20:41:26 -07:00
|
|
|
package os
|
|
|
|
|
|
|
|
import (
|
2011-11-01 19:49:08 -06:00
|
|
|
"errors"
|
2011-02-03 20:41:26 -07:00
|
|
|
"runtime"
|
|
|
|
"syscall"
|
2012-02-20 20:10:34 -07:00
|
|
|
"time"
|
2011-02-03 20:41:26 -07:00
|
|
|
)
|
|
|
|
|
2012-03-01 19:56:54 -07:00
|
|
|
func (p *Process) wait() (ps *ProcessState, err error) {
|
2011-02-03 20:41:26 -07:00
|
|
|
if p.Pid == -1 {
|
2012-02-16 16:04:29 -07:00
|
|
|
return nil, syscall.EINVAL
|
2011-02-03 20:41:26 -07:00
|
|
|
}
|
2016-06-09 23:24:40 -06:00
|
|
|
|
|
|
|
// If we can block until Wait4 will succeed immediately, do so.
|
|
|
|
ready, err := p.blockUntilWaitable()
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
if ready {
|
|
|
|
// Mark the process done now, before the call to Wait4,
|
|
|
|
// so that Process.signal will not send a signal.
|
|
|
|
p.setDone()
|
|
|
|
// Acquire a write lock on sigMu to wait for any
|
|
|
|
// active call to the signal method to complete.
|
|
|
|
p.sigMu.Lock()
|
|
|
|
p.sigMu.Unlock()
|
|
|
|
}
|
|
|
|
|
2011-02-03 20:41:26 -07:00
|
|
|
var status syscall.WaitStatus
|
2012-02-20 20:10:34 -07:00
|
|
|
var rusage syscall.Rusage
|
|
|
|
pid1, e := syscall.Wait4(p.Pid, &status, 0, &rusage)
|
2011-11-13 20:44:52 -07:00
|
|
|
if e != nil {
|
2011-02-03 20:41:26 -07:00
|
|
|
return nil, NewSyscallError("wait", e)
|
|
|
|
}
|
2012-02-19 21:36:08 -07:00
|
|
|
if pid1 != 0 {
|
2012-08-20 18:41:31 -06:00
|
|
|
p.setDone()
|
2011-07-11 16:47:42 -06:00
|
|
|
}
|
2012-02-20 20:10:34 -07:00
|
|
|
ps = &ProcessState{
|
|
|
|
pid: pid1,
|
2012-02-22 13:51:49 -07:00
|
|
|
status: status,
|
2012-02-20 20:10:34 -07:00
|
|
|
rusage: &rusage,
|
|
|
|
}
|
|
|
|
return ps, nil
|
2011-02-03 20:41:26 -07:00
|
|
|
}
|
|
|
|
|
2014-10-06 13:49:19 -06:00
|
|
|
var errFinished = errors.New("os: process already finished")
|
|
|
|
|
2012-03-01 19:56:54 -07:00
|
|
|
func (p *Process) signal(sig Signal) error {
|
2014-02-28 09:31:12 -07:00
|
|
|
if p.Pid == -1 {
|
|
|
|
return errors.New("os: process already released")
|
|
|
|
}
|
2014-10-06 13:49:19 -06:00
|
|
|
if p.Pid == 0 {
|
|
|
|
return errors.New("os: process not initialized")
|
|
|
|
}
|
2016-06-09 23:24:40 -06:00
|
|
|
p.sigMu.RLock()
|
|
|
|
defer p.sigMu.RUnlock()
|
2014-10-06 13:49:19 -06:00
|
|
|
if p.done() {
|
|
|
|
return errFinished
|
|
|
|
}
|
os/signal: selective signal handling
Restore package os/signal, with new API:
Notify replaces Incoming, allowing clients
to ask for certain signals only. Also, signals
go to everyone who asks, not just one client.
This could plausibly move into package os now
that there are no magic side effects as a result
of the import.
Update runtime for new API: move common Unix
signal handling code into signal_unix.c.
(It's so easy to do this now that we don't have
to edit Makefiles!)
Tested on darwin,linux 386,amd64.
Fixes #1266.
R=r, dsymonds, bradfitz, iant, borman
CC=golang-dev
https://golang.org/cl/3749041
2012-02-13 11:52:37 -07:00
|
|
|
s, ok := sig.(syscall.Signal)
|
|
|
|
if !ok {
|
|
|
|
return errors.New("os: unsupported signal type")
|
|
|
|
}
|
|
|
|
if e := syscall.Kill(p.Pid, s); e != nil {
|
2014-10-06 13:49:19 -06:00
|
|
|
if e == syscall.ESRCH {
|
|
|
|
return errFinished
|
|
|
|
}
|
2011-11-13 20:44:52 -07:00
|
|
|
return e
|
2011-06-06 03:53:30 -06:00
|
|
|
}
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2012-02-29 23:36:35 -07:00
|
|
|
func (p *Process) release() error {
|
2011-02-03 20:41:26 -07:00
|
|
|
// NOOP for unix.
|
|
|
|
p.Pid = -1
|
|
|
|
// no need for a finalizer anymore
|
|
|
|
runtime.SetFinalizer(p, nil)
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2012-01-16 22:51:54 -07:00
|
|
|
func findProcess(pid int) (p *Process, err error) {
|
2011-02-03 20:41:26 -07:00
|
|
|
// NOOP for unix.
|
|
|
|
return newProcess(pid, 0), nil
|
|
|
|
}
|
2012-02-20 20:10:34 -07:00
|
|
|
|
2012-03-01 19:56:54 -07:00
|
|
|
func (p *ProcessState) userTime() time.Duration {
|
2012-02-20 20:10:34 -07:00
|
|
|
return time.Duration(p.rusage.Utime.Nano()) * time.Nanosecond
|
|
|
|
}
|
|
|
|
|
2012-03-01 19:56:54 -07:00
|
|
|
func (p *ProcessState) systemTime() time.Duration {
|
2012-02-20 20:10:34 -07:00
|
|
|
return time.Duration(p.rusage.Stime.Nano()) * time.Nanosecond
|
|
|
|
}
|