blackteay/gf
1
0
Fork 0
mirror of https://github.com/gogf/gf.git synced 2025-04-05 11:18:50 +08:00
Code Issues Projects Releases Wiki Activity

comment update;standardize const naming for package gtcp/gudp

Browse Source
This commit is contained in:
John Guo 2021-08-08 13:10:21 +08:00
parent dc407bf293
commit fc1dfb7ff9
17 changed files with 114 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/command/command.go
View File

@ -20,7 +20,7 @@ var (
argumentRegex = regexp.MustCompile(`^\-{1,2}([\w\?\.\-]+)(=){0,1}(.*)$`)
)
// Custom initialization.
// Init does custom initialization.
func Init(args ...string) {
if len(args) == 0 {
if len(defaultParsedArgs) == 0 && len(defaultParsedOptions) == 0 {

7
internal/empty/empty.go
View File

@ -286,10 +286,9 @@ func IsEmpty(value interface{}) bool {
//}
// IsNil checks whether given `value` is nil.
// Parameter `traceSource` is used for tracing to the source variable if given `value` is type
// of a pinter that also points to a pointer. It returns nil if the source is nil when `traceSource`
// is true.
// Note that it might use reflect feature which affects performance a little bit.
// Parameter `traceSource` is used for tracing to the source variable if given `value` is type of pinter
// that also points to a pointer. It returns nil if the source is nil when `traceSource` is true.
// Note that it might use reflect feature which affects performance a little.
func IsNil(value interface{}, traceSource ...bool) bool {
if value == nil {
return true

2
internal/structs/structs.go
View File

@ -4,7 +4,7 @@
// If a copy of the MIT was not distributed with this file,
// You can obtain one at https://github.com/gogf/gf.
// Package structs provides functions for struct conversion.
// Package structs provides functions for struct information retrieving and struct conversion.
//
// Inspired and improved from: https://github.com/fatih/structs
package structs

2
internal/structs/structs_field.go
View File

@ -16,7 +16,7 @@ func (f *Field) Tag(key string) string {
// TagLookup returns the value associated with key in the tag string.
// If the key is present in the tag the value (which may be empty)
// is returned. Otherwise the returned value will be the empty string.
// is returned. Otherwise, the returned value will be the empty string.
// The ok return value reports whether the value was explicitly set in
// the tag string. If the tag does not have the conventional format,
// the value returned by Lookup is unspecified.

3
internal/structs/structs_tag.go
View File

@ -53,7 +53,7 @@ func ParseTag(tag string) map[string]string {
if i >= len(tag) {
break
}
quotedValue := string(tag[:i+1])
quotedValue := tag[:i+1]
tag = tag[i+1:]
value, err := strconv.Unquote(quotedValue)
if err != nil {
@ -137,6 +137,7 @@ func getFieldValues(value interface{}) ([]*Field, error) {
goto exitLoop
}
}
exitLoop:
for reflectKind == reflect.Ptr {
reflectValue = reflectValue.Elem()

5
internal/structs/structs_type.go
View File

@ -37,13 +37,16 @@ func StructType(object interface{}) (*Type, error) {
reflectValue = reflectValue.Elem()
reflectKind = reflectValue.Kind()
}
case reflect.Array, reflect.Slice:
reflectValue = reflect.New(reflectValue.Type().Elem()).Elem()
reflectKind = reflectValue.Kind()
default:
goto exitLoop
}
}
exitLoop:
for reflectKind == reflect.Ptr {
reflectValue = reflectValue.Elem()
@ -63,7 +66,7 @@ exitLoop:
}, nil
}
// Signature returns an unique string as this type.
// Signature returns a unique string as this type.
func (t Type) Signature() string {
return t.PkgPath() + "/" + t.String()
}

4
internal/utils/utils_io.go
View File

@ -21,7 +21,7 @@ type ReadCloser struct {
repeatable bool
}
// NewRepeatReadCloser creates and returns a RepeatReadCloser object.
// NewReadCloser creates and returns a RepeatReadCloser object.
func NewReadCloser(content []byte, repeatable bool) io.ReadCloser {
return &ReadCloser{
content: content,
@ -29,7 +29,7 @@ func NewReadCloser(content []byte, repeatable bool) io.ReadCloser {
}
}
// NewRepeatReadCloserWithReadCloser creates and returns a RepeatReadCloser object
// NewReadCloserWithReadCloser creates and returns a RepeatReadCloser object
// with given io.ReadCloser.
func NewReadCloserWithReadCloser(r io.ReadCloser, repeatable bool) (io.ReadCloser, error) {
content, err := ioutil.ReadAll(r)

54
net/gtcp/gtcp_conn.go
View File

@ -15,18 +15,18 @@ import (
"time"
)
// TCP connection object.
// Conn is the TCP connection object.
type Conn struct {
net.Conn // Underlying TCP connection object.
reader *bufio.Reader // Buffer reader for connection.
recvDeadline time.Time // Timeout point for reading.
sendDeadline time.Time // Timeout point for writing.
recvBufferWait time.Duration // Interval duration for reading buffer.
net.Conn // Underlying TCP connection object.
reader *bufio.Reader // Buffer reader for connection.
receiveDeadline time.Time // Timeout point for reading.
sendDeadline time.Time // Timeout point for writing.
receiveBufferWait time.Duration // Interval duration for reading buffer.
}
const (
// Default interval for reading buffer.
gRECV_ALL_WAIT_TIMEOUT = time.Millisecond
receiveAllWaitTimeout = time.Millisecond
)
// NewConn creates and returns a new connection with given address.
@ -61,11 +61,11 @@ func NewConnKeyCrt(addr, crtFile, keyFile string) (*Conn, error) {
// NewConnByNetConn creates and returns a TCP connection object with given net.Conn object.
func NewConnByNetConn(conn net.Conn) *Conn {
return &Conn{
Conn: conn,
reader: bufio.NewReader(conn),
recvDeadline: time.Time{},
sendDeadline: time.Time{},
recvBufferWait: gRECV_ALL_WAIT_TIMEOUT,
Conn: conn,
reader: bufio.NewReader(conn),
receiveDeadline: time.Time{},
sendDeadline: time.Time{},
receiveBufferWait: receiveAllWaitTimeout,
}
}
@ -84,7 +84,7 @@ func (c *Conn) Send(data []byte, retry ...Retry) error {
if len(retry) > 0 {
retry[0].Count--
if retry[0].Interval == 0 {
retry[0].Interval = gDEFAULT_RETRY_INTERVAL
retry[0].Interval = defaultRetryInternal
}
time.Sleep(retry[0].Interval)
}
@ -113,13 +113,13 @@ func (c *Conn) Recv(length int, retry ...Retry) ([]byte, error) {
if length > 0 {
buffer = make([]byte, length)
} else {
buffer = make([]byte, gDEFAULT_READ_BUFFER_SIZE)
buffer = make([]byte, defaultReadBufferSize)
}
for {
if length < 0 && index > 0 {
bufferWait = true
if err = c.SetReadDeadline(time.Now().Add(c.recvBufferWait)); err != nil {
if err = c.SetReadDeadline(time.Now().Add(c.receiveBufferWait)); err != nil {
return nil, err
}
}
@ -132,9 +132,9 @@ func (c *Conn) Recv(length int, retry ...Retry) ([]byte, error) {
break
}
} else {
if index >= gDEFAULT_READ_BUFFER_SIZE {
if index >= defaultReadBufferSize {
// If it exceeds the buffer size, it then automatically increases its buffer size.
buffer = append(buffer, make([]byte, gDEFAULT_READ_BUFFER_SIZE)...)
buffer = append(buffer, make([]byte, defaultReadBufferSize)...)
} else {
// It returns immediately if received size is lesser than buffer size.
if !bufferWait {
@ -150,7 +150,7 @@ func (c *Conn) Recv(length int, retry ...Retry) ([]byte, error) {
}
// Re-set the timeout when reading data.
if bufferWait && isTimeout(err) {
if err = c.SetReadDeadline(c.recvDeadline); err != nil {
if err = c.SetReadDeadline(c.receiveDeadline); err != nil {
return nil, err
}
err = nil
@ -163,7 +163,7 @@ func (c *Conn) Recv(length int, retry ...Retry) ([]byte, error) {
}
retry[0].Count--
if retry[0].Interval == 0 {
retry[0].Interval = gDEFAULT_RETRY_INTERVAL
retry[0].Interval = defaultRetryInternal
}
time.Sleep(retry[0].Interval)
continue
@ -230,10 +230,10 @@ func (c *Conn) RecvTil(til []byte, retry ...Retry) ([]byte, error) {
// RecvWithTimeout reads data from the connection with timeout.
func (c *Conn) RecvWithTimeout(length int, timeout time.Duration, retry ...Retry) (data []byte, err error) {
if err := c.SetRecvDeadline(time.Now().Add(timeout)); err != nil {
if err := c.SetreceiveDeadline(time.Now().Add(timeout)); err != nil {
return nil, err
}
defer c.SetRecvDeadline(time.Time{})
defer c.SetreceiveDeadline(time.Time{})
data, err = c.Recv(length, retry...)
return
}
@ -269,16 +269,16 @@ func (c *Conn) SendRecvWithTimeout(data []byte, length int, timeout time.Duratio
func (c *Conn) SetDeadline(t time.Time) error {
err := c.Conn.SetDeadline(t)
if err == nil {
c.recvDeadline = t
c.receiveDeadline = t
c.sendDeadline = t
}
return err
}
func (c *Conn) SetRecvDeadline(t time.Time) error {
func (c *Conn) SetreceiveDeadline(t time.Time) error {
err := c.SetReadDeadline(t)
if err == nil {
c.recvDeadline = t
c.receiveDeadline = t
}
return err
}
@ -291,8 +291,8 @@ func (c *Conn) SetSendDeadline(t time.Time) error {
return err
}
// SetRecvBufferWait sets the buffer waiting timeout when reading all data from connection.
// SetreceiveBufferWait sets the buffer waiting timeout when reading all data from connection.
// The waiting duration cannot be too long which might delay receiving data from remote address.
func (c *Conn) SetRecvBufferWait(bufferWaitDuration time.Duration) {
c.recvBufferWait = bufferWaitDuration
func (c *Conn) SetreceiveBufferWait(bufferWaitDuration time.Duration) {
c.receiveBufferWait = bufferWaitDuration
}

22
net/gtcp/gtcp_conn_pkg.go
View File

@ -13,11 +13,11 @@ import (
)
const (
gPKG_HEADER_SIZE_DEFAULT = 2 // Header size for simple package protocol.
gPKG_HEADER_SIZE_MAX = 4 // Max header size for simple package protocol.
pkgHeaderSizeDefault = 2 // Header size for simple package protocol.
pkgHeaderSizeMax = 4 // Max header size for simple package protocol.
)
// Package option for simple protocol.
// PkgOption is package option for simple protocol.
type PkgOption struct {
// HeaderSize is used to mark the data length for next data receiving.
// It's 2 bytes in default, 4 bytes max, which stands for the max data length
@ -51,10 +51,10 @@ func (c *Conn) SendPkg(data []byte, option ...PkgOption) error {
length, pkgOption.MaxDataSize,
)
}
offset := gPKG_HEADER_SIZE_MAX - pkgOption.HeaderSize
buffer := make([]byte, gPKG_HEADER_SIZE_MAX+len(data))
offset := pkgHeaderSizeMax - pkgOption.HeaderSize
buffer := make([]byte, pkgHeaderSizeMax+len(data))
binary.BigEndian.PutUint32(buffer[0:], uint32(length))
copy(buffer[gPKG_HEADER_SIZE_MAX:], data)
copy(buffer[pkgHeaderSizeMax:], data)
if pkgOption.Retry.Count > 0 {
return c.Send(buffer[offset:], pkgOption.Retry)
}
@ -128,10 +128,10 @@ func (c *Conn) RecvPkg(option ...PkgOption) (result []byte, err error) {
// RecvPkgWithTimeout reads data from connection with timeout using simple package protocol.
func (c *Conn) RecvPkgWithTimeout(timeout time.Duration, option ...PkgOption) (data []byte, err error) {
if err := c.SetRecvDeadline(time.Now().Add(timeout)); err != nil {
if err := c.SetreceiveDeadline(time.Now().Add(timeout)); err != nil {
return nil, err
}
defer c.SetRecvDeadline(time.Time{})
defer c.SetreceiveDeadline(time.Time{})
data, err = c.RecvPkg(option...)
return
}
@ -144,12 +144,12 @@ func getPkgOption(option ...PkgOption) (*PkgOption, error) {
pkgOption = option[0]
}
if pkgOption.HeaderSize == 0 {
pkgOption.HeaderSize = gPKG_HEADER_SIZE_DEFAULT
pkgOption.HeaderSize = pkgHeaderSizeDefault
}
if pkgOption.HeaderSize > gPKG_HEADER_SIZE_MAX {
if pkgOption.HeaderSize > pkgHeaderSizeMax {
return nil, fmt.Errorf(
`package header size %d definition exceeds max header size %d`,
pkgOption.HeaderSize, gPKG_HEADER_SIZE_MAX,
pkgOption.HeaderSize, pkgHeaderSizeMax,
)
}
if pkgOption.MaxDataSize == 0 {

10
net/gtcp/gtcp_func.go
View File

@ -16,9 +16,9 @@ import (
)
const (
gDEFAULT_CONN_TIMEOUT = 30 * time.Second // Default connection timeout.
gDEFAULT_RETRY_INTERVAL = 100 * time.Millisecond // Default retry interval.
gDEFAULT_READ_BUFFER_SIZE = 128 // (Byte) Buffer size for reading.
defaultConnTimeout = 30 * time.Second // Default connection timeout.
defaultRetryInternal = 100 * time.Millisecond // Default retry interval.
defaultReadBufferSize = 128 // (Byte) Buffer size for reading.
)
type Retry struct {
@ -29,7 +29,7 @@ type Retry struct {
// NewNetConn creates and returns a net.Conn with given address like "127.0.0.1:80".
// The optional parameter <timeout> specifies the timeout for dialing connection.
func NewNetConn(addr string, timeout ...time.Duration) (net.Conn, error) {
d := gDEFAULT_CONN_TIMEOUT
d := defaultConnTimeout
if len(timeout) > 0 {
d = timeout[0]
}
@ -40,7 +40,7 @@ func NewNetConn(addr string, timeout ...time.Duration) (net.Conn, error) {
// The optional parameter <timeout> specifies the timeout for dialing connection.
func NewNetConnTLS(addr string, tlsConfig *tls.Config, timeout ...time.Duration) (net.Conn, error) {
dialer := &net.Dialer{
Timeout: gDEFAULT_CONN_TIMEOUT,
Timeout: defaultConnTimeout,
}
if len(timeout) > 0 {
dialer.Timeout = timeout[0]

43
net/gtcp/gtcp_pool.go
View File

@ -14,19 +14,18 @@ import (
)
// PoolConn is a connection with pool feature for TCP.
// Note that it is NOT a pool or connection manager,
// it is just a TCP connection object.
// Note that it is NOT a pool or connection manager, it is just a TCP connection object.
type PoolConn struct {
*Conn // Underlying connection object.
pool *gpool.Pool // Connection pool, which is not a really connection pool, but a connection reusable pool.
pool *gpool.Pool // Connection pool, which is not a real connection pool, but a connection reusable pool.
status int // Status of current connection, which is used to mark this connection usable or not.
}
const (
gDEFAULT_POOL_EXPIRE = 10 * time.Second // Default TTL for connection in the pool.
gCONN_STATUS_UNKNOWN = 0 // Means it is unknown it's connective or not.
gCONN_STATUS_ACTIVE = 1 // Means it is now connective.
gCONN_STATUS_ERROR = 2 // Means it should be closed and removed from pool.
defaultPoolExpire = 10 * time.Second // Default TTL for connection in the pool.
connStatusUnknown = 0 // Means it is unknown it's connective or not.
connStatusActive = 1 // Means it is now connective.
connStatusError = 2 // Means it should be closed and removed from pool.
)
var (
@ -38,9 +37,9 @@ var (
func NewPoolConn(addr string, timeout ...time.Duration) (*PoolConn, error) {
v := addressPoolMap.GetOrSetFuncLock(addr, func() interface{} {
var pool *gpool.Pool
pool = gpool.New(gDEFAULT_POOL_EXPIRE, func() (interface{}, error) {
pool = gpool.New(defaultPoolExpire, func() (interface{}, error) {
if conn, err := NewConn(addr, timeout...); err == nil {
return &PoolConn{conn, pool, gCONN_STATUS_ACTIVE}, nil
return &PoolConn{conn, pool, connStatusActive}, nil
} else {
return nil, err
}
@ -60,8 +59,8 @@ func NewPoolConn(addr string, timeout ...time.Duration) (*PoolConn, error) {
// Note that, if <c> calls Close function closing itself, <c> can not
// be used again.
func (c *PoolConn) Close() error {
if c.pool != nil && c.status == gCONN_STATUS_ACTIVE {
c.status = gCONN_STATUS_UNKNOWN
if c.pool != nil && c.status == connStatusActive {
c.status = connStatusUnknown
c.pool.Put(c)
} else {
return c.Conn.Close()
@ -73,7 +72,7 @@ func (c *PoolConn) Close() error {
// writing data.
func (c *PoolConn) Send(data []byte, retry ...Retry) error {
err := c.Conn.Send(data, retry...)
if err != nil && c.status == gCONN_STATUS_UNKNOWN {
if err != nil && c.status == connStatusUnknown {
if v, e := c.pool.Get(); e == nil {
c.Conn = v.(*PoolConn).Conn
err = c.Send(data, retry...)
@ -82,9 +81,9 @@ func (c *PoolConn) Send(data []byte, retry ...Retry) error {
}
}
if err != nil {
c.status = gCONN_STATUS_ERROR
c.status = connStatusError
} else {
c.status = gCONN_STATUS_ACTIVE
c.status = connStatusActive
}
return err
}
@ -93,9 +92,9 @@ func (c *PoolConn) Send(data []byte, retry ...Retry) error {
func (c *PoolConn) Recv(length int, retry ...Retry) ([]byte, error) {
data, err := c.Conn.Recv(length, retry...)
if err != nil {
c.status = gCONN_STATUS_ERROR
c.status = connStatusError
} else {
c.status = gCONN_STATUS_ACTIVE
c.status = connStatusActive
}
return data, err
}
@ -105,9 +104,9 @@ func (c *PoolConn) Recv(length int, retry ...Retry) ([]byte, error) {
func (c *PoolConn) RecvLine(retry ...Retry) ([]byte, error) {
data, err := c.Conn.RecvLine(retry...)
if err != nil {
c.status = gCONN_STATUS_ERROR
c.status = connStatusError
} else {
c.status = gCONN_STATUS_ACTIVE
c.status = connStatusActive
}
return data, err
}
@ -117,19 +116,19 @@ func (c *PoolConn) RecvLine(retry ...Retry) ([]byte, error) {
func (c *PoolConn) RecvTil(til []byte, retry ...Retry) ([]byte, error) {
data, err := c.Conn.RecvTil(til, retry...)
if err != nil {
c.status = gCONN_STATUS_ERROR
c.status = connStatusError
} else {
c.status = gCONN_STATUS_ACTIVE
c.status = connStatusActive
}
return data, err
}
// RecvWithTimeout reads data from the connection with timeout.
func (c *PoolConn) RecvWithTimeout(length int, timeout time.Duration, retry ...Retry) (data []byte, err error) {
if err := c.SetRecvDeadline(time.Now().Add(timeout)); err != nil {
if err := c.SetreceiveDeadline(time.Now().Add(timeout)); err != nil {
return nil, err
}
defer c.SetRecvDeadline(time.Time{})
defer c.SetreceiveDeadline(time.Time{})
data, err = c.Recv(length, retry...)
return
}

16
net/gtcp/gtcp_pool_pkg.go
View File

@ -13,7 +13,7 @@ import (
// SendPkg sends a package containing <data> to the connection.
// The optional parameter <option> specifies the package options for sending.
func (c *PoolConn) SendPkg(data []byte, option ...PkgOption) (err error) {
if err = c.Conn.SendPkg(data, option...); err != nil && c.status == gCONN_STATUS_UNKNOWN {
if err = c.Conn.SendPkg(data, option...); err != nil && c.status == connStatusUnknown {
if v, e := c.pool.NewFunc(); e == nil {
c.Conn = v.(*PoolConn).Conn
err = c.Conn.SendPkg(data, option...)
@ -22,9 +22,9 @@ func (c *PoolConn) SendPkg(data []byte, option ...PkgOption) (err error) {
}
}
if err != nil {
c.status = gCONN_STATUS_ERROR
c.status = connStatusError
} else {
c.status = gCONN_STATUS_ACTIVE
c.status = connStatusActive
}
return err
}
@ -34,19 +34,19 @@ func (c *PoolConn) SendPkg(data []byte, option ...PkgOption) (err error) {
func (c *PoolConn) RecvPkg(option ...PkgOption) ([]byte, error) {
data, err := c.Conn.RecvPkg(option...)
if err != nil {
c.status = gCONN_STATUS_ERROR
c.status = connStatusError
} else {
c.status = gCONN_STATUS_ACTIVE
c.status = connStatusActive
}
return data, err
}
// RecvPkgWithTimeout reads data from connection with timeout using simple package protocol.
func (c *PoolConn) RecvPkgWithTimeout(timeout time.Duration, option ...PkgOption) (data []byte, err error) {
if err := c.SetRecvDeadline(time.Now().Add(timeout)); err != nil {
if err := c.SetreceiveDeadline(time.Now().Add(timeout)); err != nil {
return nil, err
}
defer c.SetRecvDeadline(time.Time{})
defer c.SetreceiveDeadline(time.Time{})
data, err = c.RecvPkg(option...)
return
}
@ -70,7 +70,7 @@ func (c *PoolConn) SendRecvPkg(data []byte, option ...PkgOption) ([]byte, error)
}
}
// RecvPkgWithTimeout reads data from connection with timeout using simple package protocol.
// SendRecvPkgWithTimeout reads data from connection with timeout using simple package protocol.
func (c *PoolConn) SendRecvPkgWithTimeout(data []byte, timeout time.Duration, option ...PkgOption) ([]byte, error) {
if err := c.SendPkg(data, option...); err == nil {
return c.RecvPkgWithTimeout(timeout, option...)

12
net/gtcp/gtcp_server.go
View File

@ -18,11 +18,11 @@ import (
)
const (
// Default TCP server name.
gDEFAULT_SERVER = "default"
// defaultServer is the default TCP server name.
defaultServer = "default"
)
// TCP Server.
// Server is a TCP server.
type Server struct {
mu sync.Mutex // Used for Server.listen concurrent safety.
listen net.Listener // Listener.
@ -38,7 +38,7 @@ var serverMapping = gmap.NewStrAnyMap(true)
// or it returns a new normal TCP server named <name> if it does not exist.
// The parameter <name> is used to specify the TCP server
func GetServer(name ...interface{}) *Server {
serverName := gDEFAULT_SERVER
serverName := defaultServer
if len(name) > 0 && name[0] != "" {
serverName = gconv.String(name[0])
}
@ -88,7 +88,7 @@ func (s *Server) SetHandler(handler func(*Conn)) {
s.handler = handler
}
// SetTlsKeyCrt sets the certificate and key file for TLS configuration of server.
// SetTLSKeyCrt sets the certificate and key file for TLS configuration of server.
func (s *Server) SetTLSKeyCrt(crtFile, keyFile string) error {
tlsConfig, err := LoadKeyCrt(crtFile, keyFile)
if err != nil {
@ -98,7 +98,7 @@ func (s *Server) SetTLSKeyCrt(crtFile, keyFile string) error {
return nil
}
// SetTlsConfig sets the TLS configuration of server.
// SetTLSConfig sets the TLS configuration of server.
func (s *Server) SetTLSConfig(tlsConfig *tls.Config) {
s.tlsConfig = tlsConfig
}

2
net/gudp/gudp.go
View File

@ -4,5 +4,5 @@
// If a copy of the MIT was not distributed with this file,
// You can obtain one at https://github.com/gogf/gf.
// Package gtcp provides UDP server and client implementations.
// Package gudp provides UDP server and client implementations.
package gudp

36
net/gudp/gudp_conn.go
View File

@ -14,17 +14,17 @@ import (
// Conn handles the UDP connection.
type Conn struct {
*net.UDPConn // Underlying UDP connection.
remoteAddr *net.UDPAddr // Remote address.
recvDeadline time.Time // Timeout point for reading data.
sendDeadline time.Time // Timeout point for writing data.
recvBufferWait time.Duration // Interval duration for reading buffer.
*net.UDPConn // Underlying UDP connection.
remoteAddr *net.UDPAddr // Remote address.
receiveDeadline time.Time // Timeout point for reading data.
sendDeadline time.Time // Timeout point for writing data.
receiveBufferWait time.Duration // Interval duration for reading buffer.
}
const (
gDEFAULT_RETRY_INTERVAL = 100 * time.Millisecond // Retry interval.
gDEFAULT_READ_BUFFER_SIZE = 1024 // (Byte)Buffer size.
gRECV_ALL_WAIT_TIMEOUT = time.Millisecond // Default interval for reading buffer.
defaultRetryInterval = 100 * time.Millisecond // Retry interval.
defaultReadBufferSize = 1024 // (Byte)Buffer size.
receiveAllWaitTimeout = time.Millisecond // Default interval for reading buffer.
)
type Retry struct {
@ -45,10 +45,10 @@ func NewConn(remoteAddress string, localAddress ...string) (*Conn, error) {
// NewConnByNetConn creates a UDP connection object with given *net.UDPConn object.
func NewConnByNetConn(udp *net.UDPConn) *Conn {
return &Conn{
UDPConn: udp,
recvDeadline: time.Time{},
sendDeadline: time.Time{},
recvBufferWait: gRECV_ALL_WAIT_TIMEOUT,
UDPConn: udp,
receiveDeadline: time.Time{},
sendDeadline: time.Time{},
receiveBufferWait: receiveAllWaitTimeout,
}
}
@ -72,7 +72,7 @@ func (c *Conn) Send(data []byte, retry ...Retry) (err error) {
if len(retry) > 0 {
retry[0].Count--
if retry[0].Interval == 0 {
retry[0].Interval = gDEFAULT_RETRY_INTERVAL
retry[0].Interval = defaultRetryInterval
}
time.Sleep(retry[0].Interval)
}
@ -97,7 +97,7 @@ func (c *Conn) Recv(buffer int, retry ...Retry) ([]byte, error) {
if buffer > 0 {
data = make([]byte, buffer)
} else {
data = make([]byte, gDEFAULT_READ_BUFFER_SIZE)
data = make([]byte, defaultReadBufferSize)
}
for {
size, remoteAddr, err = c.ReadFromUDP(data)
@ -116,7 +116,7 @@ func (c *Conn) Recv(buffer int, retry ...Retry) ([]byte, error) {
}
retry[0].Count--
if retry[0].Interval == 0 {
retry[0].Interval = gDEFAULT_RETRY_INTERVAL
retry[0].Interval = defaultRetryInterval
}
time.Sleep(retry[0].Interval)
continue
@ -169,7 +169,7 @@ func (c *Conn) SendRecvWithTimeout(data []byte, receive int, timeout time.Durati
func (c *Conn) SetDeadline(t time.Time) error {
err := c.UDPConn.SetDeadline(t)
if err == nil {
c.recvDeadline = t
c.receiveDeadline = t
c.sendDeadline = t
}
return err
@ -178,7 +178,7 @@ func (c *Conn) SetDeadline(t time.Time) error {
func (c *Conn) SetRecvDeadline(t time.Time) error {
err := c.SetReadDeadline(t)
if err == nil {
c.recvDeadline = t
c.receiveDeadline = t
}
return err
}
@ -194,7 +194,7 @@ func (c *Conn) SetSendDeadline(t time.Time) error {
// SetRecvBufferWait sets the buffer waiting timeout when reading all data from connection.
// The waiting duration cannot be too long which might delay receiving data from remote address.
func (c *Conn) SetRecvBufferWait(d time.Duration) {
c.recvBufferWait = d
c.receiveBufferWait = d
}
// RemoteAddr returns the remote address of current UDP connection.

4
net/gudp/gudp_server.go
View File

@ -16,7 +16,7 @@ import (
)
const (
gDEFAULT_SERVER = "default"
defaultServer = "default"
)
// Server is the UDP server.
@ -33,7 +33,7 @@ var (
// GetServer creates and returns a UDP server instance with given name.
func GetServer(name ...interface{}) *Server {
serverName := gDEFAULT_SERVER
serverName := defaultServer
if len(name) > 0 && name[0] != "" {
serverName = gconv.String(name[0])
}

2
os/glog/glog_chaining.go
View File

@ -11,7 +11,7 @@ import (
"io"
)
// Expose returns the default logger of glog.
// Expose returns the default logger of package glog.
func Expose() *Logger {
return logger
}