From: Alex Brainman <alex.brainman@gmail.com>
Date: Mon, 20 May 2013 05:23:45 +0000 (+1000)
Subject: net: move system common global variables into fd_unix.go
X-Git-Tag: go1.2rc2~1472
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=1a948950f73e79e41ff416cdb7d5987aa4e64e5b;p=gostls13.git

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 e71ded589c..c76f1de7b7 100644
--- 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 307e577e99..9834190fda 100644
--- 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 8c59bff989..4012e36d37 100644
--- 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 {