use trylock on mutex (#85)

* append null to ostringstream will make c_str return part of a string.

* fixed review comment

Signed-off-by: Quan HL <quan.luuhoang8@gmail.com>

* fixed review comment

Signed-off-by: Quan HL <quan.luuhoang8@gmail.com>

* fixed review comment

Signed-off-by: Quan HL <quan.luuhoang8@gmail.com>

---------

Signed-off-by: Quan HL <quan.luuhoang8@gmail.com>

mod_audio_fork/audio_pipe.cpp

@@ -141,6 +141,11 @@ int AudioPipe::lws_callback(struct lws *wsi,
           return 0;
         }
         
+        if (ap->m_state == LWS_CLIENT_DISCONNECTING) {
+          lwsl_notice("AudioPipe::lws_service_thread race condition: got incoming message while closing the connection.\n");
+          return 0;
+        }
+
         if (lws_frame_is_binary(wsi)) {
           if (ap->is_bidirectional_audio_stream()) {
             ap->m_callback(ap->m_uuid.c_str(), ap->m_bugname.c_str(), AudioPipe::BINARY, NULL, (char *) in, len);

mod_audio_fork/lws_glue.cpp

@@ -38,7 +38,6 @@ namespace {
   static uint32_t playCount = 0;
 
   switch_status_t processIncomingBinary(private_t* tech_pvt, switch_core_session_t* session, const char* message, size_t dataLength) {
-    CircularBuffer_t *cBuffer = (CircularBuffer_t *) tech_pvt->circularBuffer;
     uint8_t* data = reinterpret_cast<uint8_t*>(const_cast<char*>(message));
     uint16_t* data_uint16 = reinterpret_cast<uint16_t*>(data);
     std::vector<uint16_t> pcm_data(data_uint16, data_uint16 + dataLength / sizeof(uint16_t));
@@ -70,32 +69,34 @@ namespace {
       return SWITCH_STATUS_FALSE;
     }
 
-    switch_mutex_lock(tech_pvt->mutex);
+    if (nullptr != tech_pvt->mutex && switch_mutex_trylock(tech_pvt->mutex) == SWITCH_STATUS_SUCCESS) {
+      //switch_mutex_lock(tech_pvt->mutex);
+      CircularBuffer_t *cBuffer = (CircularBuffer_t *) tech_pvt->circularBuffer;
 
-    try {
+      try {
-      // Resize the buffer if necessary
+        // Resize the buffer if necessary
-      size_t bytesResampled = pcm_data.size() * sizeof(uint16_t);
+        size_t bytesResampled = pcm_data.size() * sizeof(uint16_t);
-      if (cBuffer->capacity() - cBuffer->size() < bytesResampled / sizeof(uint16_t)) {
+        if (cBuffer->capacity() - cBuffer->size() < bytesResampled / sizeof(uint16_t)) {
-        // If buffer exceeds some max size, you could return SWITCH_STATUS_FALSE to abort the transfer
+          // If buffer exceeds some max size, you could return SWITCH_STATUS_FALSE to abort the transfer
-        // if (cBuffer->size() + std::max(bytesResampled / sizeof(uint16_t), (size_t)BUFFER_GROW_SIZE) > MAX_BUFFER_SIZE) return SWITCH_STATUS_FALSE;
+          // if (cBuffer->size() + std::max(bytesResampled / sizeof(uint16_t), (size_t)BUFFER_GROW_SIZE) > MAX_BUFFER_SIZE) return SWITCH_STATUS_FALSE;
 
-        cBuffer->set_capacity(cBuffer->size() + std::max(bytesResampled / sizeof(uint16_t), (size_t)BUFFER_GROW_SIZE));
+          cBuffer->set_capacity(cBuffer->size() + std::max(bytesResampled / sizeof(uint16_t), (size_t)BUFFER_GROW_SIZE));
+        }
+        // Push the data into the buffer.
+        cBuffer->insert(cBuffer->end(), pcm_data.begin(), pcm_data.end());
+      } catch (const std::exception& e) {
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error processing incoming binary message: %s\n", e.what());
+        switch_mutex_unlock(tech_pvt->mutex);
+        return SWITCH_STATUS_FALSE;
+      } catch (...) {
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error processing incoming binary message\n");
+        switch_mutex_unlock(tech_pvt->mutex);
+        return SWITCH_STATUS_FALSE;
       }
-      // Push the data into the buffer.
-      cBuffer->insert(cBuffer->end(), pcm_data.begin(), pcm_data.end());
-    } catch (const std::exception& e) {
-      switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error processing incoming binary message: %s\n", e.what());
       switch_mutex_unlock(tech_pvt->mutex);
-      return SWITCH_STATUS_FALSE;
+      return SWITCH_STATUS_SUCCESS;
-    } catch (...) {
-      switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error processing incoming binary message\n");
-      switch_mutex_unlock(tech_pvt->mutex);
-      return SWITCH_STATUS_FALSE;
     }
-
+    return SWITCH_STATUS_FALSE;
-    switch_mutex_unlock(tech_pvt->mutex);
-
-    return SWITCH_STATUS_SUCCESS;
 }
 
   void processIncomingMessage(private_t* tech_pvt, switch_core_session_t* session, const char* message) {

mod_azure_transcribe/azure_transcribe_glue.cpp

@@ -382,22 +382,18 @@ private:
 
 		const char* endpoint = switch_channel_get_variable(channel, "AZURE_SERVICE_ENDPOINT");
 		const char* endpointId = switch_channel_get_variable(channel, "AZURE_SERVICE_ENDPOINT_ID");
-		configuration_stream <<
+		configuration_stream << (endpoint ? endpoint : "") << ";"
-			endpoint << ";" <<
+			<< (endpointId ? endpointId : "") << ";";
-			endpointId << ";";
 		if (switch_true(switch_channel_get_variable(channel, "AZURE_USE_OUTPUT_FORMAT_DETAILED"))) {
 			configuration_stream << "output_format_detailed;";
 		}
 		if (switch_true(switch_channel_get_variable(channel, "AZURE_AUDIO_LOGGING"))) {
 			configuration_stream << "audio_logging;";
 		}
-		if (nullptr != proxyIP && nullptr != proxyPort) {
+		configuration_stream << (proxyIP ? proxyIP : "") << ";"
-			configuration_stream <<
+			<< (proxyPort ? proxyPort : "") << ";"
-				proxyIP << ";" <<
+			<< (proxyUsername ? proxyUsername : "") << ";"
-				proxyPort << ";" <<
+			<< (proxyPassword ? proxyPassword : "") << ";";
-				proxyUsername << ";" <<
-				proxyPassword << ";";
-		}
 		const char* var;
 		if (var = switch_channel_get_variable(channel, "AZURE_SPEECH_ALTERNATIVE_LANGUAGE_CODES")) {
 			configuration_stream << var << ";";