external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-15 04:42:04 +00:00
Code Issues Releases Wiki Activity

refine modules, extract core module

Browse source
This commit is contained in:
winlin 2014-03-01 10:05:14 +08:00
parent c2ccb83912
commit 62fbe9e760
4 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
trunk/configure vendored
View file

@ -124,8 +124,16 @@ fi
#Core Module #Core Module
MODULE_ID="CORE" MODULE_ID="CORE"
MODULE_DEPENDS=() MODULE_DEPENDS=()
ModuleLibIncs=(${LibSTRoot} ${SRS_OBJS})
MODULE_FILES=("srs_core")
MODULE_DIR="src/core" . auto/modules.sh
CORE_OBJS="${MODULE_OBJS[@]}"
#
#App Module
MODULE_ID="APP"
MODULE_DEPENDS=("CORE")
ModuleLibIncs=(${LibSTRoot} ${LibHttpParserRoot} ${LibSSLRoot} ${SRS_OBJS}) ModuleLibIncs=(${LibSTRoot} ${LibHttpParserRoot} ${LibSSLRoot} ${SRS_OBJS})
MODULE_FILES=("srs_core" "srs_core_log" "srs_core_server" MODULE_FILES=("srs_core_log" "srs_core_server"
"srs_core_error" "srs_core_conn" "srs_core_client" "srs_core_error" "srs_core_conn" "srs_core_client"
"srs_core_rtmp" "srs_core_socket" "srs_core_buffer" "srs_core_rtmp" "srs_core_socket" "srs_core_buffer"
"srs_core_autofree" "srs_core_protocol" "srs_core_amf0" "srs_core_autofree" "srs_core_protocol" "srs_core_amf0"
@ -135,11 +143,11 @@ MODULE_FILES=("srs_core" "srs_core_log" "srs_core_server"
"srs_core_hls" "srs_core_forward" "srs_core_encoder" "srs_core_hls" "srs_core_forward" "srs_core_encoder"
"srs_core_http" "srs_core_thread" "srs_core_bandwidth") "srs_core_http" "srs_core_thread" "srs_core_bandwidth")
MODULE_DIR="src/app" . auto/modules.sh MODULE_DIR="src/app" . auto/modules.sh
CORE_OBJS="${MODULE_OBJS[@]}" APP_OBJS="${MODULE_OBJS[@]}"
# #
#Main Module #Main Module
MODULE_ID="MAIN" MODULE_ID="MAIN"
MODULE_DEPENDS=("CORE") MODULE_DEPENDS=("CORE" "APP")
ModuleLibIncs=(${LibSTRoot} ${SRS_OBJS}) ModuleLibIncs=(${LibSTRoot} ${SRS_OBJS})
MODULE_FILES=("srs_main_server" "srs_main_bandcheck") MODULE_FILES=("srs_main_server" "srs_main_bandcheck")
MODULE_DIR="src/main" . auto/modules.sh MODULE_DIR="src/main" . auto/modules.sh
@ -155,7 +163,7 @@ MAIN_ENTRANCES=("srs_main_server" "srs_main_bandcheck")
# all depends libraries # all depends libraries
ModuleLibFiles=(${LibSTfile} ${LibHttpParserfile} ${LibSSLfile}) ModuleLibFiles=(${LibSTfile} ${LibHttpParserfile} ${LibSSLfile})
# all depends objects # all depends objects
MODULE_OBJS="${CORE_OBJS[@]} ${CONFIG_OBJS[@]} ${PROTOCOL_OBJS[@]} ${MAIN_OBJS[@]}" MODULE_OBJS="${CORE_OBJS[@]} ${APP_OBJS[@]} ${MAIN_OBJS[@]}"
LINK_OPTIONS="-ldl" LINK_OPTIONS="-ldl"
# #
# srs: # srs:

5
trunk/src/app/srs_core.cpp → trunk/src/core/srs_core.cpp
View file

@ -23,12 +23,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_core.hpp> #include <srs_core.hpp>
#include <string.h>
#include <sys/time.h> #include <sys/time.h>
#include <netdb.h> #include <netdb.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#include <srs_core_log.hpp>
static int64_t _srs_system_time_us_cache = 0; static int64_t _srs_system_time_us_cache = 0;
int64_t srs_get_system_time_ms() int64_t srs_get_system_time_ms()
@ -73,7 +72,6 @@ std::string srs_dns_resolve(std::string host)
hostent* answer = gethostbyname(host.c_str()); hostent* answer = gethostbyname(host.c_str());
if (answer == NULL) { if (answer == NULL) {
srs_error("dns resolve host %s error.", host.c_str());
return ""; return "";
} }
@ -81,7 +79,6 @@ std::string srs_dns_resolve(std::string host)
memset(ipv4, 0, sizeof(ipv4)); memset(ipv4, 0, sizeof(ipv4));
for (int i = 0; i < answer->h_length; i++) { for (int i = 0; i < answer->h_length; i++) {
inet_ntop(AF_INET, answer->h_addr_list[i], ipv4, sizeof(ipv4)); inet_ntop(AF_INET, answer->h_addr_list[i], ipv4, sizeof(ipv4));
srs_info("dns resolve host %s to %s.", host.c_str(), ipv4);
break; break;
} }

0
trunk/src/app/srs_core.hpp → trunk/src/core/srs_core.hpp
View file

5
trunk/src/srs/srs.upp
View file

@ -4,9 +4,10 @@ file
..\main\srs_main_bandcheck.cpp, ..\main\srs_main_bandcheck.cpp,
auto readonly separator, auto readonly separator,
..\..\objs\srs_auto_headers.hpp, ..\..\objs\srs_auto_headers.hpp,
core readonly separator,
..\core\srs_core.hpp,
..\core\srs_core.cpp,
app readonly separator, app readonly separator,
..\app\srs_core.hpp,
..\app\srs_core.cpp,
..\app\srs_core_amf0.hpp, ..\app\srs_core_amf0.hpp,
..\app\srs_core_amf0.cpp, ..\app\srs_core_amf0.cpp,
..\app\srs_core_autofree.hpp, ..\app\srs_core_autofree.hpp,