net: move system common global variables into fd_unix.go

R=golang-dev, bradfitz
CC=dvyukov, golang-dev, mikioh.mikioh
https://golang.org/cl/9495044

diff --git a/src/pkg/net/fd_poll_runtime.go b/src/pkg/net/fd_poll_runtime.go
index e71ded589c9db2aa0f3d5d5d6b653ee6e64a8f32..c76f1de7b7cf09e5aa084ccda0648b1a6b6c571c 100644 (file)
--- a/src/pkg/net/fd_poll_runtime.go
+++ b/src/pkg/net/fd_poll_runtime.go
@@ -20,17 +20,12 @@ func runtime_pollReset(ctx uintptr, mode int) int
 func runtime_pollSetDeadline(ctx uintptr, d int64, mode int)
 func runtime_pollUnblock(ctx uintptr)
 
-var canCancelIO = true // used for testing current package
-
 type pollDesc struct {
        runtimeCtx uintptr
 }
 
 var serverInit sync.Once
 
-func sysInit() {
-}
-
 func (pd *pollDesc) Init(fd *netFD) error {
        serverInit.Do(runtime_pollServerInit)
        ctx, errno := runtime_pollOpen(uintptr(fd.sysfd))

diff --git a/src/pkg/net/fd_poll_unix.go b/src/pkg/net/fd_poll_unix.go
index 307e577e999833bb696c683c4f3fe70079e2e507..9834190fda9737b52daf5110e8b5d60f22f5cb96 100644 (file)
--- a/src/pkg/net/fd_poll_unix.go
+++ b/src/pkg/net/fd_poll_unix.go
@@ -303,9 +303,7 @@ var pollMaxN int
 var pollservers []*pollServer
 var startServersOnce []func()
 
-var canCancelIO = true // used for testing current package
-
-func sysInit() {
+func init() {
        pollMaxN = runtime.NumCPU()
        if pollMaxN > 8 {
                pollMaxN = 8 // No improvement then.

diff --git a/src/pkg/net/fd_unix.go b/src/pkg/net/fd_unix.go
index 8c59bff989cb01b3d6263cc28ded90a8b95838e1..4012e36d379222699986c9624f53219672b83d6d 100644 (file)
--- a/src/pkg/net/fd_unix.go
+++ b/src/pkg/net/fd_unix.go
@@ -41,6 +41,11 @@ type netFD struct {
        pd pollDesc
 }
 
+var canCancelIO = true // used for testing current package
+
+func sysInit() {
+}
+
 func resolveAndDial(net, addr string, localAddr Addr, deadline time.Time) (Conn, error) {
        ra, err := resolveAddr("dial", net, addr, deadline)
        if err != nil {