胡斌 / srs

转到一个项目
Toggle navigation Toggle navigation pinning
winlin
8497b22d 1 parent 1afa6ed6

complete the consts refine

内嵌 并排对比
正在显示 9 个修改的文件 包含 349 行增加 和 349 行删除
@@ -69,10 +69,10 @@ int SrsCodecSample::add_sample_unit(char* bytes, int size) @@ -69,10 +69,10 @@ int SrsCodecSample::add_sample_unit(char* bytes, int size)
69 { 69 {
70 int ret = ERROR_SUCCESS; 70 int ret = ERROR_SUCCESS;
71 71
72 - if (nb_sample_units >= SRS_MAX_CODEC_SAMPLE) { 72 + if (nb_sample_units >= __SRS_SRS_MAX_CODEC_SAMPLE) {
73 ret = ERROR_HLS_DECODE_ERROR; 73 ret = ERROR_HLS_DECODE_ERROR;
74 srs_error("hls decode samples error, " 74 srs_error("hls decode samples error, "
75 - "exceed the max count: %d, ret=%d", SRS_MAX_CODEC_SAMPLE, ret); 75 + "exceed the max count: %d, ret=%d", __SRS_SRS_MAX_CODEC_SAMPLE, ret);
76 return ret; 76 return ret;
77 } 77 }
78 78
@@ -97,7 +97,7 @@ SrsAvcAacCodec::SrsAvcAacCodec() @@ -97,7 +97,7 @@ SrsAvcAacCodec::SrsAvcAacCodec()
97 avc_profile = 0; 97 avc_profile = 0;
98 avc_level = 0; 98 avc_level = 0;
99 aac_profile = 0; 99 aac_profile = 0;
100 - aac_sample_rate = _SRS_AAC_SAMPLE_RATE_UNSET; // sample rate ignored 100 + aac_sample_rate = __SRS_AAC_SAMPLE_RATE_UNSET; // sample rate ignored
101 aac_channels = 0; 101 aac_channels = 0;
102 avc_extra_size = 0; 102 avc_extra_size = 0;
103 avc_extra_data = NULL; 103 avc_extra_data = NULL;
@@ -283,7 +283,7 @@ int SrsAvcAacCodec::audio_aac_demux(char* data, int size, SrsCodecSample* sample @@ -283,7 +283,7 @@ int SrsAvcAacCodec::audio_aac_demux(char* data, int size, SrsCodecSample* sample
283 } 283 }
284 284
285 // reset the sample rate by sequence header 285 // reset the sample rate by sequence header
286 - if (aac_sample_rate != _SRS_AAC_SAMPLE_RATE_UNSET) { 286 + if (aac_sample_rate != __SRS_AAC_SAMPLE_RATE_UNSET) {
287 static int aac_sample_rates[] = { 287 static int aac_sample_rates[] = {
288 96000, 88200, 64000, 48000, 288 96000, 88200, 64000, 48000,
289 44100, 32000, 24000, 22050, 289 44100, 32000, 24000, 22050,
@@ -35,8 +35,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -35,8 +35,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
35 class SrsStream; 35 class SrsStream;
36 class SrsAmf0Object; 36 class SrsAmf0Object;
37 37
38 -#define SRS_MAX_CODEC_SAMPLE 128  
39 -#define _SRS_AAC_SAMPLE_RATE_UNSET 15 38 +#define __SRS_SRS_MAX_CODEC_SAMPLE 128
  39 +#define __SRS_AAC_SAMPLE_RATE_UNSET 15
40 40
41 /** 41 /**
42 * the FLV/RTMP supported audio sample rate. 42 * the FLV/RTMP supported audio sample rate.
@@ -133,7 +133,7 @@ public: @@ -133,7 +133,7 @@ public:
133 * where avc/h264 video packet may contains multiple buffer. 133 * where avc/h264 video packet may contains multiple buffer.
134 */ 134 */
135 int nb_sample_units; 135 int nb_sample_units;
136 - SrsCodecSampleUnit sample_units[SRS_MAX_CODEC_SAMPLE]; 136 + SrsCodecSampleUnit sample_units[__SRS_SRS_MAX_CODEC_SAMPLE];
137 public: 137 public:
138 /** 138 /**
139 * whether the sample is video sample which demux from video packet. 139 * whether the sample is video sample which demux from video packet.
@@ -65,14 +65,14 @@ void SrsHttpHeartbeat::heartbeat() @@ -65,14 +65,14 @@ void SrsHttpHeartbeat::heartbeat()
65 } 65 }
66 66
67 std::stringstream ss; 67 std::stringstream ss;
68 - ss << JOBJECT_START  
69 - << JFIELD_STR("device_id", device_id) << JFIELD_CONT  
70 - << JFIELD_STR("ip", ip); 68 + ss << __SRS_JOBJECT_START
  69 + << __SRS_JFIELD_STR("device_id", device_id) << __SRS_JFIELD_CONT
  70 + << __SRS_JFIELD_STR("ip", ip);
71 if (_srs_config->get_heartbeat_summaries()) { 71 if (_srs_config->get_heartbeat_summaries()) {
72 - ss << JFIELD_CONT << JFIELD_ORG("summaries", ""); 72 + ss << __SRS_JFIELD_CONT << __SRS_JFIELD_ORG("summaries", "");
73 srs_api_dump_summaries(ss); 73 srs_api_dump_summaries(ss);
74 } 74 }
75 - ss << JOBJECT_END; 75 + ss << __SRS_JOBJECT_END;
76 std::string data = ss.str(); 76 std::string data = ss.str();
77 std::string res; 77 std::string res;
78 78
@@ -404,7 +404,7 @@ int64_t SrsHlsAacJitter::on_buffer_start(int64_t flv_pts, int sample_rate, int a @@ -404,7 +404,7 @@ int64_t SrsHlsAacJitter::on_buffer_start(int64_t flv_pts, int sample_rate, int a
404 int flv_sample_rate = flv_sample_rates[sample_rate & 0x03]; 404 int flv_sample_rate = flv_sample_rates[sample_rate & 0x03];
405 405
406 // override the sample rate by sequence header 406 // override the sample rate by sequence header
407 - if (aac_sample_rate != _SRS_AAC_SAMPLE_RATE_UNSET) { 407 + if (aac_sample_rate != __SRS_AAC_SAMPLE_RATE_UNSET) {
408 flv_sample_rate = aac_sample_rates[aac_sample_rate]; 408 flv_sample_rate = aac_sample_rates[aac_sample_rate];
409 } 409 }
410 410
@@ -109,14 +109,14 @@ int SrsHttpHandler::process_request(SrsSocket* skt, SrsHttpMessage* req) @@ -109,14 +109,14 @@ int SrsHttpHandler::process_request(SrsSocket* skt, SrsHttpMessage* req)
109 if (!is_handler_valid(req, status_code, reason_phrase)) { 109 if (!is_handler_valid(req, status_code, reason_phrase)) {
110 std::stringstream ss; 110 std::stringstream ss;
111 111
112 - ss << JOBJECT_START  
113 - << JFIELD_ERROR(ERROR_HTTP_HANDLER_INVALID) << JFIELD_CONT  
114 - << JFIELD_ORG("data", JOBJECT_START)  
115 - << JFIELD_ORG("status_code", status_code) << JFIELD_CONT  
116 - << JFIELD_STR("reason_phrase", reason_phrase) << JFIELD_CONT  
117 - << JFIELD_STR("url", req->url())  
118 - << JOBJECT_END  
119 - << JOBJECT_END; 112 + ss << __SRS_JOBJECT_START
  113 + << __SRS_JFIELD_ERROR(ERROR_HTTP_HANDLER_INVALID) << __SRS_JFIELD_CONT
  114 + << __SRS_JFIELD_ORG("data", __SRS_JOBJECT_START)
  115 + << __SRS_JFIELD_ORG("status_code", status_code) << __SRS_JFIELD_CONT
  116 + << __SRS_JFIELD_STR("reason_phrase", reason_phrase) << __SRS_JFIELD_CONT
  117 + << __SRS_JFIELD_STR("url", req->url())
  118 + << __SRS_JOBJECT_END
  119 + << __SRS_JOBJECT_END;
120 120
121 return res_error(skt, req, status_code, reason_phrase, ss.str()); 121 return res_error(skt, req, status_code, reason_phrase, ss.str());
122 } 122 }
@@ -145,10 +145,10 @@ int SrsHttpHandler::do_process_request(SrsSocket* /*skt*/, SrsHttpMessage* /*req @@ -145,10 +145,10 @@ int SrsHttpHandler::do_process_request(SrsSocket* /*skt*/, SrsHttpMessage* /*req
145 int SrsHttpHandler::response_error(SrsSocket* skt, SrsHttpMessage* req, int code, string desc) 145 int SrsHttpHandler::response_error(SrsSocket* skt, SrsHttpMessage* req, int code, string desc)
146 { 146 {
147 std::stringstream ss; 147 std::stringstream ss;
148 - ss << JOBJECT_START  
149 - << JFIELD_ERROR(code) << JFIELD_CONT  
150 - << JFIELD_STR("desc", desc)  
151 - << JOBJECT_END; 148 + ss << __SRS_JOBJECT_START
  149 + << __SRS_JFIELD_ERROR(code) << __SRS_JFIELD_CONT
  150 + << __SRS_JFIELD_STR("desc", desc)
  151 + << __SRS_JOBJECT_END;
152 152
153 return res_json(skt, req, ss.str()); 153 return res_json(skt, req, ss.str());
154 } 154 }
@@ -76,12 +76,12 @@ int SrsApiRoot::do_process_request(SrsSocket* skt, SrsHttpMessage* req) @@ -76,12 +76,12 @@ int SrsApiRoot::do_process_request(SrsSocket* skt, SrsHttpMessage* req)
76 { 76 {
77 std::stringstream ss; 77 std::stringstream ss;
78 78
79 - ss << JOBJECT_START  
80 - << JFIELD_ERROR(ERROR_SUCCESS) << JFIELD_CONT  
81 - << JFIELD_ORG("urls", JOBJECT_START)  
82 - << JFIELD_STR("api", "the api root")  
83 - << JOBJECT_END  
84 - << JOBJECT_END; 79 + ss << __SRS_JOBJECT_START
  80 + << __SRS_JFIELD_ERROR(ERROR_SUCCESS) << __SRS_JFIELD_CONT
  81 + << __SRS_JFIELD_ORG("urls", __SRS_JOBJECT_START)
  82 + << __SRS_JFIELD_STR("api", "the api root")
  83 + << __SRS_JOBJECT_END
  84 + << __SRS_JOBJECT_END;
85 85
86 return res_json(skt, req, ss.str()); 86 return res_json(skt, req, ss.str());
87 } 87 }
@@ -104,12 +104,12 @@ int SrsApiApi::do_process_request(SrsSocket* skt, SrsHttpMessage* req) @@ -104,12 +104,12 @@ int SrsApiApi::do_process_request(SrsSocket* skt, SrsHttpMessage* req)
104 { 104 {
105 std::stringstream ss; 105 std::stringstream ss;
106 106
107 - ss << JOBJECT_START  
108 - << JFIELD_ERROR(ERROR_SUCCESS) << JFIELD_CONT  
109 - << JFIELD_ORG("urls", JOBJECT_START)  
110 - << JFIELD_STR("v1", "the api version 1.0")  
111 - << JOBJECT_END  
112 - << JOBJECT_END; 107 + ss << __SRS_JOBJECT_START
  108 + << __SRS_JFIELD_ERROR(ERROR_SUCCESS) << __SRS_JFIELD_CONT
  109 + << __SRS_JFIELD_ORG("urls", __SRS_JOBJECT_START)
  110 + << __SRS_JFIELD_STR("v1", "the api version 1.0")
  111 + << __SRS_JOBJECT_END
  112 + << __SRS_JOBJECT_END;
113 113
114 return res_json(skt, req, ss.str()); 114 return res_json(skt, req, ss.str());
115 } 115 }
@@ -139,19 +139,19 @@ int SrsApiV1::do_process_request(SrsSocket* skt, SrsHttpMessage* req) @@ -139,19 +139,19 @@ int SrsApiV1::do_process_request(SrsSocket* skt, SrsHttpMessage* req)
139 { 139 {
140 std::stringstream ss; 140 std::stringstream ss;
141 141
142 - ss << JOBJECT_START  
143 - << JFIELD_ERROR(ERROR_SUCCESS) << JFIELD_CONT  
144 - << JFIELD_ORG("urls", JOBJECT_START)  
145 - << JFIELD_STR("versions", "the version of SRS") << JFIELD_CONT  
146 - << JFIELD_STR("summaries", "the summary(pid, argv, pwd, cpu, mem) of SRS") << JFIELD_CONT  
147 - << JFIELD_STR("rusages", "the rusage of SRS") << JFIELD_CONT  
148 - << JFIELD_STR("self_proc_stats", "the self process stats") << JFIELD_CONT  
149 - << JFIELD_STR("system_proc_stats", "the system process stats") << JFIELD_CONT  
150 - << JFIELD_STR("meminfos", "the meminfo of system") << JFIELD_CONT  
151 - << JFIELD_STR("authors", "the primary authors and contributors") << JFIELD_CONT  
152 - << JFIELD_STR("requests", "the request itself, for http debug")  
153 - << JOBJECT_END  
154 - << JOBJECT_END; 142 + ss << __SRS_JOBJECT_START
  143 + << __SRS_JFIELD_ERROR(ERROR_SUCCESS) << __SRS_JFIELD_CONT
  144 + << __SRS_JFIELD_ORG("urls", __SRS_JOBJECT_START)
  145 + << __SRS_JFIELD_STR("versions", "the version of SRS") << __SRS_JFIELD_CONT
  146 + << __SRS_JFIELD_STR("summaries", "the summary(pid, argv, pwd, cpu, mem) of SRS") << __SRS_JFIELD_CONT
  147 + << __SRS_JFIELD_STR("rusages", "the rusage of SRS") << __SRS_JFIELD_CONT
  148 + << __SRS_JFIELD_STR("self_proc_stats", "the self process stats") << __SRS_JFIELD_CONT
  149 + << __SRS_JFIELD_STR("system_proc_stats", "the system process stats") << __SRS_JFIELD_CONT
  150 + << __SRS_JFIELD_STR("meminfos", "the meminfo of system") << __SRS_JFIELD_CONT
  151 + << __SRS_JFIELD_STR("authors", "the primary authors and contributors") << __SRS_JFIELD_CONT
  152 + << __SRS_JFIELD_STR("requests", "the request itself, for http debug")
  153 + << __SRS_JOBJECT_END
  154 + << __SRS_JOBJECT_END;
155 155
156 return res_json(skt, req, ss.str()); 156 return res_json(skt, req, ss.str());
157 } 157 }
@@ -173,49 +173,49 @@ int SrsApiRequests::do_process_request(SrsSocket* skt, SrsHttpMessage* req) @@ -173,49 +173,49 @@ int SrsApiRequests::do_process_request(SrsSocket* skt, SrsHttpMessage* req)
173 { 173 {
174 std::stringstream ss; 174 std::stringstream ss;
175 175
176 - ss << JOBJECT_START  
177 - << JFIELD_ERROR(ERROR_SUCCESS) << JFIELD_CONT  
178 - << JFIELD_ORG("data", JOBJECT_START)  
179 - << JFIELD_STR("uri", req->uri()) << JFIELD_CONT  
180 - << JFIELD_STR("path", req->path()) << JFIELD_CONT; 176 + ss << __SRS_JOBJECT_START
  177 + << __SRS_JFIELD_ERROR(ERROR_SUCCESS) << __SRS_JFIELD_CONT
  178 + << __SRS_JFIELD_ORG("data", __SRS_JOBJECT_START)
  179 + << __SRS_JFIELD_STR("uri", req->uri()) << __SRS_JFIELD_CONT
  180 + << __SRS_JFIELD_STR("path", req->path()) << __SRS_JFIELD_CONT;
181 181
182 // method 182 // method
183 if (req->is_http_get()) { 183 if (req->is_http_get()) {
184 - ss << JFIELD_STR("METHOD", "GET"); 184 + ss << __SRS_JFIELD_STR("METHOD", "GET");
185 } else if (req->is_http_post()) { 185 } else if (req->is_http_post()) {
186 - ss << JFIELD_STR("METHOD", "POST"); 186 + ss << __SRS_JFIELD_STR("METHOD", "POST");
187 } else if (req->is_http_put()) { 187 } else if (req->is_http_put()) {
188 - ss << JFIELD_STR("METHOD", "PUT"); 188 + ss << __SRS_JFIELD_STR("METHOD", "PUT");
189 } else if (req->is_http_delete()) { 189 } else if (req->is_http_delete()) {
190 - ss << JFIELD_STR("METHOD", "DELETE"); 190 + ss << __SRS_JFIELD_STR("METHOD", "DELETE");
191 } else { 191 } else {
192 - ss << JFIELD_ORG("METHOD", req->method()); 192 + ss << __SRS_JFIELD_ORG("METHOD", req->method());
193 } 193 }
194 - ss << JFIELD_CONT; 194 + ss << __SRS_JFIELD_CONT;
195 195
196 // request headers 196 // request headers
197 - ss << JFIELD_NAME("headers") << JOBJECT_START; 197 + ss << __SRS_JFIELD_NAME("headers") << __SRS_JOBJECT_START;
198 for (int i = 0; i < req->request_header_count(); i++) { 198 for (int i = 0; i < req->request_header_count(); i++) {
199 std::string key = req->request_header_key_at(i); 199 std::string key = req->request_header_key_at(i);
200 std::string value = req->request_header_value_at(i); 200 std::string value = req->request_header_value_at(i);
201 if ( i < req->request_header_count() - 1) { 201 if ( i < req->request_header_count() - 1) {
202 - ss << JFIELD_STR(key, value) << JFIELD_CONT; 202 + ss << __SRS_JFIELD_STR(key, value) << __SRS_JFIELD_CONT;
203 } else { 203 } else {
204 - ss << JFIELD_STR(key, value); 204 + ss << __SRS_JFIELD_STR(key, value);
205 } 205 }
206 } 206 }
207 - ss << JOBJECT_END << JFIELD_CONT; 207 + ss << __SRS_JOBJECT_END << __SRS_JFIELD_CONT;
208 208
209 // server informations 209 // server informations
210 - ss << JFIELD_NAME("server") << JOBJECT_START  
211 - << JFIELD_STR("sigature", RTMP_SIG_SRS_KEY) << JFIELD_CONT  
212 - << JFIELD_STR("name", RTMP_SIG_SRS_NAME) << JFIELD_CONT  
213 - << JFIELD_STR("version", RTMP_SIG_SRS_VERSION) << JFIELD_CONT  
214 - << JFIELD_STR("link", RTMP_SIG_SRS_URL) << JFIELD_CONT  
215 - << JFIELD_ORG("time", srs_get_system_time_ms())  
216 - << JOBJECT_END  
217 - << JOBJECT_END  
218 - << JOBJECT_END; 210 + ss << __SRS_JFIELD_NAME("server") << __SRS_JOBJECT_START
  211 + << __SRS_JFIELD_STR("sigature", RTMP_SIG_SRS_KEY) << __SRS_JFIELD_CONT
  212 + << __SRS_JFIELD_STR("name", RTMP_SIG_SRS_NAME) << __SRS_JFIELD_CONT
  213 + << __SRS_JFIELD_STR("version", RTMP_SIG_SRS_VERSION) << __SRS_JFIELD_CONT
  214 + << __SRS_JFIELD_STR("link", RTMP_SIG_SRS_URL) << __SRS_JFIELD_CONT
  215 + << __SRS_JFIELD_ORG("time", srs_get_system_time_ms())
  216 + << __SRS_JOBJECT_END
  217 + << __SRS_JOBJECT_END
  218 + << __SRS_JOBJECT_END;
219 219
220 return res_json(skt, req, ss.str()); 220 return res_json(skt, req, ss.str());
221 } 221 }
@@ -237,15 +237,15 @@ int SrsApiVersion::do_process_request(SrsSocket* skt, SrsHttpMessage* req) @@ -237,15 +237,15 @@ int SrsApiVersion::do_process_request(SrsSocket* skt, SrsHttpMessage* req)
237 { 237 {
238 std::stringstream ss; 238 std::stringstream ss;
239 239
240 - ss << JOBJECT_START  
241 - << JFIELD_ERROR(ERROR_SUCCESS) << JFIELD_CONT  
242 - << JFIELD_ORG("data", JOBJECT_START)  
243 - << JFIELD_ORG("major", VERSION_MAJOR) << JFIELD_CONT  
244 - << JFIELD_ORG("minor", VERSION_MINOR) << JFIELD_CONT  
245 - << JFIELD_ORG("revision", VERSION_REVISION) << JFIELD_CONT  
246 - << JFIELD_STR("version", RTMP_SIG_SRS_VERSION)  
247 - << JOBJECT_END  
248 - << JOBJECT_END; 240 + ss << __SRS_JOBJECT_START
  241 + << __SRS_JFIELD_ERROR(ERROR_SUCCESS) << __SRS_JFIELD_CONT
  242 + << __SRS_JFIELD_ORG("data", __SRS_JOBJECT_START)
  243 + << __SRS_JFIELD_ORG("major", VERSION_MAJOR) << __SRS_JFIELD_CONT
  244 + << __SRS_JFIELD_ORG("minor", VERSION_MINOR) << __SRS_JFIELD_CONT
  245 + << __SRS_JFIELD_ORG("revision", VERSION_REVISION) << __SRS_JFIELD_CONT
  246 + << __SRS_JFIELD_STR("version", RTMP_SIG_SRS_VERSION)
  247 + << __SRS_JOBJECT_END
  248 + << __SRS_JOBJECT_END;
249 249
250 return res_json(skt, req, ss.str()); 250 return res_json(skt, req, ss.str());
251 } 251 }
@@ -289,29 +289,29 @@ int SrsApiRusages::do_process_request(SrsSocket* skt, SrsHttpMessage* req) @@ -289,29 +289,29 @@ int SrsApiRusages::do_process_request(SrsSocket* skt, SrsHttpMessage* req)
289 289
290 SrsRusage* r = srs_get_system_rusage(); 290 SrsRusage* r = srs_get_system_rusage();
291 291
292 - ss << JOBJECT_START  
293 - << JFIELD_ERROR(ERROR_SUCCESS) << JFIELD_CONT  
294 - << JFIELD_ORG("data", JOBJECT_START)  
295 - << JFIELD_ORG("ok", (r->ok? "true":"false")) << JFIELD_CONT  
296 - << JFIELD_ORG("sample_time", r->sample_time) << JFIELD_CONT  
297 - << JFIELD_ORG("ru_utime", r->r.ru_utime.tv_sec) << JFIELD_CONT  
298 - << JFIELD_ORG("ru_stime", r->r.ru_stime.tv_sec) << JFIELD_CONT  
299 - << JFIELD_ORG("ru_maxrss", r->r.ru_maxrss) << JFIELD_CONT  
300 - << JFIELD_ORG("ru_ixrss", r->r.ru_ixrss) << JFIELD_CONT  
301 - << JFIELD_ORG("ru_idrss", r->r.ru_idrss) << JFIELD_CONT  
302 - << JFIELD_ORG("ru_isrss", r->r.ru_isrss) << JFIELD_CONT  
303 - << JFIELD_ORG("ru_minflt", r->r.ru_minflt) << JFIELD_CONT  
304 - << JFIELD_ORG("ru_majflt", r->r.ru_majflt) << JFIELD_CONT  
305 - << JFIELD_ORG("ru_nswap", r->r.ru_nswap) << JFIELD_CONT  
306 - << JFIELD_ORG("ru_inblock", r->r.ru_inblock) << JFIELD_CONT  
307 - << JFIELD_ORG("ru_oublock", r->r.ru_oublock) << JFIELD_CONT  
308 - << JFIELD_ORG("ru_msgsnd", r->r.ru_msgsnd) << JFIELD_CONT  
309 - << JFIELD_ORG("ru_msgrcv", r->r.ru_msgrcv) << JFIELD_CONT  
310 - << JFIELD_ORG("ru_nsignals", r->r.ru_nsignals) << JFIELD_CONT  
311 - << JFIELD_ORG("ru_nvcsw", r->r.ru_nvcsw) << JFIELD_CONT  
312 - << JFIELD_ORG("ru_nivcsw", r->r.ru_nivcsw)  
313 - << JOBJECT_END  
314 - << JOBJECT_END; 292 + ss << __SRS_JOBJECT_START
  293 + << __SRS_JFIELD_ERROR(ERROR_SUCCESS) << __SRS_JFIELD_CONT
  294 + << __SRS_JFIELD_ORG("data", __SRS_JOBJECT_START)
  295 + << __SRS_JFIELD_ORG("ok", (r->ok? "true":"false")) << __SRS_JFIELD_CONT
  296 + << __SRS_JFIELD_ORG("sample_time", r->sample_time) << __SRS_JFIELD_CONT
  297 + << __SRS_JFIELD_ORG("ru_utime", r->r.ru_utime.tv_sec) << __SRS_JFIELD_CONT
  298 + << __SRS_JFIELD_ORG("ru_stime", r->r.ru_stime.tv_sec) << __SRS_JFIELD_CONT
  299 + << __SRS_JFIELD_ORG("ru_maxrss", r->r.ru_maxrss) << __SRS_JFIELD_CONT
  300 + << __SRS_JFIELD_ORG("ru_ixrss", r->r.ru_ixrss) << __SRS_JFIELD_CONT
  301 + << __SRS_JFIELD_ORG("ru_idrss", r->r.ru_idrss) << __SRS_JFIELD_CONT
  302 + << __SRS_JFIELD_ORG("ru_isrss", r->r.ru_isrss) << __SRS_JFIELD_CONT
  303 + << __SRS_JFIELD_ORG("ru_minflt", r->r.ru_minflt) << __SRS_JFIELD_CONT
  304 + << __SRS_JFIELD_ORG("ru_majflt", r->r.ru_majflt) << __SRS_JFIELD_CONT
  305 + << __SRS_JFIELD_ORG("ru_nswap", r->r.ru_nswap) << __SRS_JFIELD_CONT
  306 + << __SRS_JFIELD_ORG("ru_inblock", r->r.ru_inblock) << __SRS_JFIELD_CONT
  307 + << __SRS_JFIELD_ORG("ru_oublock", r->r.ru_oublock) << __SRS_JFIELD_CONT
  308 + << __SRS_JFIELD_ORG("ru_msgsnd", r->r.ru_msgsnd) << __SRS_JFIELD_CONT
  309 + << __SRS_JFIELD_ORG("ru_msgrcv", r->r.ru_msgrcv) << __SRS_JFIELD_CONT
  310 + << __SRS_JFIELD_ORG("ru_nsignals", r->r.ru_nsignals) << __SRS_JFIELD_CONT
  311 + << __SRS_JFIELD_ORG("ru_nvcsw", r->r.ru_nvcsw) << __SRS_JFIELD_CONT
  312 + << __SRS_JFIELD_ORG("ru_nivcsw", r->r.ru_nivcsw)
  313 + << __SRS_JOBJECT_END
  314 + << __SRS_JOBJECT_END;
315 315
316 return res_json(skt, req, ss.str()); 316 return res_json(skt, req, ss.str());
317 } 317 }
@@ -335,58 +335,58 @@ int SrsApiSelfProcStats::do_process_request(SrsSocket* skt, SrsHttpMessage* req) @@ -335,58 +335,58 @@ int SrsApiSelfProcStats::do_process_request(SrsSocket* skt, SrsHttpMessage* req)
335 335
336 SrsProcSelfStat* u = srs_get_self_proc_stat(); 336 SrsProcSelfStat* u = srs_get_self_proc_stat();
337 337
338 - ss << JOBJECT_START  
339 - << JFIELD_ERROR(ERROR_SUCCESS) << JFIELD_CONT  
340 - << JFIELD_ORG("data", JOBJECT_START)  
341 - << JFIELD_ORG("ok", (u->ok? "true":"false")) << JFIELD_CONT  
342 - << JFIELD_ORG("sample_time", u->sample_time) << JFIELD_CONT  
343 - << JFIELD_ORG("percent", u->percent) << JFIELD_CONT  
344 - << JFIELD_ORG("pid", u->pid) << JFIELD_CONT  
345 - << JFIELD_STR("comm", u->comm) << JFIELD_CONT  
346 - << JFIELD_STR("state", u->state) << JFIELD_CONT  
347 - << JFIELD_ORG("ppid", u->ppid) << JFIELD_CONT  
348 - << JFIELD_ORG("pgrp", u->pgrp) << JFIELD_CONT  
349 - << JFIELD_ORG("session", u->session) << JFIELD_CONT  
350 - << JFIELD_ORG("tty_nr", u->tty_nr) << JFIELD_CONT  
351 - << JFIELD_ORG("tpgid", u->tpgid) << JFIELD_CONT  
352 - << JFIELD_ORG("flags", u->flags) << JFIELD_CONT  
353 - << JFIELD_ORG("minflt", u->minflt) << JFIELD_CONT  
354 - << JFIELD_ORG("cminflt", u->cminflt) << JFIELD_CONT  
355 - << JFIELD_ORG("majflt", u->majflt) << JFIELD_CONT  
356 - << JFIELD_ORG("cmajflt", u->cmajflt) << JFIELD_CONT  
357 - << JFIELD_ORG("utime", u->utime) << JFIELD_CONT  
358 - << JFIELD_ORG("stime", u->stime) << JFIELD_CONT  
359 - << JFIELD_ORG("cutime", u->cutime) << JFIELD_CONT  
360 - << JFIELD_ORG("cstime", u->cstime) << JFIELD_CONT  
361 - << JFIELD_ORG("priority", u->priority) << JFIELD_CONT  
362 - << JFIELD_ORG("nice", u->nice) << JFIELD_CONT  
363 - << JFIELD_ORG("num_threads", u->num_threads) << JFIELD_CONT  
364 - << JFIELD_ORG("itrealvalue", u->itrealvalue) << JFIELD_CONT  
365 - << JFIELD_ORG("starttime", u->starttime) << JFIELD_CONT  
366 - << JFIELD_ORG("vsize", u->vsize) << JFIELD_CONT  
367 - << JFIELD_ORG("rss", u->rss) << JFIELD_CONT  
368 - << JFIELD_ORG("rsslim", u->rsslim) << JFIELD_CONT  
369 - << JFIELD_ORG("startcode", u->startcode) << JFIELD_CONT  
370 - << JFIELD_ORG("endcode", u->endcode) << JFIELD_CONT  
371 - << JFIELD_ORG("startstack", u->startstack) << JFIELD_CONT  
372 - << JFIELD_ORG("kstkesp", u->kstkesp) << JFIELD_CONT  
373 - << JFIELD_ORG("kstkeip", u->kstkeip) << JFIELD_CONT  
374 - << JFIELD_ORG("signal", u->signal) << JFIELD_CONT  
375 - << JFIELD_ORG("blocked", u->blocked) << JFIELD_CONT  
376 - << JFIELD_ORG("sigignore", u->sigignore) << JFIELD_CONT  
377 - << JFIELD_ORG("sigcatch", u->sigcatch) << JFIELD_CONT  
378 - << JFIELD_ORG("wchan", u->wchan) << JFIELD_CONT  
379 - << JFIELD_ORG("nswap", u->nswap) << JFIELD_CONT  
380 - << JFIELD_ORG("cnswap", u->cnswap) << JFIELD_CONT  
381 - << JFIELD_ORG("exit_signal", u->exit_signal) << JFIELD_CONT  
382 - << JFIELD_ORG("processor", u->processor) << JFIELD_CONT  
383 - << JFIELD_ORG("rt_priority", u->rt_priority) << JFIELD_CONT  
384 - << JFIELD_ORG("policy", u->policy) << JFIELD_CONT  
385 - << JFIELD_ORG("delayacct_blkio_ticks", u->delayacct_blkio_ticks) << JFIELD_CONT  
386 - << JFIELD_ORG("guest_time", u->guest_time) << JFIELD_CONT  
387 - << JFIELD_ORG("cguest_time", u->cguest_time)  
388 - << JOBJECT_END  
389 - << JOBJECT_END; 338 + ss << __SRS_JOBJECT_START
  339 + << __SRS_JFIELD_ERROR(ERROR_SUCCESS) << __SRS_JFIELD_CONT
  340 + << __SRS_JFIELD_ORG("data", __SRS_JOBJECT_START)
  341 + << __SRS_JFIELD_ORG("ok", (u->ok? "true":"false")) << __SRS_JFIELD_CONT
  342 + << __SRS_JFIELD_ORG("sample_time", u->sample_time) << __SRS_JFIELD_CONT
  343 + << __SRS_JFIELD_ORG("percent", u->percent) << __SRS_JFIELD_CONT
  344 + << __SRS_JFIELD_ORG("pid", u->pid) << __SRS_JFIELD_CONT
  345 + << __SRS_JFIELD_STR("comm", u->comm) << __SRS_JFIELD_CONT
  346 + << __SRS_JFIELD_STR("state", u->state) << __SRS_JFIELD_CONT
  347 + << __SRS_JFIELD_ORG("ppid", u->ppid) << __SRS_JFIELD_CONT
  348 + << __SRS_JFIELD_ORG("pgrp", u->pgrp) << __SRS_JFIELD_CONT
  349 + << __SRS_JFIELD_ORG("session", u->session) << __SRS_JFIELD_CONT
  350 + << __SRS_JFIELD_ORG("tty_nr", u->tty_nr) << __SRS_JFIELD_CONT
  351 + << __SRS_JFIELD_ORG("tpgid", u->tpgid) << __SRS_JFIELD_CONT
  352 + << __SRS_JFIELD_ORG("flags", u->flags) << __SRS_JFIELD_CONT
  353 + << __SRS_JFIELD_ORG("minflt", u->minflt) << __SRS_JFIELD_CONT
  354 + << __SRS_JFIELD_ORG("cminflt", u->cminflt) << __SRS_JFIELD_CONT
  355 + << __SRS_JFIELD_ORG("majflt", u->majflt) << __SRS_JFIELD_CONT
  356 + << __SRS_JFIELD_ORG("cmajflt", u->cmajflt) << __SRS_JFIELD_CONT
  357 + << __SRS_JFIELD_ORG("utime", u->utime) << __SRS_JFIELD_CONT
  358 + << __SRS_JFIELD_ORG("stime", u->stime) << __SRS_JFIELD_CONT
  359 + << __SRS_JFIELD_ORG("cutime", u->cutime) << __SRS_JFIELD_CONT
  360 + << __SRS_JFIELD_ORG("cstime", u->cstime) << __SRS_JFIELD_CONT
  361 + << __SRS_JFIELD_ORG("priority", u->priority) << __SRS_JFIELD_CONT
  362 + << __SRS_JFIELD_ORG("nice", u->nice) << __SRS_JFIELD_CONT
  363 + << __SRS_JFIELD_ORG("num_threads", u->num_threads) << __SRS_JFIELD_CONT
  364 + << __SRS_JFIELD_ORG("itrealvalue", u->itrealvalue) << __SRS_JFIELD_CONT
  365 + << __SRS_JFIELD_ORG("starttime", u->starttime) << __SRS_JFIELD_CONT
  366 + << __SRS_JFIELD_ORG("vsize", u->vsize) << __SRS_JFIELD_CONT
  367 + << __SRS_JFIELD_ORG("rss", u->rss) << __SRS_JFIELD_CONT
  368 + << __SRS_JFIELD_ORG("rsslim", u->rsslim) << __SRS_JFIELD_CONT
  369 + << __SRS_JFIELD_ORG("startcode", u->startcode) << __SRS_JFIELD_CONT
  370 + << __SRS_JFIELD_ORG("endcode", u->endcode) << __SRS_JFIELD_CONT
  371 + << __SRS_JFIELD_ORG("startstack", u->startstack) << __SRS_JFIELD_CONT
  372 + << __SRS_JFIELD_ORG("kstkesp", u->kstkesp) << __SRS_JFIELD_CONT
  373 + << __SRS_JFIELD_ORG("kstkeip", u->kstkeip) << __SRS_JFIELD_CONT
  374 + << __SRS_JFIELD_ORG("signal", u->signal) << __SRS_JFIELD_CONT
  375 + << __SRS_JFIELD_ORG("blocked", u->blocked) << __SRS_JFIELD_CONT
  376 + << __SRS_JFIELD_ORG("sigignore", u->sigignore) << __SRS_JFIELD_CONT
  377 + << __SRS_JFIELD_ORG("sigcatch", u->sigcatch) << __SRS_JFIELD_CONT
  378 + << __SRS_JFIELD_ORG("wchan", u->wchan) << __SRS_JFIELD_CONT
  379 + << __SRS_JFIELD_ORG("nswap", u->nswap) << __SRS_JFIELD_CONT
  380 + << __SRS_JFIELD_ORG("cnswap", u->cnswap) << __SRS_JFIELD_CONT
  381 + << __SRS_JFIELD_ORG("exit_signal", u->exit_signal) << __SRS_JFIELD_CONT
  382 + << __SRS_JFIELD_ORG("processor", u->processor) << __SRS_JFIELD_CONT
  383 + << __SRS_JFIELD_ORG("rt_priority", u->rt_priority) << __SRS_JFIELD_CONT
  384 + << __SRS_JFIELD_ORG("policy", u->policy) << __SRS_JFIELD_CONT
  385 + << __SRS_JFIELD_ORG("delayacct_blkio_ticks", u->delayacct_blkio_ticks) << __SRS_JFIELD_CONT
  386 + << __SRS_JFIELD_ORG("guest_time", u->guest_time) << __SRS_JFIELD_CONT
  387 + << __SRS_JFIELD_ORG("cguest_time", u->cguest_time)
  388 + << __SRS_JOBJECT_END
  389 + << __SRS_JOBJECT_END;
390 390
391 return res_json(skt, req, ss.str()); 391 return res_json(skt, req, ss.str());
392 } 392 }
@@ -410,23 +410,23 @@ int SrsApiSystemProcStats::do_process_request(SrsSocket* skt, SrsHttpMessage* re @@ -410,23 +410,23 @@ int SrsApiSystemProcStats::do_process_request(SrsSocket* skt, SrsHttpMessage* re
410 410
411 SrsProcSystemStat* s = srs_get_system_proc_stat(); 411 SrsProcSystemStat* s = srs_get_system_proc_stat();
412 412
413 - ss << JOBJECT_START  
414 - << JFIELD_ERROR(ERROR_SUCCESS) << JFIELD_CONT  
415 - << JFIELD_ORG("data", JOBJECT_START)  
416 - << JFIELD_ORG("ok", (s->ok? "true":"false")) << JFIELD_CONT  
417 - << JFIELD_ORG("sample_time", s->sample_time) << JFIELD_CONT  
418 - << JFIELD_ORG("percent", s->percent) << JFIELD_CONT  
419 - << JFIELD_ORG("user", s->user) << JFIELD_CONT  
420 - << JFIELD_ORG("nice", s->nice) << JFIELD_CONT  
421 - << JFIELD_ORG("sys", s->sys) << JFIELD_CONT  
422 - << JFIELD_ORG("idle", s->idle) << JFIELD_CONT  
423 - << JFIELD_ORG("iowait", s->iowait) << JFIELD_CONT  
424 - << JFIELD_ORG("irq", s->irq) << JFIELD_CONT  
425 - << JFIELD_ORG("softirq", s->softirq) << JFIELD_CONT  
426 - << JFIELD_ORG("steal", s->steal) << JFIELD_CONT  
427 - << JFIELD_ORG("guest", s->guest)  
428 - << JOBJECT_END  
429 - << JOBJECT_END; 413 + ss << __SRS_JOBJECT_START
  414 + << __SRS_JFIELD_ERROR(ERROR_SUCCESS) << __SRS_JFIELD_CONT
  415 + << __SRS_JFIELD_ORG("data", __SRS_JOBJECT_START)
  416 + << __SRS_JFIELD_ORG("ok", (s->ok? "true":"false")) << __SRS_JFIELD_CONT
  417 + << __SRS_JFIELD_ORG("sample_time", s->sample_time) << __SRS_JFIELD_CONT
  418 + << __SRS_JFIELD_ORG("percent", s->percent) << __SRS_JFIELD_CONT
  419 + << __SRS_JFIELD_ORG("user", s->user) << __SRS_JFIELD_CONT
  420 + << __SRS_JFIELD_ORG("nice", s->nice) << __SRS_JFIELD_CONT
  421 + << __SRS_JFIELD_ORG("sys", s->sys) << __SRS_JFIELD_CONT
  422 + << __SRS_JFIELD_ORG("idle", s->idle) << __SRS_JFIELD_CONT
  423 + << __SRS_JFIELD_ORG("iowait", s->iowait) << __SRS_JFIELD_CONT
  424 + << __SRS_JFIELD_ORG("irq", s->irq) << __SRS_JFIELD_CONT
  425 + << __SRS_JFIELD_ORG("softirq", s->softirq) << __SRS_JFIELD_CONT
  426 + << __SRS_JFIELD_ORG("steal", s->steal) << __SRS_JFIELD_CONT
  427 + << __SRS_JFIELD_ORG("guest", s->guest)
  428 + << __SRS_JOBJECT_END
  429 + << __SRS_JOBJECT_END;
430 430
431 return res_json(skt, req, ss.str()); 431 return res_json(skt, req, ss.str());
432 } 432 }
@@ -450,24 +450,24 @@ int SrsApiMemInfos::do_process_request(SrsSocket* skt, SrsHttpMessage* req) @@ -450,24 +450,24 @@ int SrsApiMemInfos::do_process_request(SrsSocket* skt, SrsHttpMessage* req)
450 450
451 SrsMemInfo* m = srs_get_meminfo(); 451 SrsMemInfo* m = srs_get_meminfo();
452 452
453 - ss << JOBJECT_START  
454 - << JFIELD_ERROR(ERROR_SUCCESS) << JFIELD_CONT  
455 - << JFIELD_ORG("data", JOBJECT_START)  
456 - << JFIELD_ORG("ok", (m->ok? "true":"false")) << JFIELD_CONT  
457 - << JFIELD_ORG("sample_time", m->sample_time) << JFIELD_CONT  
458 - << JFIELD_ORG("percent_ram", m->percent_ram) << JFIELD_CONT  
459 - << JFIELD_ORG("percent_swap", m->percent_swap) << JFIELD_CONT  
460 - << JFIELD_ORG("MemActive", m->MemActive) << JFIELD_CONT  
461 - << JFIELD_ORG("RealInUse", m->RealInUse) << JFIELD_CONT  
462 - << JFIELD_ORG("NotInUse", m->NotInUse) << JFIELD_CONT  
463 - << JFIELD_ORG("MemTotal", m->MemTotal) << JFIELD_CONT  
464 - << JFIELD_ORG("MemFree", m->MemFree) << JFIELD_CONT  
465 - << JFIELD_ORG("Buffers", m->Buffers) << JFIELD_CONT  
466 - << JFIELD_ORG("Cached", m->Cached) << JFIELD_CONT  
467 - << JFIELD_ORG("SwapTotal", m->SwapTotal) << JFIELD_CONT  
468 - << JFIELD_ORG("SwapFree", m->SwapFree)  
469 - << JOBJECT_END  
470 - << JOBJECT_END; 453 + ss << __SRS_JOBJECT_START
  454 + << __SRS_JFIELD_ERROR(ERROR_SUCCESS) << __SRS_JFIELD_CONT
  455 + << __SRS_JFIELD_ORG("data", __SRS_JOBJECT_START)
  456 + << __SRS_JFIELD_ORG("ok", (m->ok? "true":"false")) << __SRS_JFIELD_CONT
  457 + << __SRS_JFIELD_ORG("sample_time", m->sample_time) << __SRS_JFIELD_CONT
  458 + << __SRS_JFIELD_ORG("percent_ram", m->percent_ram) << __SRS_JFIELD_CONT
  459 + << __SRS_JFIELD_ORG("percent_swap", m->percent_swap) << __SRS_JFIELD_CONT
  460 + << __SRS_JFIELD_ORG("MemActive", m->MemActive) << __SRS_JFIELD_CONT
  461 + << __SRS_JFIELD_ORG("RealInUse", m->RealInUse) << __SRS_JFIELD_CONT
  462 + << __SRS_JFIELD_ORG("NotInUse", m->NotInUse) << __SRS_JFIELD_CONT
  463 + << __SRS_JFIELD_ORG("MemTotal", m->MemTotal) << __SRS_JFIELD_CONT
  464 + << __SRS_JFIELD_ORG("MemFree", m->MemFree) << __SRS_JFIELD_CONT
  465 + << __SRS_JFIELD_ORG("Buffers", m->Buffers) << __SRS_JFIELD_CONT
  466 + << __SRS_JFIELD_ORG("Cached", m->Cached) << __SRS_JFIELD_CONT
  467 + << __SRS_JFIELD_ORG("SwapTotal", m->SwapTotal) << __SRS_JFIELD_CONT
  468 + << __SRS_JFIELD_ORG("SwapFree", m->SwapFree)
  469 + << __SRS_JOBJECT_END
  470 + << __SRS_JOBJECT_END;
471 471
472 return res_json(skt, req, ss.str()); 472 return res_json(skt, req, ss.str());
473 } 473 }
@@ -489,14 +489,14 @@ int SrsApiAuthors::do_process_request(SrsSocket* skt, SrsHttpMessage* req) @@ -489,14 +489,14 @@ int SrsApiAuthors::do_process_request(SrsSocket* skt, SrsHttpMessage* req)
489 { 489 {
490 std::stringstream ss; 490 std::stringstream ss;
491 491
492 - ss << JOBJECT_START  
493 - << JFIELD_ERROR(ERROR_SUCCESS) << JFIELD_CONT  
494 - << JFIELD_ORG("data", JOBJECT_START)  
495 - << JFIELD_STR("primary_authors", RTMP_SIG_SRS_PRIMARY_AUTHROS) << JFIELD_CONT  
496 - << JFIELD_STR("contributors_link", RTMP_SIG_SRS_CONTRIBUTORS_URL) << JFIELD_CONT  
497 - << JFIELD_STR("contributors", SRS_AUTO_CONSTRIBUTORS)  
498 - << JOBJECT_END  
499 - << JOBJECT_END; 492 + ss << __SRS_JOBJECT_START
  493 + << __SRS_JFIELD_ERROR(ERROR_SUCCESS) << __SRS_JFIELD_CONT
  494 + << __SRS_JFIELD_ORG("data", __SRS_JOBJECT_START)
  495 + << __SRS_JFIELD_STR("primary_authors", RTMP_SIG_SRS_PRIMARY_AUTHROS) << __SRS_JFIELD_CONT
  496 + << __SRS_JFIELD_STR("contributors_link", RTMP_SIG_SRS_CONTRIBUTORS_URL) << __SRS_JFIELD_CONT
  497 + << __SRS_JFIELD_STR("contributors", SRS_AUTO_CONSTRIBUTORS)
  498 + << __SRS_JOBJECT_END
  499 + << __SRS_JOBJECT_END;
500 500
501 return res_json(skt, req, ss.str()); 501 return res_json(skt, req, ss.str());
502 } 502 }
@@ -63,15 +63,15 @@ int SrsHttpHooks::on_connect(string url, int client_id, string ip, SrsRequest* r @@ -63,15 +63,15 @@ int SrsHttpHooks::on_connect(string url, int client_id, string ip, SrsRequest* r
63 } 63 }
64 64
65 std::stringstream ss; 65 std::stringstream ss;
66 - ss << JOBJECT_START  
67 - << JFIELD_STR("action", "on_connect") << JFIELD_CONT  
68 - << JFIELD_ORG("client_id", client_id) << JFIELD_CONT  
69 - << JFIELD_STR("ip", ip) << JFIELD_CONT  
70 - << JFIELD_STR("vhost", req->vhost) << JFIELD_CONT  
71 - << JFIELD_STR("app", req->app) << JFIELD_CONT  
72 - << JFIELD_STR("tcUrl", req->tcUrl) << JFIELD_CONT  
73 - << JFIELD_STR("pageUrl", req->pageUrl)  
74 - << JOBJECT_END; 66 + ss << __SRS_JOBJECT_START
  67 + << __SRS_JFIELD_STR("action", "on_connect") << __SRS_JFIELD_CONT
  68 + << __SRS_JFIELD_ORG("client_id", client_id) << __SRS_JFIELD_CONT
  69 + << __SRS_JFIELD_STR("ip", ip) << __SRS_JFIELD_CONT
  70 + << __SRS_JFIELD_STR("vhost", req->vhost) << __SRS_JFIELD_CONT
  71 + << __SRS_JFIELD_STR("app", req->app) << __SRS_JFIELD_CONT
  72 + << __SRS_JFIELD_STR("tcUrl", req->tcUrl) << __SRS_JFIELD_CONT
  73 + << __SRS_JFIELD_STR("pageUrl", req->pageUrl)
  74 + << __SRS_JOBJECT_END;
75 std::string data = ss.str(); 75 std::string data = ss.str();
76 std::string res; 76 std::string res;
77 77
@@ -109,14 +109,14 @@ void SrsHttpHooks::on_close(string url, int client_id, string ip, SrsRequest* re @@ -109,14 +109,14 @@ void SrsHttpHooks::on_close(string url, int client_id, string ip, SrsRequest* re
109 } 109 }
110 110
111 std::stringstream ss; 111 std::stringstream ss;
112 - ss << JOBJECT_START  
113 - << JFIELD_STR("action", "on_close") << JFIELD_CONT  
114 - << JFIELD_ORG("client_id", client_id) << JFIELD_CONT  
115 - << JFIELD_STR("ip", ip) << JFIELD_CONT  
116 - << JFIELD_STR("vhost", req->vhost) << JFIELD_CONT  
117 - << JFIELD_STR("app", req->app) << JFIELD_CONT  
118 - << JFIELD_STR("pageUrl", req->pageUrl)  
119 - << JOBJECT_END; 112 + ss << __SRS_JOBJECT_START
  113 + << __SRS_JFIELD_STR("action", "on_close") << __SRS_JFIELD_CONT
  114 + << __SRS_JFIELD_ORG("client_id", client_id) << __SRS_JFIELD_CONT
  115 + << __SRS_JFIELD_STR("ip", ip) << __SRS_JFIELD_CONT
  116 + << __SRS_JFIELD_STR("vhost", req->vhost) << __SRS_JFIELD_CONT
  117 + << __SRS_JFIELD_STR("app", req->app) << __SRS_JFIELD_CONT
  118 + << __SRS_JFIELD_STR("pageUrl", req->pageUrl)
  119 + << __SRS_JOBJECT_END;
120 std::string data = ss.str(); 120 std::string data = ss.str();
121 std::string res; 121 std::string res;
122 122
@@ -154,15 +154,15 @@ int SrsHttpHooks::on_publish(string url, int client_id, string ip, SrsRequest* r @@ -154,15 +154,15 @@ int SrsHttpHooks::on_publish(string url, int client_id, string ip, SrsRequest* r
154 } 154 }
155 155
156 std::stringstream ss; 156 std::stringstream ss;
157 - ss << JOBJECT_START  
158 - << JFIELD_STR("action", "on_publish") << JFIELD_CONT  
159 - << JFIELD_ORG("client_id", client_id) << JFIELD_CONT  
160 - << JFIELD_STR("ip", ip) << JFIELD_CONT  
161 - << JFIELD_STR("vhost", req->vhost) << JFIELD_CONT  
162 - << JFIELD_STR("app", req->app) << JFIELD_CONT  
163 - << JFIELD_STR("pageUrl", req->pageUrl) << JFIELD_CONT  
164 - << JFIELD_STR("stream", req->stream)  
165 - << JOBJECT_END; 157 + ss << __SRS_JOBJECT_START
  158 + << __SRS_JFIELD_STR("action", "on_publish") << __SRS_JFIELD_CONT
  159 + << __SRS_JFIELD_ORG("client_id", client_id) << __SRS_JFIELD_CONT
  160 + << __SRS_JFIELD_STR("ip", ip) << __SRS_JFIELD_CONT
  161 + << __SRS_JFIELD_STR("vhost", req->vhost) << __SRS_JFIELD_CONT
  162 + << __SRS_JFIELD_STR("app", req->app) << __SRS_JFIELD_CONT
  163 + << __SRS_JFIELD_STR("pageUrl", req->pageUrl) << __SRS_JFIELD_CONT
  164 + << __SRS_JFIELD_STR("stream", req->stream)
  165 + << __SRS_JOBJECT_END;
166 std::string data = ss.str(); 166 std::string data = ss.str();
167 std::string res; 167 std::string res;
168 168
@@ -200,15 +200,15 @@ void SrsHttpHooks::on_unpublish(string url, int client_id, string ip, SrsRequest @@ -200,15 +200,15 @@ void SrsHttpHooks::on_unpublish(string url, int client_id, string ip, SrsRequest
200 } 200 }
201 201
202 std::stringstream ss; 202 std::stringstream ss;
203 - ss << JOBJECT_START  
204 - << JFIELD_STR("action", "on_unpublish") << JFIELD_CONT  
205 - << JFIELD_ORG("client_id", client_id) << JFIELD_CONT  
206 - << JFIELD_STR("ip", ip) << JFIELD_CONT  
207 - << JFIELD_STR("vhost", req->vhost) << JFIELD_CONT  
208 - << JFIELD_STR("app", req->app) << JFIELD_CONT  
209 - << JFIELD_STR("pageUrl", req->pageUrl) << JFIELD_CONT  
210 - << JFIELD_STR("stream", req->stream)  
211 - << JOBJECT_END; 203 + ss << __SRS_JOBJECT_START
  204 + << __SRS_JFIELD_STR("action", "on_unpublish") << __SRS_JFIELD_CONT
  205 + << __SRS_JFIELD_ORG("client_id", client_id) << __SRS_JFIELD_CONT
  206 + << __SRS_JFIELD_STR("ip", ip) << __SRS_JFIELD_CONT
  207 + << __SRS_JFIELD_STR("vhost", req->vhost) << __SRS_JFIELD_CONT
  208 + << __SRS_JFIELD_STR("app", req->app) << __SRS_JFIELD_CONT
  209 + << __SRS_JFIELD_STR("pageUrl", req->pageUrl) << __SRS_JFIELD_CONT
  210 + << __SRS_JFIELD_STR("stream", req->stream)
  211 + << __SRS_JOBJECT_END;
212 std::string data = ss.str(); 212 std::string data = ss.str();
213 std::string res; 213 std::string res;
214 214
@@ -246,15 +246,15 @@ int SrsHttpHooks::on_play(string url, int client_id, string ip, SrsRequest* req) @@ -246,15 +246,15 @@ int SrsHttpHooks::on_play(string url, int client_id, string ip, SrsRequest* req)
246 } 246 }
247 247
248 std::stringstream ss; 248 std::stringstream ss;
249 - ss << JOBJECT_START  
250 - << JFIELD_STR("action", "on_play") << JFIELD_CONT  
251 - << JFIELD_ORG("client_id", client_id) << JFIELD_CONT  
252 - << JFIELD_STR("ip", ip) << JFIELD_CONT  
253 - << JFIELD_STR("vhost", req->vhost) << JFIELD_CONT  
254 - << JFIELD_STR("app", req->app) << JFIELD_CONT  
255 - << JFIELD_STR("pageUrl", req->pageUrl) << JFIELD_CONT  
256 - << JFIELD_STR("stream", req->stream)  
257 - << JOBJECT_END; 249 + ss << __SRS_JOBJECT_START
  250 + << __SRS_JFIELD_STR("action", "on_play") << __SRS_JFIELD_CONT
  251 + << __SRS_JFIELD_ORG("client_id", client_id) << __SRS_JFIELD_CONT
  252 + << __SRS_JFIELD_STR("ip", ip) << __SRS_JFIELD_CONT
  253 + << __SRS_JFIELD_STR("vhost", req->vhost) << __SRS_JFIELD_CONT
  254 + << __SRS_JFIELD_STR("app", req->app) << __SRS_JFIELD_CONT
  255 + << __SRS_JFIELD_STR("pageUrl", req->pageUrl) << __SRS_JFIELD_CONT
  256 + << __SRS_JFIELD_STR("stream", req->stream)
  257 + << __SRS_JOBJECT_END;
258 std::string data = ss.str(); 258 std::string data = ss.str();
259 std::string res; 259 std::string res;
260 260
@@ -292,15 +292,15 @@ void SrsHttpHooks::on_stop(string url, int client_id, string ip, SrsRequest* req @@ -292,15 +292,15 @@ void SrsHttpHooks::on_stop(string url, int client_id, string ip, SrsRequest* req
292 } 292 }
293 293
294 std::stringstream ss; 294 std::stringstream ss;
295 - ss << JOBJECT_START  
296 - << JFIELD_STR("action", "on_stop") << JFIELD_CONT  
297 - << JFIELD_ORG("client_id", client_id) << JFIELD_CONT  
298 - << JFIELD_STR("ip", ip) << JFIELD_CONT  
299 - << JFIELD_STR("vhost", req->vhost) << JFIELD_CONT  
300 - << JFIELD_STR("app", req->app) << JFIELD_CONT  
301 - << JFIELD_STR("pageUrl", req->pageUrl) << JFIELD_CONT  
302 - << JFIELD_STR("stream", req->stream)  
303 - << JOBJECT_END; 295 + ss << __SRS_JOBJECT_START
  296 + << __SRS_JFIELD_STR("action", "on_stop") << __SRS_JFIELD_CONT
  297 + << __SRS_JFIELD_ORG("client_id", client_id) << __SRS_JFIELD_CONT
  298 + << __SRS_JFIELD_STR("ip", ip) << __SRS_JFIELD_CONT
  299 + << __SRS_JFIELD_STR("vhost", req->vhost) << __SRS_JFIELD_CONT
  300 + << __SRS_JFIELD_STR("app", req->app) << __SRS_JFIELD_CONT
  301 + << __SRS_JFIELD_STR("pageUrl", req->pageUrl) << __SRS_JFIELD_CONT
  302 + << __SRS_JFIELD_STR("stream", req->stream)
  303 + << __SRS_JOBJECT_END;
304 std::string data = ss.str(); 304 std::string data = ss.str();
305 std::string res; 305 std::string res;
306 306
@@ -342,16 +342,16 @@ void SrsHttpHooks::on_dvr_hss_reap_flv_header(std::string url, SrsRequest* req, @@ -342,16 +342,16 @@ void SrsHttpHooks::on_dvr_hss_reap_flv_header(std::string url, SrsRequest* req,
342 } 342 }
343 343
344 std::stringstream ss; 344 std::stringstream ss;
345 - ss << JOBJECT_START  
346 - << JFIELD_STR("action", "on_dvr_hss_reap_flv_header") << JFIELD_CONT  
347 - << JFIELD_STR("vhost", req->vhost) << JFIELD_CONT  
348 - << JFIELD_STR("app", req->app) << JFIELD_CONT  
349 - << JFIELD_STR("stream", req->stream) << JFIELD_CONT  
350 - << JFIELD_NAME("segment") << JOBJECT_START  
351 - << JFIELD_STR("cwd", _srs_config->cwd()) << JFIELD_CONT  
352 - << JFIELD_STR("path", header_file)  
353 - << JOBJECT_END  
354 - << JOBJECT_END; 345 + ss << __SRS_JOBJECT_START
  346 + << __SRS_JFIELD_STR("action", "on_dvr_hss_reap_flv_header") << __SRS_JFIELD_CONT
  347 + << __SRS_JFIELD_STR("vhost", req->vhost) << __SRS_JFIELD_CONT
  348 + << __SRS_JFIELD_STR("app", req->app) << __SRS_JFIELD_CONT
  349 + << __SRS_JFIELD_STR("stream", req->stream) << __SRS_JFIELD_CONT
  350 + << __SRS_JFIELD_NAME("segment") << __SRS_JOBJECT_START
  351 + << __SRS_JFIELD_STR("cwd", _srs_config->cwd()) << __SRS_JFIELD_CONT
  352 + << __SRS_JFIELD_STR("path", header_file)
  353 + << __SRS_JOBJECT_END
  354 + << __SRS_JOBJECT_END;
355 std::string data = ss.str(); 355 std::string data = ss.str();
356 std::string res; 356 std::string res;
357 357
@@ -395,20 +395,20 @@ void SrsHttpHooks::on_dvr_hss_reap_flv(string url, SrsRequest* req, SrsFlvSegmen @@ -395,20 +395,20 @@ void SrsHttpHooks::on_dvr_hss_reap_flv(string url, SrsRequest* req, SrsFlvSegmen
395 } 395 }
396 396
397 std::stringstream ss; 397 std::stringstream ss;
398 - ss << JOBJECT_START  
399 - << JFIELD_STR("action", "on_dvr_hss_reap_flv") << JFIELD_CONT  
400 - << JFIELD_STR("vhost", req->vhost) << JFIELD_CONT  
401 - << JFIELD_STR("app", req->app) << JFIELD_CONT  
402 - << JFIELD_STR("stream", req->stream) << JFIELD_CONT  
403 - << JFIELD_NAME("segment") << JOBJECT_START  
404 - << JFIELD_STR("cwd", _srs_config->cwd()) << JFIELD_CONT  
405 - << JFIELD_STR("path", segment->path) << JFIELD_CONT  
406 - << JFIELD_ORG("duration", segment->duration) << JFIELD_CONT  
407 - << JFIELD_ORG("offset", segment->sequence_header_offset) << JFIELD_CONT  
408 - << JFIELD_ORG("has_keyframe", (segment->has_keyframe? "true":"false")) << JFIELD_CONT  
409 - << JFIELD_ORG("pts", segment->stream_starttime + segment->starttime)  
410 - << JOBJECT_END  
411 - << JOBJECT_END; 398 + ss << __SRS_JOBJECT_START
  399 + << __SRS_JFIELD_STR("action", "on_dvr_hss_reap_flv") << __SRS_JFIELD_CONT
  400 + << __SRS_JFIELD_STR("vhost", req->vhost) << __SRS_JFIELD_CONT
  401 + << __SRS_JFIELD_STR("app", req->app) << __SRS_JFIELD_CONT
  402 + << __SRS_JFIELD_STR("stream", req->stream) << __SRS_JFIELD_CONT
  403 + << __SRS_JFIELD_NAME("segment") << __SRS_JOBJECT_START
  404 + << __SRS_JFIELD_STR("cwd", _srs_config->cwd()) << __SRS_JFIELD_CONT
  405 + << __SRS_JFIELD_STR("path", segment->path) << __SRS_JFIELD_CONT
  406 + << __SRS_JFIELD_ORG("duration", segment->duration) << __SRS_JFIELD_CONT
  407 + << __SRS_JFIELD_ORG("offset", segment->sequence_header_offset) << __SRS_JFIELD_CONT
  408 + << __SRS_JFIELD_ORG("has_keyframe", (segment->has_keyframe? "true":"false")) << __SRS_JFIELD_CONT
  409 + << __SRS_JFIELD_ORG("pts", segment->stream_starttime + segment->starttime)
  410 + << __SRS_JOBJECT_END
  411 + << __SRS_JOBJECT_END;
412 std::string data = ss.str(); 412 std::string data = ss.str();
413 std::string res; 413 std::string res;
414 414
@@ -172,16 +172,16 @@ public: @@ -172,16 +172,16 @@ public:
172 //////////////////////////////////////////////////////////////////////// 172 ////////////////////////////////////////////////////////////////////////
173 //////////////////////////////////////////////////////////////////////// 173 ////////////////////////////////////////////////////////////////////////
174 /* json encode 174 /* json encode
175 - cout<< JOBJECT_START  
176 - << JFIELD_STR("name", "srs") << JFIELD_CONT  
177 - << JFIELD_ORG("version", 100) << JFIELD_CONT  
178 - << JFIELD_NAME("features") << JOBJECT_START  
179 - << JFIELD_STR("rtmp", "released") << JFIELD_CONT  
180 - << JFIELD_STR("hls", "released") << JFIELD_CONT  
181 - << JFIELD_STR("dash", "plan")  
182 - << JOBJECT_END << JFIELD_CONT  
183 - << JFIELD_STR("author", "srs team")  
184 - << JOBJECT_END 175 + cout<< __SRS_JOBJECT_START
  176 + << __SRS_JFIELD_STR("name", "srs") << __SRS_JFIELD_CONT
  177 + << __SRS_JFIELD_ORG("version", 100) << __SRS_JFIELD_CONT
  178 + << __SRS_JFIELD_NAME("features") << __SRS_JOBJECT_START
  179 + << __SRS_JFIELD_STR("rtmp", "released") << __SRS_JFIELD_CONT
  180 + << __SRS_JFIELD_STR("hls", "released") << __SRS_JFIELD_CONT
  181 + << __SRS_JFIELD_STR("dash", "plan")
  182 + << __SRS_JOBJECT_END << __SRS_JFIELD_CONT
  183 + << __SRS_JFIELD_STR("author", "srs team")
  184 + << __SRS_JOBJECT_END
185 it's: 185 it's:
186 cont<< "{" 186 cont<< "{"
187 << "name:" << "srs" << "," 187 << "name:" << "srs" << ","
@@ -210,14 +210,14 @@ that is: @@ -210,14 +210,14 @@ that is:
210 //////////////////////////////////////////////////////////////////////// 210 ////////////////////////////////////////////////////////////////////////
211 //////////////////////////////////////////////////////////////////////// 211 ////////////////////////////////////////////////////////////////////////
212 //////////////////////////////////////////////////////////////////////// 212 ////////////////////////////////////////////////////////////////////////
213 -#define JOBJECT_START "{"  
214 -#define JFIELD_NAME(k) "\"" << k << "\":"  
215 -#define JFIELD_STR(k, v) "\"" << k << "\":\"" << v << "\""  
216 -#define JFIELD_ORG(k, v) "\"" << k << "\":" << std::dec << v  
217 -#define JFIELD_ERROR(ret) "\"" << "code" << "\":" << ret  
218 -#define JFIELD_CONT ","  
219 -#define JOBJECT_END "}"  
220 -#define JARRAY_START "["  
221 -#define JARRAY_END "]" 213 +#define __SRS_JOBJECT_START "{"
  214 +#define __SRS_JFIELD_NAME(k) "\"" << k << "\":"
  215 +#define __SRS_JFIELD_STR(k, v) "\"" << k << "\":\"" << v << "\""
  216 +#define __SRS_JFIELD_ORG(k, v) "\"" << k << "\":" << std::dec << v
  217 +#define __SRS_JFIELD_ERROR(ret) "\"" << "code" << "\":" << ret
  218 +#define __SRS_JFIELD_CONT ","
  219 +#define __SRS_JOBJECT_END "}"
  220 +#define __SRS_JARRAY_START "["
  221 +#define __SRS_JARRAY_END "]"
222 222
223 #endif 223 #endif
@@ -821,56 +821,56 @@ void srs_api_dump_summaries(std::stringstream& ss) @@ -821,56 +821,56 @@ void srs_api_dump_summaries(std::stringstream& ss)
821 n_sample_time = o.sample_time; 821 n_sample_time = o.sample_time;
822 } 822 }
823 823
824 - ss << JOBJECT_START  
825 - << JFIELD_ERROR(ERROR_SUCCESS) << JFIELD_CONT  
826 - << JFIELD_ORG("data", JOBJECT_START)  
827 - << JFIELD_ORG("rusage_ok", (r->ok? "true":"false")) << JFIELD_CONT  
828 - << JFIELD_ORG("self_cpu_stat_ok", (u->ok? "true":"false")) << JFIELD_CONT  
829 - << JFIELD_ORG("system_cpu_stat_ok", (s->ok? "true":"false")) << JFIELD_CONT  
830 - << JFIELD_ORG("cpuinfo_ok", (c->ok? "true":"false")) << JFIELD_CONT  
831 - << JFIELD_ORG("meminfo_ok", (m->ok? "true":"false")) << JFIELD_CONT  
832 - << JFIELD_ORG("platform_ok", (p->ok? "true":"false")) << JFIELD_CONT  
833 - << JFIELD_ORG("network_ok", (n_ok? "true":"false")) << JFIELD_CONT  
834 - << JFIELD_ORG("network_srs_ok", (nrs->ok? "true":"false")) << JFIELD_CONT  
835 - << JFIELD_ORG("now_ms", now) << JFIELD_CONT  
836 - << JFIELD_ORG("self", JOBJECT_START)  
837 - << JFIELD_STR("version", RTMP_SIG_SRS_VERSION) << JFIELD_CONT  
838 - << JFIELD_ORG("pid", getpid()) << JFIELD_CONT  
839 - << JFIELD_ORG("ppid", u->ppid) << JFIELD_CONT  
840 - << JFIELD_STR("argv", _srs_config->argv()) << JFIELD_CONT  
841 - << JFIELD_STR("cwd", _srs_config->cwd()) << JFIELD_CONT  
842 - << JFIELD_ORG("mem_kbyte", r->r.ru_maxrss) << JFIELD_CONT  
843 - << JFIELD_ORG("mem_percent", self_mem_percent) << JFIELD_CONT  
844 - << JFIELD_ORG("cpu_percent", u->percent) << JFIELD_CONT  
845 - << JFIELD_ORG("srs_uptime", srs_uptime)  
846 - << JOBJECT_END << JFIELD_CONT  
847 - << JFIELD_ORG("system", JOBJECT_START)  
848 - << JFIELD_ORG("cpu_percent", s->percent) << JFIELD_CONT  
849 - << JFIELD_ORG("mem_ram_kbyte", m->MemTotal) << JFIELD_CONT  
850 - << JFIELD_ORG("mem_ram_percent", m->percent_ram) << JFIELD_CONT  
851 - << JFIELD_ORG("mem_swap_kbyte", m->SwapTotal) << JFIELD_CONT  
852 - << JFIELD_ORG("mem_swap_percent", m->percent_swap) << JFIELD_CONT  
853 - << JFIELD_ORG("cpus", c->nb_processors) << JFIELD_CONT  
854 - << JFIELD_ORG("cpus_online", c->nb_processors_online) << JFIELD_CONT  
855 - << JFIELD_ORG("uptime", p->os_uptime) << JFIELD_CONT  
856 - << JFIELD_ORG("ilde_time", p->os_ilde_time) << JFIELD_CONT  
857 - << JFIELD_ORG("load_1m", p->load_one_minutes) << JFIELD_CONT  
858 - << JFIELD_ORG("load_5m", p->load_five_minutes) << JFIELD_CONT  
859 - << JFIELD_ORG("load_15m", p->load_fifteen_minutes) << JFIELD_CONT  
860 - << JFIELD_ORG("net_sample_time", n_sample_time) << JFIELD_CONT  
861 - << JFIELD_ORG("net_recv_bytes", nr_bytes) << JFIELD_CONT  
862 - << JFIELD_ORG("net_send_bytes", ns_bytes) << JFIELD_CONT  
863 - << JFIELD_ORG("srs_sample_time", nrs->sample_time) << JFIELD_CONT  
864 - << JFIELD_ORG("srs_recv_bytes", nrs->rbytes) << JFIELD_CONT  
865 - << JFIELD_ORG("srs_recv_kbps", nrs->rkbps) << JFIELD_CONT  
866 - << JFIELD_ORG("srs_send_bytes", nrs->sbytes) << JFIELD_CONT  
867 - << JFIELD_ORG("srs_send_kbps", nrs->skbps) << JFIELD_CONT  
868 - << JFIELD_ORG("conn_sys", nrs->nb_conn_sys) << JFIELD_CONT  
869 - << JFIELD_ORG("conn_sys_et", nrs->nb_conn_sys_et) << JFIELD_CONT  
870 - << JFIELD_ORG("conn_sys_tw", nrs->nb_conn_sys_tw) << JFIELD_CONT  
871 - << JFIELD_ORG("conn_sys_ls", nrs->nb_conn_sys_ls) << JFIELD_CONT  
872 - << JFIELD_ORG("conn_srs", nrs->nb_conn_srs)  
873 - << JOBJECT_END  
874 - << JOBJECT_END  
875 - << JOBJECT_END; 824 + ss << __SRS_JOBJECT_START
  825 + << __SRS_JFIELD_ERROR(ERROR_SUCCESS) << __SRS_JFIELD_CONT
  826 + << __SRS_JFIELD_ORG("data", __SRS_JOBJECT_START)
  827 + << __SRS_JFIELD_ORG("rusage_ok", (r->ok? "true":"false")) << __SRS_JFIELD_CONT
  828 + << __SRS_JFIELD_ORG("self_cpu_stat_ok", (u->ok? "true":"false")) << __SRS_JFIELD_CONT
  829 + << __SRS_JFIELD_ORG("system_cpu_stat_ok", (s->ok? "true":"false")) << __SRS_JFIELD_CONT
  830 + << __SRS_JFIELD_ORG("cpuinfo_ok", (c->ok? "true":"false")) << __SRS_JFIELD_CONT
  831 + << __SRS_JFIELD_ORG("meminfo_ok", (m->ok? "true":"false")) << __SRS_JFIELD_CONT
  832 + << __SRS_JFIELD_ORG("platform_ok", (p->ok? "true":"false")) << __SRS_JFIELD_CONT
  833 + << __SRS_JFIELD_ORG("network_ok", (n_ok? "true":"false")) << __SRS_JFIELD_CONT
  834 + << __SRS_JFIELD_ORG("network_srs_ok", (nrs->ok? "true":"false")) << __SRS_JFIELD_CONT
  835 + << __SRS_JFIELD_ORG("now_ms", now) << __SRS_JFIELD_CONT
  836 + << __SRS_JFIELD_ORG("self", __SRS_JOBJECT_START)
  837 + << __SRS_JFIELD_STR("version", RTMP_SIG_SRS_VERSION) << __SRS_JFIELD_CONT
  838 + << __SRS_JFIELD_ORG("pid", getpid()) << __SRS_JFIELD_CONT
  839 + << __SRS_JFIELD_ORG("ppid", u->ppid) << __SRS_JFIELD_CONT
  840 + << __SRS_JFIELD_STR("argv", _srs_config->argv()) << __SRS_JFIELD_CONT
  841 + << __SRS_JFIELD_STR("cwd", _srs_config->cwd()) << __SRS_JFIELD_CONT
  842 + << __SRS_JFIELD_ORG("mem_kbyte", r->r.ru_maxrss) << __SRS_JFIELD_CONT
  843 + << __SRS_JFIELD_ORG("mem_percent", self_mem_percent) << __SRS_JFIELD_CONT
  844 + << __SRS_JFIELD_ORG("cpu_percent", u->percent) << __SRS_JFIELD_CONT
  845 + << __SRS_JFIELD_ORG("srs_uptime", srs_uptime)
  846 + << __SRS_JOBJECT_END << __SRS_JFIELD_CONT
  847 + << __SRS_JFIELD_ORG("system", __SRS_JOBJECT_START)
  848 + << __SRS_JFIELD_ORG("cpu_percent", s->percent) << __SRS_JFIELD_CONT
  849 + << __SRS_JFIELD_ORG("mem_ram_kbyte", m->MemTotal) << __SRS_JFIELD_CONT
  850 + << __SRS_JFIELD_ORG("mem_ram_percent", m->percent_ram) << __SRS_JFIELD_CONT
  851 + << __SRS_JFIELD_ORG("mem_swap_kbyte", m->SwapTotal) << __SRS_JFIELD_CONT
  852 + << __SRS_JFIELD_ORG("mem_swap_percent", m->percent_swap) << __SRS_JFIELD_CONT
  853 + << __SRS_JFIELD_ORG("cpus", c->nb_processors) << __SRS_JFIELD_CONT
  854 + << __SRS_JFIELD_ORG("cpus_online", c->nb_processors_online) << __SRS_JFIELD_CONT
  855 + << __SRS_JFIELD_ORG("uptime", p->os_uptime) << __SRS_JFIELD_CONT
  856 + << __SRS_JFIELD_ORG("ilde_time", p->os_ilde_time) << __SRS_JFIELD_CONT
  857 + << __SRS_JFIELD_ORG("load_1m", p->load_one_minutes) << __SRS_JFIELD_CONT
  858 + << __SRS_JFIELD_ORG("load_5m", p->load_five_minutes) << __SRS_JFIELD_CONT
  859 + << __SRS_JFIELD_ORG("load_15m", p->load_fifteen_minutes) << __SRS_JFIELD_CONT
  860 + << __SRS_JFIELD_ORG("net_sample_time", n_sample_time) << __SRS_JFIELD_CONT
  861 + << __SRS_JFIELD_ORG("net_recv_bytes", nr_bytes) << __SRS_JFIELD_CONT
  862 + << __SRS_JFIELD_ORG("net_send_bytes", ns_bytes) << __SRS_JFIELD_CONT
  863 + << __SRS_JFIELD_ORG("srs_sample_time", nrs->sample_time) << __SRS_JFIELD_CONT
  864 + << __SRS_JFIELD_ORG("srs_recv_bytes", nrs->rbytes) << __SRS_JFIELD_CONT
  865 + << __SRS_JFIELD_ORG("srs_recv_kbps", nrs->rkbps) << __SRS_JFIELD_CONT
  866 + << __SRS_JFIELD_ORG("srs_send_bytes", nrs->sbytes) << __SRS_JFIELD_CONT
  867 + << __SRS_JFIELD_ORG("srs_send_kbps", nrs->skbps) << __SRS_JFIELD_CONT
  868 + << __SRS_JFIELD_ORG("conn_sys", nrs->nb_conn_sys) << __SRS_JFIELD_CONT
  869 + << __SRS_JFIELD_ORG("conn_sys_et", nrs->nb_conn_sys_et) << __SRS_JFIELD_CONT
  870 + << __SRS_JFIELD_ORG("conn_sys_tw", nrs->nb_conn_sys_tw) << __SRS_JFIELD_CONT
  871 + << __SRS_JFIELD_ORG("conn_sys_ls", nrs->nb_conn_sys_ls) << __SRS_JFIELD_CONT
  872 + << __SRS_JFIELD_ORG("conn_srs", nrs->nb_conn_srs)
  873 + << __SRS_JOBJECT_END
  874 + << __SRS_JOBJECT_END
  875 + << __SRS_JOBJECT_END;
876 } 876 }