Skip to content

[fix] fix a bug which will cause compiling error and json parse error when ifdef NGX_RTMP_POOL_DEBUG. #92

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 3, 2019
Merged

[fix] fix a bug which will cause compiling error and json parse error when ifdef NGX_RTMP_POOL_DEBUG. #92

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a2e7277
[fix] fix a bug which will cause compiling error and json parse error.
plainheart Mar 2, 2019
7280be8
[dev] remove debug code.
plainheart Mar 2, 2019
60d476e
[dev] adjust the param `slcf` access way in ngx_rtmp_stat_dump_pool m…
plainheart Mar 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 19 additions & 7 deletions ngx_rtmp_stat_module.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ static time_t start_time;
#define NGX_RTMP_STAT_FORMAT_XML 0x01
#define NGX_RTMP_STAT_FORMAT_JSON 0x02


/*
* global: stat-{bufs-{total,free,used}, total bytes in/out, bw in/out} - cscf
*/
Expand Down Expand Up @@ -346,8 +347,11 @@ static void
ngx_rtmp_stat_dump_pool(ngx_http_request_t *r, ngx_chain_t ***lll,
ngx_pool_t *pool)
{
ngx_uint_t nlarge, size;
u_char buf[NGX_INT_T_LEN];
ngx_uint_t nlarge, size;
u_char buf[NGX_INT_T_LEN];
ngx_rtmp_stat_loc_conf_t *slcf;

slcf = ngx_http_get_module_loc_conf(r, ngx_rtmp_stat_module);

size = 0;
nlarge = 0;
Expand All @@ -363,7 +367,7 @@ ngx_rtmp_stat_dump_pool(ngx_http_request_t *r, ngx_chain_t ***lll,
NGX_RTMP_STAT(buf, ngx_snprintf(buf, sizeof(buf), "%ui", nlarge) - buf);
NGX_RTMP_STAT_L(",\"size\":");
NGX_RTMP_STAT(buf, ngx_snprintf(buf, sizeof(buf), "%ui", size) - buf);
NGX_RTMP_STAT_L("},");
NGX_RTMP_STAT_L("}");
}
}
#endif
Expand All @@ -380,6 +384,9 @@ ngx_rtmp_stat_client(ngx_http_request_t *r, ngx_chain_t ***lll,

#ifdef NGX_RTMP_POOL_DEBUG
ngx_rtmp_stat_dump_pool(r, lll, s->connection->pool);
if(slcf->format & NGX_RTMP_STAT_FORMAT_JSON) {
NGX_RTMP_STAT_L(",");
}
#endif

if(slcf->format & NGX_RTMP_STAT_FORMAT_XML) {
Expand Down Expand Up @@ -1046,14 +1053,19 @@ ngx_rtmp_stat_server(ngx_http_request_t *r, ngx_chain_t ***lll,

if (slcf->format & NGX_RTMP_STAT_FORMAT_XML) {
NGX_RTMP_STAT_L("<server>\r\n");
} else {
NGX_RTMP_STAT_L("[");
}

#ifdef NGX_RTMP_POOL_DEBUG
ngx_rtmp_stat_dump_pool(r, lll, cscf->pool);
if (slcf->format & NGX_RTMP_STAT_FORMAT_JSON) {
NGX_RTMP_STAT_L(",");
}
#endif

if (slcf->format & NGX_RTMP_STAT_FORMAT_JSON) {
NGX_RTMP_STAT_L("\"applicatons\":[");
}

cacf = cscf->applications.elts;
for (n = 0; n < cscf->applications.nelts; ++n, ++cacf) {
ngx_rtmp_stat_application(r, lll, *cacf);
Expand Down Expand Up @@ -1179,7 +1191,7 @@ ngx_rtmp_stat_handler(ngx_http_request_t *r)
ngx_rtmp_stat_bw(r, lll, &ngx_rtmp_bw_out, "out", NGX_RTMP_STAT_BW_BYTES);

if(slcf->format & NGX_RTMP_STAT_FORMAT_JSON) {
NGX_RTMP_STAT_L("\"servers\":[");
NGX_RTMP_STAT_L("\"server\":{");
}

cscf = cmcf->servers.elts;
Expand All @@ -1193,7 +1205,7 @@ ngx_rtmp_stat_handler(ngx_http_request_t *r)
if(slcf->format & NGX_RTMP_STAT_FORMAT_XML) {
NGX_RTMP_STAT_L("</http-flv>\r\n");
} else {
NGX_RTMP_STAT_L("]}}");
NGX_RTMP_STAT_L("}}}");
}

len = 0;
Expand Down