winlin

revert tcp stat. need more refine. 0.9.182

@@ -90,7 +90,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -90,7 +90,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
90 90
91 // update network devices info interval: 91 // update network devices info interval:
92 // SRS_SYS_CYCLE_INTERVAL * SRS_SYS_NETWORK_RTMP_SERVER_RESOLUTION_TIMES 92 // SRS_SYS_CYCLE_INTERVAL * SRS_SYS_NETWORK_RTMP_SERVER_RESOLUTION_TIMES
93 -#define SRS_SYS_NETWORK_RTMP_SERVER_RESOLUTION_TIMES 120 93 +#define SRS_SYS_NETWORK_RTMP_SERVER_RESOLUTION_TIMES 90
94 94
95 SrsListener::SrsListener(SrsServer* server, SrsListenerType type) 95 SrsListener::SrsListener(SrsServer* server, SrsListenerType type)
96 { 96 {
@@ -833,18 +833,10 @@ void srs_update_rtmp_server(int nb_conn, SrsKbps* kbps) @@ -833,18 +833,10 @@ void srs_update_rtmp_server(int nb_conn, SrsKbps* kbps)
833 int nb_conn_sys_other = 0; 833 int nb_conn_sys_other = 0;
834 834
835 // @see: http://tester-higkoo.googlecode.com/svn-history/r14/trunk/Tools/iostat/iostat.c 835 // @see: http://tester-higkoo.googlecode.com/svn-history/r14/trunk/Tools/iostat/iostat.c
836 - for (int i = 0; fgets(buf, sizeof(buf), f); i++) { 836 + while (fgets(buf, sizeof(buf), f)) {
837 int st = 0; 837 int st = 0;
838 int ret = sscanf(buf, "%*s %*s %*s %2x\n", &st); 838 int ret = sscanf(buf, "%*s %*s %*s %2x\n", &st);
839 839
840 - // there are maybe many many connections,  
841 - // for example, when srs used for monitor other process,  
842 - // like nginx, there are maybe many TIME_WAIT conections.  
843 - // we sleep 10ms when read 1000 records, so 1000ms for 10w connections.  
844 - if ((i % 1000) == 0) {  
845 - st_usleep(10 * 1000);  
846 - }  
847 -  
848 if (ret == 1) { 840 if (ret == 1) {
849 if (st == SYS_TCP_ESTABLISHED) { 841 if (st == SYS_TCP_ESTABLISHED) {
850 nb_conn_sys_established++; 842 nb_conn_sys_established++;
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
31 // current release version 31 // current release version
32 #define VERSION_MAJOR "0" 32 #define VERSION_MAJOR "0"
33 #define VERSION_MINOR "9" 33 #define VERSION_MINOR "9"
34 -#define VERSION_REVISION "181" 34 +#define VERSION_REVISION "182"
35 #define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION 35 #define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION
36 // server info. 36 // server info.
37 #define RTMP_SIG_SRS_KEY "SRS" 37 #define RTMP_SIG_SRS_KEY "SRS"