Unlock mutex before throwing exception

PJHsieh · PJHsieh · commit 5ab44b02b5fa · 2022-08-31T06:47:43.000Z
diff --git a/common/selectabletimer.cpp b/common/selectabletimer.cpp
@@ -44,6 +44,7 @@ void SelectableTimer::start()
         int rc = timerfd_settime(m_tfd, 0, &m_interval, NULL);
         if (rc == -1)
         {
+            m_mutex.unlock();
             SWSS_LOG_THROW("failed to set timerfd, errno: %s", strerror(errno));
         }
         else
@@ -63,6 +64,7 @@ void SelectableTimer::stop()
         int rc = timerfd_settime(m_tfd, 0, &m_zero, NULL);
         if (rc == -1)
         {
+            m_mutex.unlock();
             SWSS_LOG_THROW("failed to set timerfd to zero, errno: %s", strerror(errno));
         }
         else

Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,7 @@ void SelectableTimer::start()`
`44`	`44`	`int rc = timerfd_settime(m_tfd, 0, &m_interval, NULL);`
`45`	`45`	`if (rc == -1)`
`46`	`46`	`{`
	`47`	`+ m_mutex.unlock();`
`47`	`48`	`SWSS_LOG_THROW("failed to set timerfd, errno: %s", strerror(errno));`
`48`	`49`	`}`
`49`	`50`	`else`
`@@ -63,6 +64,7 @@ void SelectableTimer::stop()`
`63`	`64`	`int rc = timerfd_settime(m_tfd, 0, &m_zero, NULL);`
`64`	`65`	`if (rc == -1)`
`65`	`66`	`{`
	`67`	`+ m_mutex.unlock();`
`66`	`68`	`SWSS_LOG_THROW("failed to set timerfd to zero, errno: %s", strerror(errno));`
`67`	`69`	`}`
`68`	`70`	`else`