code review 12663043: net: separate unix pollster initialization from network...

src/pkg/net/fd_poll_unix.go

 // Copyright 2013 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.
 
 // +build freebsd netbsd openbsd
 
 package net
 
 import (
         "os"
@@ skipping 234 matching lines @@
                         }
                         s.WakeFD(pd, mode, nil)
                 }
         }
 }
 
 func (pd *pollDesc) Close() {
 }
 
 func (pd *pollDesc) Lock() {
+        if pd.pollServer == nil {
+                return
+        }
         pd.pollServer.Lock()
 }
 
 func (pd *pollDesc) Unlock() {
+        if pd.pollServer == nil {
+                return
+        }
         pd.pollServer.Unlock()
 }
 
 func (pd *pollDesc) Wakeup() {
+        if pd.pollServer == nil {
+                return
+        }
         pd.pollServer.Wakeup()
 }
 
 func (pd *pollDesc) PrepareRead() error {
         if pd.rdeadline.expired() {
                 return errTimeout
         }
         return nil
 }
 
@@ skipping 14 matching lines @@
 
 func (pd *pollDesc) WaitWrite() error {
         err := pd.pollServer.AddFD(pd, 'w')
         if err == nil {
                 err = <-pd.cw
         }
         return err
 }
 
 func (pd *pollDesc) Evict() bool {
+        if pd.pollServer == nil {
+                return false
+        }
         return pd.pollServer.Evict(pd)
 }
 
 // Spread network FDs over several pollServers.
 
 var pollMaxN int
 var pollservers []*pollServer
 var startServersOnce []func()
 
 func init() {
@@ skipping 42 matching lines @@
 func setWriteDeadline(fd *netFD, t time.Time) error {
         fd.pd.wdeadline.setTime(t)
         return nil
 }
 
 func setDeadline(fd *netFD, t time.Time) error {
         setReadDeadline(fd, t)
         setWriteDeadline(fd, t)
         return nil
 }