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-08-18 14:39:42 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
c24e68dd70eeceda3a30d984f29feac1d1ed9bb6
c24e68dd
1 parent
fc347a1c
refine the stat, use one ok. 1.0.200
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
6 行增加
和
10 行删除
trunk/src/app/srs_app_utility.cpp
trunk/src/core/srs_core.hpp
trunk/src/app/srs_app_utility.cpp
查看文件 @
c24e68d
...
...
@@ -1080,18 +1080,14 @@ void srs_api_dump_summaries(std::stringstream& ss)
n_sample_time
=
o
.
sample_time
;
}
// all data is ok?
bool
ok
=
(
r
->
ok
&&
u
->
ok
&&
s
->
ok
&&
c
->
ok
&&
d
->
ok
&&
m
->
ok
&&
p
->
ok
&&
n_ok
&&
nrs
->
ok
);
ss
<<
__SRS_JOBJECT_START
<<
__SRS_JFIELD_ERROR
(
ERROR_SUCCESS
)
<<
__SRS_JFIELD_CONT
<<
__SRS_JFIELD_ORG
(
"data"
,
__SRS_JOBJECT_START
)
<<
__SRS_JFIELD_ORG
(
"rusage_ok"
,
(
r
->
ok
?
"true"
:
"false"
))
<<
__SRS_JFIELD_CONT
<<
__SRS_JFIELD_ORG
(
"self_cpu_stat_ok"
,
(
u
->
ok
?
"true"
:
"false"
))
<<
__SRS_JFIELD_CONT
<<
__SRS_JFIELD_ORG
(
"system_cpu_stat_ok"
,
(
s
->
ok
?
"true"
:
"false"
))
<<
__SRS_JFIELD_CONT
<<
__SRS_JFIELD_ORG
(
"cpuinfo_ok"
,
(
c
->
ok
?
"true"
:
"false"
))
<<
__SRS_JFIELD_CONT
<<
__SRS_JFIELD_ORG
(
"disk_ok"
,
(
d
->
ok
?
"true"
:
"false"
))
<<
__SRS_JFIELD_CONT
<<
__SRS_JFIELD_ORG
(
"meminfo_ok"
,
(
m
->
ok
?
"true"
:
"false"
))
<<
__SRS_JFIELD_CONT
<<
__SRS_JFIELD_ORG
(
"platform_ok"
,
(
p
->
ok
?
"true"
:
"false"
))
<<
__SRS_JFIELD_CONT
<<
__SRS_JFIELD_ORG
(
"network_ok"
,
(
n_ok
?
"true"
:
"false"
))
<<
__SRS_JFIELD_CONT
<<
__SRS_JFIELD_ORG
(
"network_srs_ok"
,
(
nrs
->
ok
?
"true"
:
"false"
))
<<
__SRS_JFIELD_CONT
<<
__SRS_JFIELD_ORG
(
"ok"
,
(
ok
?
"true"
:
"false"
))
<<
__SRS_JFIELD_CONT
<<
__SRS_JFIELD_ORG
(
"now_ms"
,
now
)
<<
__SRS_JFIELD_CONT
<<
__SRS_JFIELD_ORG
(
"self"
,
__SRS_JOBJECT_START
)
<<
__SRS_JFIELD_STR
(
"version"
,
RTMP_SIG_SRS_VERSION
)
<<
__SRS_JFIELD_CONT
...
...
trunk/src/core/srs_core.hpp
查看文件 @
c24e68d
...
...
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// current release version
#define VERSION_MAJOR "0"
#define VERSION_MINOR "9"
#define VERSION_REVISION "
199
"
#define VERSION_REVISION "
200
"
#define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION
// server info.
#define RTMP_SIG_SRS_KEY "SRS"
...
...
请
注册
或
登录
后发表评论