Do not use trace lock if trace is disabled

Signed-off-by: Vladimir Lavor <vlavor@cisco.com>
FDio · Feb 22, 2024 · 783ca18 · 783ca18
1 parent e33b77a
commit 783ca18
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/core/request_handler.go b/core/request_handler.go
@@ -113,9 +113,9 @@ func (c *Connection) processRequest(ch *Channel, req *vppRequest) error {
  if err = func() (err error) {
  timestamp := c.trace.registerNew()
  err = c.vppClient.SendMsg(context, data)
- c.traceLock.Lock()
- defer c.traceLock.Unlock()
  if c.trace != nil {
+ c.traceLock.Lock()
+ defer c.traceLock.Unlock()
  c.trace.send(&api.Record{
  Message: req.msg,
  Timestamp: timestamp,
@@ -158,9 +158,9 @@ func (c *Connection) processRequest(ch *Channel, req *vppRequest) error {
  if err = func() (err error) {
  timestamp := c.trace.registerNew()
  err = c.vppClient.SendMsg(context, pingData)
- c.traceLock.Lock()
- defer c.traceLock.Unlock()
  if c.trace != nil {
+ c.traceLock.Lock()
+ defer c.traceLock.Unlock()
  c.trace.send(&api.Record{
  Message: c.msgControlPing,
  Timestamp: timestamp,
@@ -214,9 +214,9 @@ func (c *Connection) msgCallback(msgID uint16, data []byte) {
  if err = func() (err error) {
  timestamp := c.trace.registerNew()
  err = c.codec.DecodeMsg(data, msg)
- c.traceLock.Lock()
- defer c.traceLock.Unlock()
  if c.trace != nil {
+ c.traceLock.Lock()
+ defer c.traceLock.Unlock()
  c.trace.send(&api.Record{
  Message: msg,
  Timestamp: timestamp,