winlin

refine modules, extract core module

@@ -124,8 +124,16 @@ fi @@ -124,8 +124,16 @@ fi
124 #Core Module 124 #Core Module
125 MODULE_ID="CORE" 125 MODULE_ID="CORE"
126 MODULE_DEPENDS=() 126 MODULE_DEPENDS=()
  127 +ModuleLibIncs=(${LibSTRoot} ${SRS_OBJS})
  128 +MODULE_FILES=("srs_core")
  129 +MODULE_DIR="src/core" . auto/modules.sh
  130 +CORE_OBJS="${MODULE_OBJS[@]}"
  131 +#
  132 +#App Module
  133 +MODULE_ID="APP"
  134 +MODULE_DEPENDS=("CORE")
127 ModuleLibIncs=(${LibSTRoot} ${LibHttpParserRoot} ${LibSSLRoot} ${SRS_OBJS}) 135 ModuleLibIncs=(${LibSTRoot} ${LibHttpParserRoot} ${LibSSLRoot} ${SRS_OBJS})
128 -MODULE_FILES=("srs_core" "srs_core_log" "srs_core_server" 136 +MODULE_FILES=("srs_core_log" "srs_core_server"
129 "srs_core_error" "srs_core_conn" "srs_core_client" 137 "srs_core_error" "srs_core_conn" "srs_core_client"
130 "srs_core_rtmp" "srs_core_socket" "srs_core_buffer" 138 "srs_core_rtmp" "srs_core_socket" "srs_core_buffer"
131 "srs_core_autofree" "srs_core_protocol" "srs_core_amf0" 139 "srs_core_autofree" "srs_core_protocol" "srs_core_amf0"
@@ -135,11 +143,11 @@ MODULE_FILES=("srs_core" "srs_core_log" "srs_core_server" @@ -135,11 +143,11 @@ MODULE_FILES=("srs_core" "srs_core_log" "srs_core_server"
135 "srs_core_hls" "srs_core_forward" "srs_core_encoder" 143 "srs_core_hls" "srs_core_forward" "srs_core_encoder"
136 "srs_core_http" "srs_core_thread" "srs_core_bandwidth") 144 "srs_core_http" "srs_core_thread" "srs_core_bandwidth")
137 MODULE_DIR="src/app" . auto/modules.sh 145 MODULE_DIR="src/app" . auto/modules.sh
138 -CORE_OBJS="${MODULE_OBJS[@]}" 146 +APP_OBJS="${MODULE_OBJS[@]}"
139 # 147 #
140 #Main Module 148 #Main Module
141 MODULE_ID="MAIN" 149 MODULE_ID="MAIN"
142 -MODULE_DEPENDS=("CORE") 150 +MODULE_DEPENDS=("CORE" "APP")
143 ModuleLibIncs=(${LibSTRoot} ${SRS_OBJS}) 151 ModuleLibIncs=(${LibSTRoot} ${SRS_OBJS})
144 MODULE_FILES=("srs_main_server" "srs_main_bandcheck") 152 MODULE_FILES=("srs_main_server" "srs_main_bandcheck")
145 MODULE_DIR="src/main" . auto/modules.sh 153 MODULE_DIR="src/main" . auto/modules.sh
@@ -155,7 +163,7 @@ MAIN_ENTRANCES=("srs_main_server" "srs_main_bandcheck") @@ -155,7 +163,7 @@ MAIN_ENTRANCES=("srs_main_server" "srs_main_bandcheck")
155 # all depends libraries 163 # all depends libraries
156 ModuleLibFiles=(${LibSTfile} ${LibHttpParserfile} ${LibSSLfile}) 164 ModuleLibFiles=(${LibSTfile} ${LibHttpParserfile} ${LibSSLfile})
157 # all depends objects 165 # all depends objects
158 -MODULE_OBJS="${CORE_OBJS[@]} ${CONFIG_OBJS[@]} ${PROTOCOL_OBJS[@]} ${MAIN_OBJS[@]}" 166 +MODULE_OBJS="${CORE_OBJS[@]} ${APP_OBJS[@]} ${MAIN_OBJS[@]}"
159 LINK_OPTIONS="-ldl" 167 LINK_OPTIONS="-ldl"
160 # 168 #
161 # srs: 169 # srs:
@@ -23,12 +23,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -23,12 +23,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
23 23
24 #include <srs_core.hpp> 24 #include <srs_core.hpp>
25 25
  26 +#include <string.h>
26 #include <sys/time.h> 27 #include <sys/time.h>
27 #include <netdb.h> 28 #include <netdb.h>
28 #include <arpa/inet.h> 29 #include <arpa/inet.h>
29 30
30 -#include <srs_core_log.hpp>  
31 -  
32 static int64_t _srs_system_time_us_cache = 0; 31 static int64_t _srs_system_time_us_cache = 0;
33 32
34 int64_t srs_get_system_time_ms() 33 int64_t srs_get_system_time_ms()
@@ -73,7 +72,6 @@ std::string srs_dns_resolve(std::string host) @@ -73,7 +72,6 @@ std::string srs_dns_resolve(std::string host)
73 72
74 hostent* answer = gethostbyname(host.c_str()); 73 hostent* answer = gethostbyname(host.c_str());
75 if (answer == NULL) { 74 if (answer == NULL) {
76 - srs_error("dns resolve host %s error.", host.c_str());  
77 return ""; 75 return "";
78 } 76 }
79 77
@@ -81,7 +79,6 @@ std::string srs_dns_resolve(std::string host) @@ -81,7 +79,6 @@ std::string srs_dns_resolve(std::string host)
81 memset(ipv4, 0, sizeof(ipv4)); 79 memset(ipv4, 0, sizeof(ipv4));
82 for (int i = 0; i < answer->h_length; i++) { 80 for (int i = 0; i < answer->h_length; i++) {
83 inet_ntop(AF_INET, answer->h_addr_list[i], ipv4, sizeof(ipv4)); 81 inet_ntop(AF_INET, answer->h_addr_list[i], ipv4, sizeof(ipv4));
84 - srs_info("dns resolve host %s to %s.", host.c_str(), ipv4);  
85 break; 82 break;
86 } 83 }
87 84
@@ -4,9 +4,10 @@ file @@ -4,9 +4,10 @@ file
4 ..\main\srs_main_bandcheck.cpp, 4 ..\main\srs_main_bandcheck.cpp,
5 auto readonly separator, 5 auto readonly separator,
6 ..\..\objs\srs_auto_headers.hpp, 6 ..\..\objs\srs_auto_headers.hpp,
  7 + core readonly separator,
  8 + ..\core\srs_core.hpp,
  9 + ..\core\srs_core.cpp,
7 app readonly separator, 10 app readonly separator,
8 - ..\app\srs_core.hpp,  
9 - ..\app\srs_core.cpp,  
10 ..\app\srs_core_amf0.hpp, 11 ..\app\srs_core_amf0.hpp,
11 ..\app\srs_core_amf0.cpp, 12 ..\app\srs_core_amf0.cpp,
12 ..\app\srs_core_autofree.hpp, 13 ..\app\srs_core_autofree.hpp,