Blinker

@@ -34,10 +34,13 @@ namespace Blinker {

 /**

  * everything using the linphone library happens in a separate thread,

- * because some call to linphone take long (up to two seconds)

+ * because some calls to linphone take long (up to two seconds)

  */

 namespace linphone {

+/// interlock for liblinphone, higher in mutex hierarchy than shared data mutex

+static std::mutex g_mtx;

+

 static char const *loglevel2str(OrtpLogLevel lev)

 {

   switch(lev) {

@@ -165,7 +168,7 @@ struct Data {

 };

 /**

- * @breif set playback file

+ * @brief set playback file

  * @param[in,out] data data of SIP client

  * @param[in] name name of sound file (without extension)

  */

@@ -557,6 +560,7 @@ void worker(SipPhone::ConfigData const &configData,

   // main loop of worker - with shared data locked

   std::chrono::milliseconds timeout(10);

+  std::unique_lock<std::mutex> g_lock(g_mtx);

   std::unique_lock<std::mutex> lock(sharedData.mtx);

   while (sharedData.run) {

@@ -609,8 +613,10 @@ void worker(SipPhone::ConfigData const &configData,

       lock.lock();

     }

-    // nothing to do, wait for signal

-    sharedData.cond.wait_for(lock, timeout);

+    // nothing to do, wait for signal (with both locks released)

+    lock.unlock();

+    sharedData.cond.wait_for(g_lock, timeout);

+    lock.lock();

   } // while (sharedData.run)

 }

@@ -32,8 +32,10 @@ public:

   };

   /// data shared between linphone thread and main Blinker thread

   struct SharedData {

-    std::mutex mtx; ///< protection for this structure

-    std::condition_variable cond; ///< worker threads waits on this condition

+    /// protection for this structure

+    std::mutex mtx;

+    /// worker threads waits on this condition, related mutex is g_mtx

+    std::condition_variable cond;

     /// Blinker -> SIP

     //@{

     bool run; ///< whether to keep worker running (false = exit)