[dev] optimize stat module (thanks to plainheart).

Author: winshining

ngx_rtmp_stat_module.c

@@ -809,7 +809,7 @@ ngx_rtmp_stat_live(ngx_http_request_t *r, ngx_chain_t ***lll,
                         NGX_RTMP_STAT(buf, ngx_snprintf(buf, sizeof(buf),
                                       "%ui", codec->aac_chan_conf) - buf);
                     } else if (codec->audio_channels) {
-                        if (f >= 1) NGX_RTMP_STAT_L(",");
+                        if (f >= 1) NGX_RTMP_STAT_L("\",");
                         f = 3;
                         NGX_RTMP_STAT_L("\"channels\":");
                         NGX_RTMP_STAT(buf, ngx_snprintf(buf, sizeof(buf),
@@ -1005,21 +1005,12 @@ static void
 ngx_rtmp_stat_application(ngx_http_request_t *r, ngx_chain_t ***lll,
         ngx_rtmp_core_srv_conf_t *cscf, ngx_rtmp_core_app_conf_t *cacf)
 {
-    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);
 
     if (slcf->format & NGX_RTMP_STAT_FORMAT_XML) {
         NGX_RTMP_STAT_L("<application>\r\n");
-        NGX_RTMP_STAT_L("<port>");
-        NGX_RTMP_STAT(buf, ngx_snprintf(buf, sizeof(buf),
-                      "%ui", cscf->port) - buf);
-        NGX_RTMP_STAT_L("</port>\r\n");
-        NGX_RTMP_STAT_L("<server_index>");
-        NGX_RTMP_STAT(buf, ngx_snprintf(buf, sizeof(buf),
-                      "%ui", cscf->index) - buf);
-        NGX_RTMP_STAT_L("</server_index>\r\n");
         NGX_RTMP_STAT_L("<name>");
         NGX_RTMP_STAT_ES(&cacf->name);
         NGX_RTMP_STAT_L("</name>\r\n");
@@ -1052,18 +1043,35 @@ static void
 ngx_rtmp_stat_server(ngx_http_request_t *r, ngx_chain_t ***lll,
         ngx_rtmp_core_srv_conf_t *cscf)
 {
-    ngx_rtmp_core_app_conf_t      **cacf;
+    u_char                          buf[NGX_INT_T_LEN];
     size_t                          n;
+    ngx_rtmp_core_app_conf_t      **cacf;
     ngx_rtmp_stat_loc_conf_t       *slcf;
 
     slcf = ngx_http_get_module_loc_conf(r, ngx_rtmp_stat_module);
 
     if (slcf->format & NGX_RTMP_STAT_FORMAT_XML) {
         NGX_RTMP_STAT_L("<server>\r\n");
+        NGX_RTMP_STAT_L("<port>");
+        NGX_RTMP_STAT(buf, ngx_snprintf(buf, sizeof(buf),
+                      "%ui", cscf->port) - buf);
+        NGX_RTMP_STAT_L("</port>\r\n");
+        NGX_RTMP_STAT_L("<server_index>");
+        NGX_RTMP_STAT(buf, ngx_snprintf(buf, sizeof(buf),
+                      "%ui", cscf->index) - buf);
+        NGX_RTMP_STAT_L("</server_index>\r\n");
     }
 
     if (slcf->format & NGX_RTMP_STAT_FORMAT_JSON) {
         NGX_RTMP_STAT_L("{");
+        NGX_RTMP_STAT_L("\"port\":");
+        NGX_RTMP_STAT(buf, ngx_snprintf(buf, sizeof(buf),
+                      "%ui", cscf->port) - buf);
+        NGX_RTMP_STAT_L(",");
+        NGX_RTMP_STAT_L("\"server_index\":");
+        NGX_RTMP_STAT(buf, ngx_snprintf(buf, sizeof(buf),
+                      "%ui", cscf->index) - buf);
+        NGX_RTMP_STAT_L(",");
     }
 
 #ifdef NGX_RTMP_POOL_DEBUG

stat.xsl

@@ -32,6 +32,7 @@
         <tr bgcolor="#999999">
             <th>HTTP-FLV</th>
             <th>#clients</th>
+            <th colspan="2">Server</th>
             <th colspan="4">Video</th>
             <th colspan="4">Audio</th>
             <th>In bytes</th>
@@ -43,6 +44,8 @@
         </tr>
         <tr>
             <td colspan="2">Accepted: <xsl:value-of select="naccepted"/></td>
+            <th bgcolor="#999999">port</th>
+            <th bgcolor="#999999">index</th>
             <th bgcolor="#999999">codec</th>
             <th bgcolor="#999999">bits/s</th>
             <th bgcolor="#999999">size</th>
@@ -135,7 +138,7 @@
         <td>
             <a href="">
                 <xsl:attribute name="onclick">
-                    var d=document.getElementById('<xsl:value-of select="../../port"/>-<xsl:value-of select="../../server_index"/>-<xsl:value-of select="../../name"/>-<xsl:value-of select="name"/>');
+                    var d=document.getElementById('<xsl:value-of select="../../../port"/>-<xsl:value-of select="../../../server_index"/>-<xsl:value-of select="../../name"/>-<xsl:value-of select="name"/>');
                     d.style.display=d.style.display=='none'?'':'none';
                     return false
                 </xsl:attribute>
@@ -146,6 +149,8 @@
             </a>
         </td>
         <td align="middle"> <xsl:value-of select="nclients"/> </td>
+        <td align="middle"> <xsl:value-of select="../../../port"/> </td>
+        <td align="middle"> <xsl:value-of select="../../../server_index"/> </td>
         <td>
             <xsl:value-of select="meta/video/codec"/>&#160;<xsl:value-of select="meta/video/profile"/>&#160;<xsl:value-of select="meta/video/level"/>
         </td>
@@ -211,7 +216,7 @@
     </tr>
     <tr style="display:none">
         <xsl:attribute name="id">
-            <xsl:value-of select="../../port"/>-<xsl:value-of select="../../server_index"/>-<xsl:value-of select="../../name"/>-<xsl:value-of select="name"/>
+            <xsl:value-of select="../../../port"/>-<xsl:value-of select="../../../server_index"/>-<xsl:value-of select="../../name"/>-<xsl:value-of select="name"/>
         </xsl:attribute>
         <td colspan="16" ngcolor="#eeeeee">
             <table cellspacing="1" cellpadding="5">