external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

refine code, use json integter rather than number.

Browse source
This commit is contained in:
winlin 2015-09-19 14:40:32 +08:00
parent c5cd58761c
commit b471c6e61c
6 changed files with 205 additions and 199 deletions
Download patch file Download diff file Expand all files Collapse all files

48
trunk/src/app/srs_app_utility.cpp
View file

@ -1429,58 +1429,58 @@ void srs_api_dump_summaries(SrsJsonObject* obj)
obj->set("data", data);
data->set("ok", SrsJsonAny::boolean(ok));
data->set("now_ms", SrsJsonAny::number(now));
data->set("now_ms", SrsJsonAny::integer(now));
// self
SrsJsonObject* self = SrsJsonAny::object();
data->set("self", self);
self->set("version", SrsJsonAny::str(RTMP_SIG_SRS_VERSION));
self->set("pid", SrsJsonAny::number(getpid()));
self->set("ppid", SrsJsonAny::number(u->ppid));
self->set("pid", SrsJsonAny::integer(getpid()));
self->set("ppid", SrsJsonAny::integer(u->ppid));
self->set("argv", SrsJsonAny::str(_srs_config->argv().c_str()));
self->set("cwd", SrsJsonAny::str(_srs_config->cwd().c_str()));
self->set("mem_kbyte", SrsJsonAny::number(r->r.ru_maxrss));
self->set("mem_kbyte", SrsJsonAny::integer(r->r.ru_maxrss));
self->set("mem_percent", SrsJsonAny::number(self_mem_percent));
self->set("cpu_percent", SrsJsonAny::number(u->percent));
self->set("srs_uptime", SrsJsonAny::number(srs_uptime));
self->set("srs_uptime", SrsJsonAny::integer(srs_uptime));
// system
SrsJsonObject* sys = SrsJsonAny::object();
data->set("system", sys);
sys->set("cpu_percent", SrsJsonAny::number(s->percent));
sys->set("disk_read_KBps", SrsJsonAny::number(d->in_KBps));
sys->set("disk_write_KBps", SrsJsonAny::number(d->out_KBps));
sys->set("disk_read_KBps", SrsJsonAny::integer(d->in_KBps));
sys->set("disk_write_KBps", SrsJsonAny::integer(d->out_KBps));
sys->set("disk_busy_percent", SrsJsonAny::number(d->busy));
sys->set("mem_ram_kbyte", SrsJsonAny::number(m->MemTotal));
sys->set("mem_ram_kbyte", SrsJsonAny::integer(m->MemTotal));
sys->set("mem_ram_percent", SrsJsonAny::number(m->percent_ram));
sys->set("mem_swap_kbyte", SrsJsonAny::number(m->SwapTotal));
sys->set("mem_swap_kbyte", SrsJsonAny::integer(m->SwapTotal));
sys->set("mem_swap_percent", SrsJsonAny::number(m->percent_swap));
sys->set("cpus", SrsJsonAny::number(c->nb_processors));
sys->set("cpus_online", SrsJsonAny::number(c->nb_processors_online));
sys->set("cpus", SrsJsonAny::integer(c->nb_processors));
sys->set("cpus_online", SrsJsonAny::integer(c->nb_processors_online));
sys->set("uptime", SrsJsonAny::number(p->os_uptime));
sys->set("ilde_time", SrsJsonAny::number(p->os_ilde_time));
sys->set("load_1m", SrsJsonAny::number(p->load_one_minutes));
sys->set("load_5m", SrsJsonAny::number(p->load_five_minutes));
sys->set("load_15m", SrsJsonAny::number(p->load_fifteen_minutes));
// system network bytes stat.
sys->set("net_sample_time", SrsJsonAny::number(n_sample_time));
sys->set("net_sample_time", SrsJsonAny::integer(n_sample_time));
// internet public address network device bytes.
sys->set("net_recv_bytes", SrsJsonAny::number(nr_bytes));
sys->set("net_send_bytes", SrsJsonAny::number(ns_bytes));
sys->set("net_recv_bytes", SrsJsonAny::integer(nr_bytes));
sys->set("net_send_bytes", SrsJsonAny::integer(ns_bytes));
// intranet private address network device bytes.
sys->set("net_recvi_bytes", SrsJsonAny::number(nri_bytes));
sys->set("net_sendi_bytes", SrsJsonAny::number(nsi_bytes));
sys->set("net_recvi_bytes", SrsJsonAny::integer(nri_bytes));
sys->set("net_sendi_bytes", SrsJsonAny::integer(nsi_bytes));
// srs network bytes stat.
sys->set("srs_sample_time", SrsJsonAny::number(nrs->sample_time));
sys->set("srs_recv_bytes", SrsJsonAny::number(nrs->rbytes));
sys->set("srs_send_bytes", SrsJsonAny::number(nrs->sbytes));
sys->set("conn_sys", SrsJsonAny::number(nrs->nb_conn_sys));
sys->set("conn_sys_et", SrsJsonAny::number(nrs->nb_conn_sys_et));
sys->set("conn_sys_tw", SrsJsonAny::number(nrs->nb_conn_sys_tw));
sys->set("conn_sys_udp", SrsJsonAny::number(nrs->nb_conn_sys_udp));
sys->set("conn_srs", SrsJsonAny::number(nrs->nb_conn_srs));
sys->set("srs_sample_time", SrsJsonAny::integer(nrs->sample_time));
sys->set("srs_recv_bytes", SrsJsonAny::integer(nrs->rbytes));
sys->set("srs_send_bytes", SrsJsonAny::integer(nrs->sbytes));
sys->set("conn_sys", SrsJsonAny::integer(nrs->nb_conn_sys));
sys->set("conn_sys_et", SrsJsonAny::integer(nrs->nb_conn_sys_et));
sys->set("conn_sys_tw", SrsJsonAny::integer(nrs->nb_conn_sys_tw));
sys->set("conn_sys_udp", SrsJsonAny::integer(nrs->nb_conn_sys_udp));
sys->set("conn_srs", SrsJsonAny::integer(nrs->nb_conn_srs));
}
string srs_join_vector_string(vector<string>& vs, string separator)