Skip to content

Commit

Permalink
runtime: rename Cgocalls and Goroutines to NumCgoCall and NumGoroutin…
Browse files Browse the repository at this point in the history
…e, respectively.

Update some other docs too.

Update #2955.

R=rsc
CC=golang-dev
https://golang.org/cl/5676060
  • Loading branch information
dsymonds committed Feb 16, 2012
1 parent 7fc4792 commit 4b171e5
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 12 deletions.
6 changes: 3 additions & 3 deletions src/pkg/net/http/transport_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -648,7 +648,7 @@ func TestTransportPersistConnLeak(t *testing.T) {
tr := &Transport{}
c := &Client{Transport: tr}

n0 := runtime.Goroutines()
n0 := runtime.NumGoroutine()

const numReq = 25
didReqCh := make(chan bool)
Expand All @@ -669,7 +669,7 @@ func TestTransportPersistConnLeak(t *testing.T) {
<-gotReqCh
}

nhigh := runtime.Goroutines()
nhigh := runtime.NumGoroutine()

// Tell all handlers to unblock and reply.
for i := 0; i < numReq; i++ {
Expand All @@ -685,7 +685,7 @@ func TestTransportPersistConnLeak(t *testing.T) {
time.Sleep(100 * time.Millisecond)
runtime.GC()
runtime.GC() // even more.
nfinal := runtime.Goroutines()
nfinal := runtime.NumGoroutine()

growth := nfinal - n0

Expand Down
2 changes: 1 addition & 1 deletion src/pkg/runtime/cgocall.c
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ unlockm(void)
}

void
runtime·Cgocalls(int64 ret)
runtime·NumCgoCall(int64 ret)
{
M *m;

Expand Down
8 changes: 4 additions & 4 deletions src/pkg/runtime/debug.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ func GOMAXPROCS(n int) int
// NumCPU returns the number of logical CPUs on the local machine.
func NumCPU() int

// Cgocalls returns the number of cgo calls made by the current process.
func Cgocalls() int64
// NumCgoCall returns the number of cgo calls made by the current process.
func NumCgoCall() int64

// Goroutines returns the number of goroutines that currently exist.
func Goroutines() int32
// NumGoroutine returns the number of goroutines that currently exist.
func NumGoroutine() int32

// Alloc allocates a block of the given size.
// FOR TESTING AND DEBUGGING ONLY.
Expand Down
4 changes: 2 additions & 2 deletions src/pkg/runtime/extern.go
Original file line number Diff line number Diff line change
Expand Up @@ -141,10 +141,10 @@ func Version() string {
return theVersion
}

// GOOS is the Go tree's operating system target:
// GOOS is the running program's operating system target:
// one of darwin, freebsd, linux, and so on.
const GOOS string = theGoos

// GOARCH is the Go tree's architecture target:
// GOARCH is the running program's architecture target:
// 386, amd64, or arm.
const GOARCH string = theGoarch
4 changes: 2 additions & 2 deletions src/pkg/runtime/proc.c
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ mcommoninit(M *m)
// Add to runtime·allm so garbage collector doesn't free m
// when it is just in a register or thread-local storage.
m->alllink = runtime·allm;
// runtime·Cgocalls() iterates over allm w/o schedlock,
// runtime·NumCgoCall() iterates over allm w/o schedlock,
// so we need to publish it safely.
runtime·atomicstorep(&runtime·allm, m);
}
Expand Down Expand Up @@ -1652,7 +1652,7 @@ runtime·mid(uint32 ret)
}

void
runtime·Goroutines(int32 ret)
runtime·NumGoroutine(int32 ret)
{
ret = runtime·sched.gcount;
FLUSH(&ret);
Expand Down

0 comments on commit 4b171e5

Please sign in to comment.