external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-13 03:41:55 +00:00
Code Issues Releases Wiki Activity

revert tcp stat. need more refine. 0.9.182

Browse source
This commit is contained in:
winlin 2014-08-01 23:08:52 +08:00
parent f7fdbe6848
commit d5f03200a7
3 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
trunk/src/app/srs_app_server.cpp
View file

@ -90,7 +90,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// update network devices info interval: // update network devices info interval:
// SRS_SYS_CYCLE_INTERVAL * SRS_SYS_NETWORK_RTMP_SERVER_RESOLUTION_TIMES // SRS_SYS_CYCLE_INTERVAL * SRS_SYS_NETWORK_RTMP_SERVER_RESOLUTION_TIMES
#define SRS_SYS_NETWORK_RTMP_SERVER_RESOLUTION_TIMES 120 #define SRS_SYS_NETWORK_RTMP_SERVER_RESOLUTION_TIMES 90
SrsListener::SrsListener(SrsServer* server, SrsListenerType type) SrsListener::SrsListener(SrsServer* server, SrsListenerType type)
{ {

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

@ -833,18 +833,10 @@ void srs_update_rtmp_server(int nb_conn, SrsKbps* kbps)
int nb_conn_sys_other = 0; int nb_conn_sys_other = 0;
// @see: http://tester-higkoo.googlecode.com/svn-history/r14/trunk/Tools/iostat/iostat.c // @see: http://tester-higkoo.googlecode.com/svn-history/r14/trunk/Tools/iostat/iostat.c
for (int i = 0; fgets(buf, sizeof(buf), f); i++) { while (fgets(buf, sizeof(buf), f)) {
int st = 0; int st = 0;
int ret = sscanf(buf, "%*s %*s %*s %2x\n", &st); int ret = sscanf(buf, "%*s %*s %*s %2x\n", &st);
// there are maybe many many connections,
// for example, when srs used for monitor other process,
// like nginx, there are maybe many TIME_WAIT conections.
// we sleep 10ms when read 1000 records, so 1000ms for 10w connections.
if ((i % 1000) == 0) {
st_usleep(10 * 1000);
}
if (ret == 1) { if (ret == 1) {
if (st == SYS_TCP_ESTABLISHED) { if (st == SYS_TCP_ESTABLISHED) {
nb_conn_sys_established++; nb_conn_sys_established++;

2
trunk/src/core/srs_core.hpp
View file

@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// current release version // current release version
#define VERSION_MAJOR "0" #define VERSION_MAJOR "0"
#define VERSION_MINOR "9" #define VERSION_MINOR "9"
#define VERSION_REVISION "181" #define VERSION_REVISION "182"
#define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION #define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION
// server info. // server info.
#define RTMP_SIG_SRS_KEY "SRS" #define RTMP_SIG_SRS_KEY "SRS"