code review 164057: 'close' race fixed/suggestions from rcs

src/pkg/net/tcpsock.go

 // 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.
 
 // TCP sockets
 
 package net
 
 import (
         "os";
@@ skipping 55 matching lines @@
 }
 
 // TCPConn is an implementation of the Conn interface
 // for TCP network connections.
 type TCPConn struct {
         fd *netFD;
 }
 
 func newTCPConn(fd *netFD) *TCPConn {
         c := &TCPConn{fd};
-        fd.locksysfd();
-        defer fd.unlocksysfd();
+        fd.incref();

[rsc, 2009/12/01 19:58:56]

There's no need for the incref/decref here.
This is a constructor so there are no other
references to the fd, hence no concurrent
Close.

+        defer fd.decref();
         setsockoptInt(fd.sysfd, syscall.IPPROTO_TCP, syscall.TCP_NODELAY, 1);
         return c;
 }
 
 func (c *TCPConn) ok() bool     { return c != nil && c.fd != nil }
 
 // Implementation of the Conn interface - see Conn for documentation.
 
 // Read reads data from the TCP connection.
 //
@@ skipping 185 matching lines @@
 // Already Accepted connections are not closed.
 func (l *TCPListener) Close() os.Error {
         if l == nil || l.fd == nil {
                 return os.EINVAL
         }
         return l.fd.Close();
 }
 
 // Addr returns the listener's network address, a *TCPAddr.
 func (l *TCPListener) Addr() Addr       { return l.fd.laddr }