Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
胡斌
/
srs
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
winlin
2014-03-01 10:05:14 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
62fbe9e7609b90b0625f01534a73c3ef61d3e7ee
62fbe9e7
1 parent
c2ccb839
refine modules, extract core module
隐藏空白字符变更
内嵌
并排对比
正在显示
4 个修改的文件
包含
16 行增加
和
10 行删除
trunk/configure
trunk/src/app/srs_core.cpp → trunk/src/core/srs_core.cpp
trunk/src/app/srs_core.hpp → trunk/src/core/srs_core.hpp
trunk/src/srs/srs.upp
trunk/configure
查看文件 @
62fbe9e
...
...
@@ -124,8 +124,16 @@ fi
#Core Module
MODULE_ID
=
"CORE"
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
}
)
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_rtmp"
"srs_core_socket"
"srs_core_buffer"
"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_http"
"srs_core_thread"
"srs_core_bandwidth"
)
MODULE_DIR
=
"src/app"
. auto/modules.sh
CORE
_OBJS
=
"
${
MODULE_OBJS
[@]
}
"
APP
_OBJS
=
"
${
MODULE_OBJS
[@]
}
"
#
#Main Module
MODULE_ID
=
"MAIN"
MODULE_DEPENDS
=(
"CORE"
)
MODULE_DEPENDS
=(
"CORE"
"APP"
)
ModuleLibIncs
=(
${
LibSTRoot
}
${
SRS_OBJS
}
)
MODULE_FILES
=(
"srs_main_server"
"srs_main_bandcheck"
)
MODULE_DIR
=
"src/main"
. auto/modules.sh
...
...
@@ -155,7 +163,7 @@ MAIN_ENTRANCES=("srs_main_server" "srs_main_bandcheck")
# all depends libraries
ModuleLibFiles
=(
${
LibSTfile
}
${
LibHttpParserfile
}
${
LibSSLfile
}
)
# all depends objects
MODULE_OBJS
=
"
${
CORE_OBJS
[@]
}
${
CONFIG_OBJS
[@]
}
${
PROTOCOL
_OBJS
[@]
}
${
MAIN_OBJS
[@]
}
"
MODULE_OBJS
=
"
${
CORE_OBJS
[@]
}
${
APP
_OBJS
[@]
}
${
MAIN_OBJS
[@]
}
"
LINK_OPTIONS
=
"-ldl"
#
# srs:
...
...
trunk/src/
app
/srs_core.cpp → trunk/src/
core
/srs_core.cpp
查看文件 @
62fbe9e
...
...
@@ -23,12 +23,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_core.hpp>
#include <string.h>
#include <sys/time.h>
#include <netdb.h>
#include <arpa/inet.h>
#include <srs_core_log.hpp>
static
int64_t
_srs_system_time_us_cache
=
0
;
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
());
if
(
answer
==
NULL
)
{
srs_error
(
"dns resolve host %s error."
,
host
.
c_str
());
return
""
;
}
...
...
@@ -81,7 +79,6 @@ std::string srs_dns_resolve(std::string host)
memset
(
ipv4
,
0
,
sizeof
(
ipv4
));
for
(
int
i
=
0
;
i
<
answer
->
h_length
;
i
++
)
{
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
;
}
...
...
trunk/src/
app
/srs_core.hpp → trunk/src/
core
/srs_core.hpp
查看文件 @
62fbe9e
trunk/src/srs/srs.upp
查看文件 @
62fbe9e
...
...
@@ -4,9 +4,10 @@ file
..\main\srs_main_bandcheck.cpp,
auto readonly separator,
..\..\objs\srs_auto_headers.hpp,
core readonly separator,
..\core\srs_core.hpp,
..\core\srs_core.cpp,
app readonly separator,
..\app\srs_core.hpp,
..\app\srs_core.cpp,
..\app\srs_core_amf0.hpp,
..\app\srs_core_amf0.cpp,
..\app\srs_core_autofree.hpp,
...
...
请
注册
或
登录
后发表评论