gogrlx/nats-server
1
0
Fork 0
mirror of https://github.com/gogrlx/nats-server.git synced 2026-04-17 03:24:40 -07:00
Code Issues Packages Projects Releases Wiki Activity

Use atomic.Load

Browse Source 
Signed-off-by: Derek Collison <derek@nats.io>
This commit is contained in:
Derek Collison
2018-12-04 09:09:27 -08:00
parent f9912700c8
commit 53c70e6ce1
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
server/events.go
View File

@@ -296,12 +296,12 @@ func routeStat(r *client) *RouteStat {
rs := &RouteStat{
ID: r.cid,
Sent: DataStats{
Msgs: r.outMsgs,
Bytes: r.outBytes,
Msgs: atomic.LoadInt64(&r.outMsgs),
Bytes: atomic.LoadInt64(&r.outBytes),
},
Received: DataStats{
Msgs: r.inMsgs,
Bytes: r.inBytes,
Msgs: atomic.LoadInt64(&r.inMsgs),
Bytes: atomic.LoadInt64(&r.inBytes),
},
Pending: int(r.out.pb),
}
@@ -334,8 +334,8 @@ func (s *Server) sendStatsz(subj string) {
c.mu.Lock()
gs.ID = c.cid
gs.Sent = DataStats{
Msgs: c.outMsgs,
Bytes: c.outBytes,
Msgs: atomic.LoadInt64(&c.outMsgs),
Bytes: atomic.LoadInt64(&c.outBytes),
}
c.mu.Unlock()
// Gather matching inbound connections
@@ -343,8 +343,8 @@ func (s *Server) sendStatsz(subj string) {
for _, c := range gw.in {
c.mu.Lock()
if c.gw.name == name {
gs.Received.Msgs += c.inMsgs
gs.Received.Bytes += c.inBytes
gs.Received.Msgs += atomic.LoadInt64(&c.inMsgs)
gs.Received.Bytes += atomic.LoadInt64(&c.inBytes)
gs.NumInbound++
}
c.mu.Unlock()

2
server/events_test.go
View File

@@ -818,7 +818,7 @@ func TestSystemAccountWithGateways(t *testing.T) {
t.Fatalf("Expected %q for account, got %q", accName, account)
}
}
func TestServerEventStatusZ(t *testing.T) {
func TestServerEventStatsZ(t *testing.T) {
sa, optsA, sb, _, akp := runTrustedCluster(t)
defer sa.Shutdown()
defer sb.Shutdown()