diff --git a/trunk/configure b/trunk/configure index 44a16d531..a6d405735 100755 --- a/trunk/configure +++ b/trunk/configure @@ -133,7 +133,7 @@ CORE_OBJS="${MODULE_OBJS[@]}" MODULE_ID="KERNEL" MODULE_DEPENDS=("CORE") ModuleLibIncs=(${SRS_OBJS}) -MODULE_FILES=("srs_kernel_error") +MODULE_FILES=("srs_kernel_error" "srs_kernel_log") MODULE_DIR="src/kernel" . auto/modules.sh KERNEL_OBJS="${MODULE_OBJS[@]}" # @@ -141,7 +141,7 @@ KERNEL_OBJS="${MODULE_OBJS[@]}" MODULE_ID="APP" MODULE_DEPENDS=("CORE" "KERNEL") ModuleLibIncs=(${LibSTRoot} ${LibHttpParserRoot} ${LibSSLRoot} ${SRS_OBJS}) -MODULE_FILES=("srs_core_log" "srs_core_server" +MODULE_FILES=("srs_core_server" "srs_core_conn" "srs_core_client" "srs_core_rtmp" "srs_core_socket" "srs_core_buffer" "srs_core_protocol" "srs_core_amf0" @@ -150,7 +150,7 @@ MODULE_FILES=("srs_core_log" "srs_core_server" "srs_core_config" "srs_core_refer" "srs_core_reload" "srs_core_hls" "srs_core_forward" "srs_core_encoder" "srs_core_http" "srs_core_thread" "srs_core_bandwidth" - "srs_core_st") + "srs_core_st" "srs_core_log_context") MODULE_DIR="src/app" . auto/modules.sh APP_OBJS="${MODULE_OBJS[@]}" # diff --git a/trunk/src/app/srs_core_amf0.cpp b/trunk/src/app/srs_core_amf0.cpp index 814519a9d..5ef862dd1 100644 --- a/trunk/src/app/srs_core_amf0.cpp +++ b/trunk/src/app/srs_core_amf0.cpp @@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include -#include +#include #include #include diff --git a/trunk/src/app/srs_core_buffer.cpp b/trunk/src/app/srs_core_buffer.cpp index b5f23ff4d..d901a10e7 100644 --- a/trunk/src/app/srs_core_buffer.cpp +++ b/trunk/src/app/srs_core_buffer.cpp @@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include -#include +#include #define SOCKET_READ_SIZE 4096 diff --git a/trunk/src/app/srs_core_client.cpp b/trunk/src/app/srs_core_client.cpp index 9fb104ab5..6e5d8f01e 100644 --- a/trunk/src/app/srs_core_client.cpp +++ b/trunk/src/app/srs_core_client.cpp @@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. using namespace std; #include -#include +#include #include #include #include diff --git a/trunk/src/app/srs_core_codec.cpp b/trunk/src/app/srs_core_codec.cpp index 60fc8ee29..af3462608 100644 --- a/trunk/src/app/srs_core_codec.cpp +++ b/trunk/src/app/srs_core_codec.cpp @@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include -#include +#include #include SrsCodecBuffer::SrsCodecBuffer() diff --git a/trunk/src/app/srs_core_config.cpp b/trunk/src/app/srs_core_config.cpp index 1cb34b915..f9118b0df 100644 --- a/trunk/src/app/srs_core_config.cpp +++ b/trunk/src/app/srs_core_config.cpp @@ -38,7 +38,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. using namespace std; #include -#include +#include #include #define FILE_OFFSET(fd) lseek(fd, 0, SEEK_CUR) diff --git a/trunk/src/app/srs_core_conn.cpp b/trunk/src/app/srs_core_conn.cpp index fad20a0be..92a2ba744 100644 --- a/trunk/src/app/srs_core_conn.cpp +++ b/trunk/src/app/srs_core_conn.cpp @@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include -#include +#include #include #include diff --git a/trunk/src/app/srs_core_encoder.cpp b/trunk/src/app/srs_core_encoder.cpp index 082d7eeeb..778bfa810 100644 --- a/trunk/src/app/srs_core_encoder.cpp +++ b/trunk/src/app/srs_core_encoder.cpp @@ -33,7 +33,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include -#include +#include #include #include #include diff --git a/trunk/src/app/srs_core_forward.cpp b/trunk/src/app/srs_core_forward.cpp index 75830e75d..9e4818b18 100644 --- a/trunk/src/app/srs_core_forward.cpp +++ b/trunk/src/app/srs_core_forward.cpp @@ -30,7 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include -#include +#include #include #include #include diff --git a/trunk/src/app/srs_core_handshake.cpp b/trunk/src/app/srs_core_handshake.cpp index a014d0ddb..9f05133df 100644 --- a/trunk/src/app/srs_core_handshake.cpp +++ b/trunk/src/app/srs_core_handshake.cpp @@ -27,7 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include -#include +#include #include #include diff --git a/trunk/src/app/srs_core_http.cpp b/trunk/src/app/srs_core_http.cpp index e9231cafb..e47b47206 100644 --- a/trunk/src/app/srs_core_http.cpp +++ b/trunk/src/app/srs_core_http.cpp @@ -34,7 +34,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include -#include +#include #include #define SRS_DEFAULT_HTTP_PORT 80 diff --git a/trunk/src/app/srs_core_log.cpp b/trunk/src/app/srs_core_log_context.cpp similarity index 64% rename from trunk/src/app/srs_core_log.cpp rename to trunk/src/app/srs_core_log_context.cpp index d072dcda0..369ac47f4 100644 --- a/trunk/src/app/srs_core_log.cpp +++ b/trunk/src/app/srs_core_log_context.cpp @@ -21,64 +21,20 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include +#include -#include -#include +ILogContext* log_context = new SrsLogContext(); -#include -#include - -#include - -ILogContext::ILogContext() -{ -} - -ILogContext::~ILogContext() -{ -} - -class LogContext : public ILogContext -{ -private: - class DateTime - { - private: - // %d-%02d-%02d %02d:%02d:%02d.%03d - #define DATE_LEN 24 - char time_data[DATE_LEN]; - public: - DateTime(); - virtual ~DateTime(); - public: - virtual const char* format_time(); - }; -private: - DateTime time; - std::map cache; -public: - LogContext(); - virtual ~LogContext(); -public: - virtual void generate_id(); - virtual int get_id(); -public: - virtual const char* format_time(); -}; - -ILogContext* log_context = new LogContext(); - -LogContext::DateTime::DateTime() +SrsLogContext::DateTime::DateTime() { memset(time_data, 0, DATE_LEN); } -LogContext::DateTime::~DateTime() +SrsLogContext::DateTime::~DateTime() { } -const char* LogContext::DateTime::format_time() +const char* SrsLogContext::DateTime::format_time() { // clock time timeval tv; @@ -100,27 +56,26 @@ const char* LogContext::DateTime::format_time() return time_data; } -LogContext::LogContext() +SrsLogContext::SrsLogContext() { } -LogContext::~LogContext() +SrsLogContext::~SrsLogContext() { } -void LogContext::generate_id() +void SrsLogContext::generate_id() { static int id = 1; cache[st_thread_self()] = id++; } -int LogContext::get_id() +int SrsLogContext::get_id() { return cache[st_thread_self()]; } -const char* LogContext::format_time() +const char* SrsLogContext::format_time() { return time.format_time(); } - diff --git a/trunk/src/app/srs_core_log_context.hpp b/trunk/src/app/srs_core_log_context.hpp new file mode 100644 index 000000000..8aa740a70 --- /dev/null +++ b/trunk/src/app/srs_core_log_context.hpp @@ -0,0 +1,70 @@ +/* +The MIT License (MIT) + +Copyright (c) 2013-2014 winlin + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +*/ + +#ifndef SRS_CORE_LOG_CONTEXT_HPP +#define SRS_CORE_LOG_CONTEXT_HPP + +/* +#include +*/ + +#include + +#include +#include + +#include +#include + +#include +#include + +class SrsLogContext : public ILogContext +{ +private: + class DateTime + { + private: + // %d-%02d-%02d %02d:%02d:%02d.%03d + #define DATE_LEN 24 + char time_data[DATE_LEN]; + public: + DateTime(); + virtual ~DateTime(); + public: + virtual const char* format_time(); + }; +private: + DateTime time; + std::map cache; +public: + SrsLogContext(); + virtual ~SrsLogContext(); +public: + virtual void generate_id(); + virtual int get_id(); +public: + virtual const char* format_time(); +}; + +#endif diff --git a/trunk/src/app/srs_core_pithy_print.cpp b/trunk/src/app/srs_core_pithy_print.cpp index 265071ac4..7f827494e 100644 --- a/trunk/src/app/srs_core_pithy_print.cpp +++ b/trunk/src/app/srs_core_pithy_print.cpp @@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include -#include +#include #include #include #include diff --git a/trunk/src/app/srs_core_protocol.cpp b/trunk/src/app/srs_core_protocol.cpp index 56727c962..52f20fe3d 100644 --- a/trunk/src/app/srs_core_protocol.cpp +++ b/trunk/src/app/srs_core_protocol.cpp @@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include -#include +#include #include #include #include diff --git a/trunk/src/app/srs_core_protocol.hpp b/trunk/src/app/srs_core_protocol.hpp index 003b31c11..7aaf83849 100644 --- a/trunk/src/app/srs_core_protocol.hpp +++ b/trunk/src/app/srs_core_protocol.hpp @@ -34,7 +34,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include -#include +#include #include // the following is the timeout for rtmp protocol, diff --git a/trunk/src/app/srs_core_refer.cpp b/trunk/src/app/srs_core_refer.cpp index b04572964..e891ef74e 100644 --- a/trunk/src/app/srs_core_refer.cpp +++ b/trunk/src/app/srs_core_refer.cpp @@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include -#include +#include #include int SrsRefer::check(std::string page_url, SrsConfDirective* refer) diff --git a/trunk/src/app/srs_core_rtmp.cpp b/trunk/src/app/srs_core_rtmp.cpp index 06340450a..1b6a67c9e 100644 --- a/trunk/src/app/srs_core_rtmp.cpp +++ b/trunk/src/app/srs_core_rtmp.cpp @@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include -#include +#include #include #include #include diff --git a/trunk/src/app/srs_core_server.cpp b/trunk/src/app/srs_core_server.cpp index 2beb1060a..316f6ff4e 100644 --- a/trunk/src/app/srs_core_server.cpp +++ b/trunk/src/app/srs_core_server.cpp @@ -30,7 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include -#include +#include #include #include #include diff --git a/trunk/src/app/srs_core_source.cpp b/trunk/src/app/srs_core_source.cpp index 0894e37c0..3c95f062c 100644 --- a/trunk/src/app/srs_core_source.cpp +++ b/trunk/src/app/srs_core_source.cpp @@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include using namespace std; -#include +#include #include #include #include diff --git a/trunk/src/app/srs_core_stream.cpp b/trunk/src/app/srs_core_stream.cpp index 7baaa901c..ce534c465 100644 --- a/trunk/src/app/srs_core_stream.cpp +++ b/trunk/src/app/srs_core_stream.cpp @@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include -#include +#include #include SrsStream::SrsStream() diff --git a/trunk/src/app/srs_core_thread.cpp b/trunk/src/app/srs_core_thread.cpp index ee3626b8a..51ee95530 100644 --- a/trunk/src/app/srs_core_thread.cpp +++ b/trunk/src/app/srs_core_thread.cpp @@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include -#include +#include ISrsThreadHandler::ISrsThreadHandler() { diff --git a/trunk/src/kernel/srs_kernel_log.cpp b/trunk/src/kernel/srs_kernel_log.cpp new file mode 100644 index 000000000..3b6bd411a --- /dev/null +++ b/trunk/src/kernel/srs_kernel_log.cpp @@ -0,0 +1,33 @@ +/* +The MIT License (MIT) + +Copyright (c) 2013-2014 winlin + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +*/ + +#include + +ILogContext::ILogContext() +{ +} + +ILogContext::~ILogContext() +{ +} + diff --git a/trunk/src/app/srs_core_log.hpp b/trunk/src/kernel/srs_kernel_log.hpp similarity index 99% rename from trunk/src/app/srs_core_log.hpp rename to trunk/src/kernel/srs_kernel_log.hpp index ffeca8ec2..aca42be8d 100644 --- a/trunk/src/app/srs_core_log.hpp +++ b/trunk/src/kernel/srs_kernel_log.hpp @@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define SRS_CORE_LOG_HPP /* -#include +#include */ #include diff --git a/trunk/src/main/srs_main_server.cpp b/trunk/src/main/srs_main_server.cpp index 6d98cc840..2b793ccd2 100644 --- a/trunk/src/main/srs_main_server.cpp +++ b/trunk/src/main/srs_main_server.cpp @@ -21,7 +21,7 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include +#include #include #include #include diff --git a/trunk/src/srs/srs.upp b/trunk/src/srs/srs.upp index bbe313879..290fa33e7 100755 --- a/trunk/src/srs/srs.upp +++ b/trunk/src/srs/srs.upp @@ -12,6 +12,8 @@ file kernel readonly separator, ..\kernel\srs_kernel_error.hpp, ..\kernel\srs_kernel_error.cpp, + ..\kernel\srs_kernel_log.hpp, + ..\kernel\srs_kernel_log.cpp, app readonly separator, ..\app\srs_core_amf0.hpp, ..\app\srs_core_amf0.cpp, @@ -37,8 +39,8 @@ file ..\app\srs_core_hls.cpp, ..\app\srs_core_http.hpp, ..\app\srs_core_http.cpp, - ..\app\srs_core_log.hpp, - ..\app\srs_core_log.cpp, + ..\app\srs_core_log_context.hpp, + ..\app\srs_core_log_context.cpp, ..\app\srs_core_pithy_print.hpp, ..\app\srs_core_pithy_print.cpp, ..\app\srs_core_protocol.hpp,