apps/mochi-mqtt
1
0
Fork 0
mirror of https://github.com/mochi-mqtt/server.git synced 2025-10-28 02:21:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use defer to release buffers and decrease stats on any client closure

Browse Source
This commit is contained in:
mochi
2022-04-09 20:53:28 +01:00
parent 9ea687eb94
commit f218cde69c
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
server/server.go
View File

@@ -259,8 +259,10 @@ func (s *Server) onStorage(cl events.Clientlike, err error) {
// EstablishConnection establishes a new client when a listener // EstablishConnection establishes a new client when a listener
// accepts a new connection. // accepts a new connection.
func (s *Server) EstablishConnection(lid string, c net.Conn, ac auth.Controller) error { func (s *Server) EstablishConnection(lid string, c net.Conn, ac auth.Controller) error {
xbr := s.bytepool.Get() // Get byte buffer from pools for receiving packet data. xbr := s.bytepool.Get() // Get byte buffer from pools for receiving packet data.
xbw := s.bytepool.Get() // and for sending. xbw := s.bytepool.Get() // and for sending.
defer s.bytepool.Put(xbr) // Return byte buffers to pools when the client has finished.
defer s.bytepool.Put(xbw)
cl := clients.NewClient(c, cl := clients.NewClient(c,
circ.NewReaderFromSlice(s.Options.BufferBlockSize, xbr), circ.NewReaderFromSlice(s.Options.BufferBlockSize, xbr),
@@ -284,6 +286,8 @@ func (s *Server) EstablishConnection(lid string, c net.Conn, ac auth.Controller)
atomic.AddInt64(&s.System.ConnectionsTotal, 1) atomic.AddInt64(&s.System.ConnectionsTotal, 1)
atomic.AddInt64(&s.System.ClientsConnected, 1) atomic.AddInt64(&s.System.ClientsConnected, 1)
defer atomic.AddInt64(&s.System.ClientsConnected, -1)
defer atomic.AddInt64(&s.System.ClientsDisconnected, 1)
var sessionPresent bool var sessionPresent bool
if existing, ok := s.Clients.Get(pk.ClientIdentifier); ok { if existing, ok := s.Clients.Get(pk.ClientIdentifier); ok {
@@ -355,12 +359,6 @@ func (s *Server) EstablishConnection(lid string, c net.Conn, ac auth.Controller)
} }
err = cl.StopCause() err = cl.StopCause()
s.bytepool.Put(xbr) // Return byte buffers to pools when the client has finished.
s.bytepool.Put(xbw)
atomic.AddInt64(&s.System.ClientsConnected, -1)
atomic.AddInt64(&s.System.ClientsDisconnected, 1)
if s.Events.OnDisconnect != nil { if s.Events.OnDisconnect != nil {
s.Events.OnDisconnect(cl.Info(), err) s.Events.OnDisconnect(cl.Info(), err)
} }