SRT: Refine the lock for log.

Author: winlinvip

trunk/auto/options.sh

@@ -4,7 +4,7 @@
 help=no
 # feature options
 SRS_HDS=NO
-SRS_SRT=NO
+SRS_SRT=YES
 SRS_RTC=YES
 SRS_CXX11=YES
 SRS_CXX14=NO

trunk/configure

@@ -199,7 +199,7 @@ MODULE_ID="CORE"
 MODULE_DEPENDS=()
 ModuleLibIncs=(${SRS_OBJS_DIR})
 MODULE_FILES=("srs_core" "srs_core_version5" "srs_core_autofree" "srs_core_performance"
-		"srs_core_time" "srs_core_platform" "srs_core_lock")
+		"srs_core_time" "srs_core_platform")
 CORE_INCS="src/core"; MODULE_DIR=${CORE_INCS} . auto/modules.sh
 CORE_OBJS="${MODULE_OBJS[@]}"
 #

trunk/src/app/srs_app_log.cpp

@@ -18,7 +18,7 @@
 #include <srs_kernel_error.hpp>
 #include <srs_app_utility.hpp>
 #include <srs_kernel_utility.hpp>
-#include <srs_core_lock.hpp>
+#include <srs_app_threads.hpp>
 
 // the max size of a line of log.
 #define LOG_MAX_SIZE 8192
@@ -37,7 +37,8 @@ SrsFileLog::SrsFileLog()
     log_to_file_tank = false;
     utc = false;
 
-    pthread_mutex_init(&mutex_, NULL);
+    int rc = pthread_mutex_init(&mutex_, NULL);
+    srs_assert(!rc);
 }
 
 SrsFileLog::~SrsFileLog()
@@ -53,7 +54,8 @@ SrsFileLog::~SrsFileLog()
         _srs_config->unsubscribe(this);
     }
 
-    pthread_mutex_destroy(&mutex_);
+    int rc = pthread_mutex_destroy(&mutex_);
+    srs_assert(!rc);
 }
 
 srs_error_t SrsFileLog::initialize()
@@ -89,18 +91,18 @@ void SrsFileLog::verbose(const char* tag, SrsContextId context_id, const char* f
     if (level > SrsLogLevelVerbose) {
         return;
     }
-    
+
     int size = 0;
     if (!srs_log_header(log_data, LOG_MAX_SIZE, utc, false, tag, context_id, "Verb", &size)) {
         return;
     }
-    
+
     va_list ap;
     va_start(ap, fmt);
     // we reserved 1 bytes for the new line.
     size += vsnprintf(log_data + size, LOG_MAX_SIZE - size, fmt, ap);
     va_end(ap);
-    
+
     write_log(fd, log_data, size, SrsLogLevelVerbose);
 }
 
@@ -111,18 +113,18 @@ void SrsFileLog::info(const char* tag, SrsContextId context_id, const char* fmt,
     if (level > SrsLogLevelInfo) {
         return;
     }
-    
+
     int size = 0;
     if (!srs_log_header(log_data, LOG_MAX_SIZE, utc, false, tag, context_id, "Debug", &size)) {
         return;
     }
-    
+
     va_list ap;
     va_start(ap, fmt);
     // we reserved 1 bytes for the new line.
     size += vsnprintf(log_data + size, LOG_MAX_SIZE - size, fmt, ap);
     va_end(ap);
-    
+
     write_log(fd, log_data, size, SrsLogLevelInfo);
 }
 
@@ -133,18 +135,18 @@ void SrsFileLog::trace(const char* tag, SrsContextId context_id, const char* fmt
     if (level > SrsLogLevelTrace) {
         return;
     }
-    
+
     int size = 0;
     if (!srs_log_header(log_data, LOG_MAX_SIZE, utc, false, tag, context_id, "Trace", &size)) {
         return;
     }
-    
+
     va_list ap;
     va_start(ap, fmt);
     // we reserved 1 bytes for the new line.
     size += vsnprintf(log_data + size, LOG_MAX_SIZE - size, fmt, ap);
     va_end(ap);
-    
+
     write_log(fd, log_data, size, SrsLogLevelTrace);
 }
 
@@ -155,18 +157,18 @@ void SrsFileLog::warn(const char* tag, SrsContextId context_id, const char* fmt,
     if (level > SrsLogLevelWarn) {
         return;
     }
-    
+
     int size = 0;
     if (!srs_log_header(log_data, LOG_MAX_SIZE, utc, true, tag, context_id, "Warn", &size)) {
         return;
     }
-    
+
     va_list ap;
     va_start(ap, fmt);
     // we reserved 1 bytes for the new line.
     size += vsnprintf(log_data + size, LOG_MAX_SIZE - size, fmt, ap);
     va_end(ap);
-    
+
     write_log(fd, log_data, size, SrsLogLevelWarn);
 }
 

trunk/src/app/srs_app_log.hpp

@@ -11,6 +11,7 @@
 
 #include <string.h>
 #include <string>
+#include <pthread.h>
 
 #include <srs_app_reload.hpp>
 #include <srs_protocol_log.hpp>

trunk/src/app/srs_app_threads.cpp

@@ -26,6 +26,7 @@
 #include <srs_app_srt_source.hpp>
 #endif
 
+#include <stdlib.h>
 #include <string>
 using namespace std;
 
@@ -427,3 +428,14 @@ srs_error_t srs_thread_initialize()
     return err;
 }
 
+SrsScopeLock::SrsScopeLock(pthread_mutex_t* mutex)
+{
+    mutex_ = mutex;
+    pthread_mutex_lock(mutex_);
+}
+
+SrsScopeLock::~SrsScopeLock()
+{
+    pthread_mutex_unlock(mutex_);
+}
+

trunk/src/app/srs_app_threads.hpp

@@ -11,6 +11,8 @@
 
 #include <srs_app_hourglass.hpp>
 
+#include <pthread.h>
+
 // Protect server in high load.
 class SrsCircuitBreaker : public ISrsFastTimer
 {
@@ -49,5 +51,15 @@ extern SrsCircuitBreaker* _srs_circuit_breaker;
 // Initialize global or thread-local variables.
 extern srs_error_t srs_thread_initialize();
 
+// Lock the mutex when enter current scope, and unlock it when out.
+class SrsScopeLock
+{
+private:
+    pthread_mutex_t* mutex_;
+public:
+    SrsScopeLock(pthread_mutex_t* mutex);
+    ~SrsScopeLock();
+};
+
 #endif