qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-22 09:44:40 -07:00
Code Releases Activity

net: TCPConn.SetNoDelay, back by popular demand

Browse Source 
R=r
CC=golang-dev
https://golang.org/cl/1880047
This commit is contained in:
Russ Cox 2010-07-26 16:19:39 -07:00
parent 4188504f38
commit 5ee02eef4c
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/pkg/net/sock.go
View File

@ -129,6 +129,12 @@ func setKeepAlive(fd *netFD, keepalive bool) os.Error {
return setsockoptInt(fd.sysfd, syscall.SOL_SOCKET, syscall.SO_KEEPALIVE, boolint(keepalive)) return setsockoptInt(fd.sysfd, syscall.SOL_SOCKET, syscall.SO_KEEPALIVE, boolint(keepalive))
} }
func setNoDelay(fd *netFD, noDelay bool) os.Error {
fd.incref()
defer fd.decref()
return setsockoptInt(fd.sysfd, syscall.IPPROTO_TCP, syscall.TCP_NODELAY, boolint(noDelay))
}
func setLinger(fd *netFD, sec int) os.Error { func setLinger(fd *netFD, sec int) os.Error {
var l syscall.Linger var l syscall.Linger
if sec >= 0 { if sec >= 0 {

13
src/pkg/net/tcpsock.go
View File

@ -73,7 +73,7 @@ type TCPConn struct {
func newTCPConn(fd *netFD) *TCPConn { func newTCPConn(fd *netFD) *TCPConn {
c := &TCPConn{fd} c := &TCPConn{fd}
setsockoptInt(fd.sysfd, syscall.IPPROTO_TCP, syscall.TCP_NODELAY, 1) c.SetNoDelay(true)
return c return c
} }
@ -192,6 +192,17 @@ func (c *TCPConn) SetKeepAlive(keepalive bool) os.Error {
return setKeepAlive(c.fd, keepalive) return setKeepAlive(c.fd, keepalive)
} }
// SetNoDelay controls whether the operating system should delay
// packet transmission in hopes of sending fewer packets
// (Nagle's algorithm). The default is true (no delay), meaning
// that data is sent as soon as possible after a Write.
func (c *TCPConn) SetNoDelay(noDelay bool) os.Error {
if !c.ok() {
return os.EINVAL
}
return setNoDelay(c.fd, noDelay)
}
// DialTCP is like Dial but can only connect to TCP networks // DialTCP is like Dial but can only connect to TCP networks
// and returns a TCPConn structure. // and returns a TCPConn structure.
func DialTCP(net string, laddr, raddr *TCPAddr) (c *TCPConn, err os.Error) { func DialTCP(net string, laddr, raddr *TCPAddr) (c *TCPConn, err os.Error) {