Skip to content

Commit 963a0fa

Browse files
winlinvipwinlinvip
committed
Threads-Hybrid: Change pps stat to thread-local.
1 parent 9eb9b19 commit 963a0fa

15 files changed

+390
-200
lines changed

‎trunk/src/app/srs_app_conn.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ using namespace std;
3838

3939
#include <srs_protocol_kbps.hpp>
4040

41-
SrsPps* _srs_pps_ids = new SrsPps();
42-
SrsPps* _srs_pps_fids = new SrsPps();
43-
SrsPps* _srs_pps_fids_level0 = new SrsPps();
44-
SrsPps* _srs_pps_dispose = new SrsPps();
41+
__thread SrsPps* _srs_pps_ids = NULL;
42+
__thread SrsPps* _srs_pps_fids = NULL;
43+
__thread SrsPps* _srs_pps_fids_level0 = NULL;
44+
__thread SrsPps* _srs_pps_dispose = NULL;
4545

4646
ISrsDisposingHandler::ISrsDisposingHandler()
4747
{

‎trunk/src/app/srs_app_hourglass.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ using namespace std;
3131

3232
#include <srs_protocol_kbps.hpp>
3333

34-
SrsPps* _srs_pps_timer = new SrsPps();
34+
__thread SrsPps* _srs_pps_timer = NULL;
3535

3636
extern SrsPps* _srs_pps_clock_15ms;
3737
extern SrsPps* _srs_pps_clock_20ms;

‎trunk/src/app/srs_app_hybrid.cpp

+88-88
Original file line numberDiff line numberDiff line change
@@ -33,103 +33,103 @@
3333

3434
using namespace std;
3535

36-
extern SrsPps* _srs_pps_cids_get;
37-
extern SrsPps* _srs_pps_cids_set;
36+
extern __thread SrsPps* _srs_pps_cids_get;
37+
extern __thread SrsPps* _srs_pps_cids_set;
3838

39-
extern SrsPps* _srs_pps_timer;
40-
extern SrsPps* _srs_pps_pub;
41-
extern SrsPps* _srs_pps_conn;
42-
extern SrsPps* _srs_pps_dispose;
39+
extern __thread SrsPps* _srs_pps_timer;
40+
extern __thread SrsPps* _srs_pps_pub;
41+
extern __thread SrsPps* _srs_pps_conn;
42+
extern __thread SrsPps* _srs_pps_dispose;
4343

4444
#if defined(SRS_DEBUG) && defined(SRS_DEBUG_STATS)
45-
extern unsigned long long _st_stat_recvfrom;
46-
extern unsigned long long _st_stat_recvfrom_eagain;
47-
extern unsigned long long _st_stat_sendto;
48-
extern unsigned long long _st_stat_sendto_eagain;
49-
SrsPps* _srs_pps_recvfrom = new SrsPps();
50-
SrsPps* _srs_pps_recvfrom_eagain = new SrsPps();
51-
SrsPps* _srs_pps_sendto = new SrsPps();
52-
SrsPps* _srs_pps_sendto_eagain = new SrsPps();
53-
54-
extern unsigned long long _st_stat_read;
55-
extern unsigned long long _st_stat_read_eagain;
56-
extern unsigned long long _st_stat_readv;
57-
extern unsigned long long _st_stat_readv_eagain;
58-
extern unsigned long long _st_stat_writev;
59-
extern unsigned long long _st_stat_writev_eagain;
60-
SrsPps* _srs_pps_read = new SrsPps();
61-
SrsPps* _srs_pps_read_eagain = new SrsPps();
62-
SrsPps* _srs_pps_readv = new SrsPps();
63-
SrsPps* _srs_pps_readv_eagain = new SrsPps();
64-
SrsPps* _srs_pps_writev = new SrsPps();
65-
SrsPps* _srs_pps_writev_eagain = new SrsPps();
66-
67-
extern unsigned long long _st_stat_recvmsg;
68-
extern unsigned long long _st_stat_recvmsg_eagain;
69-
extern unsigned long long _st_stat_sendmsg;
70-
extern unsigned long long _st_stat_sendmsg_eagain;
71-
SrsPps* _srs_pps_recvmsg = new SrsPps();
72-
SrsPps* _srs_pps_recvmsg_eagain = new SrsPps();
73-
SrsPps* _srs_pps_sendmsg = new SrsPps();
74-
SrsPps* _srs_pps_sendmsg_eagain = new SrsPps();
75-
76-
extern unsigned long long _st_stat_epoll;
77-
extern unsigned long long _st_stat_epoll_zero;
78-
extern unsigned long long _st_stat_epoll_shake;
79-
extern unsigned long long _st_stat_epoll_spin;
80-
SrsPps* _srs_pps_epoll = new SrsPps();
81-
SrsPps* _srs_pps_epoll_zero = new SrsPps();
82-
SrsPps* _srs_pps_epoll_shake = new SrsPps();
83-
SrsPps* _srs_pps_epoll_spin = new SrsPps();
84-
85-
extern unsigned long long _st_stat_sched_15ms;
86-
extern unsigned long long _st_stat_sched_20ms;
87-
extern unsigned long long _st_stat_sched_25ms;
88-
extern unsigned long long _st_stat_sched_30ms;
89-
extern unsigned long long _st_stat_sched_35ms;
90-
extern unsigned long long _st_stat_sched_40ms;
91-
extern unsigned long long _st_stat_sched_80ms;
92-
extern unsigned long long _st_stat_sched_160ms;
93-
extern unsigned long long _st_stat_sched_s;
94-
SrsPps* _srs_pps_sched_15ms = new SrsPps();
95-
SrsPps* _srs_pps_sched_20ms = new SrsPps();
96-
SrsPps* _srs_pps_sched_25ms = new SrsPps();
97-
SrsPps* _srs_pps_sched_30ms = new SrsPps();
98-
SrsPps* _srs_pps_sched_35ms = new SrsPps();
99-
SrsPps* _srs_pps_sched_40ms = new SrsPps();
100-
SrsPps* _srs_pps_sched_80ms = new SrsPps();
101-
SrsPps* _srs_pps_sched_160ms = new SrsPps();
102-
SrsPps* _srs_pps_sched_s = new SrsPps();
45+
extern __thread unsigned long long _st_stat_recvfrom;
46+
extern __thread unsigned long long _st_stat_recvfrom_eagain;
47+
extern __thread unsigned long long _st_stat_sendto;
48+
extern __thread unsigned long long _st_stat_sendto_eagain;
49+
__thread SrsPps* _srs_pps_recvfrom = NULL;
50+
__thread SrsPps* _srs_pps_recvfrom_eagain = NULL;
51+
__thread SrsPps* _srs_pps_sendto = NULL;
52+
__thread SrsPps* _srs_pps_sendto_eagain = NULL;
53+
54+
extern __thread unsigned long long _st_stat_read;
55+
extern __thread unsigned long long _st_stat_read_eagain;
56+
extern __thread unsigned long long _st_stat_readv;
57+
extern __thread unsigned long long _st_stat_readv_eagain;
58+
extern __thread unsigned long long _st_stat_writev;
59+
extern __thread unsigned long long _st_stat_writev_eagain;
60+
__thread SrsPps* _srs_pps_read = NULL;
61+
__thread SrsPps* _srs_pps_read_eagain = NULL;
62+
__thread SrsPps* _srs_pps_readv = NULL;
63+
__thread SrsPps* _srs_pps_readv_eagain = NULL;
64+
__thread SrsPps* _srs_pps_writev = NULL;
65+
__thread SrsPps* _srs_pps_writev_eagain = NULL;
66+
67+
extern __thread unsigned long long _st_stat_recvmsg;
68+
extern __thread unsigned long long _st_stat_recvmsg_eagain;
69+
extern __thread unsigned long long _st_stat_sendmsg;
70+
extern __thread unsigned long long _st_stat_sendmsg_eagain;
71+
__thread SrsPps* _srs_pps_recvmsg = NULL;
72+
__thread SrsPps* _srs_pps_recvmsg_eagain = NULL;
73+
__thread SrsPps* _srs_pps_sendmsg = NULL;
74+
__thread SrsPps* _srs_pps_sendmsg_eagain = NULL;
75+
76+
extern __thread unsigned long long _st_stat_epoll;
77+
extern __thread unsigned long long _st_stat_epoll_zero;
78+
extern __thread unsigned long long _st_stat_epoll_shake;
79+
extern __thread unsigned long long _st_stat_epoll_spin;
80+
__thread SrsPps* _srs_pps_epoll = NULL;
81+
__thread SrsPps* _srs_pps_epoll_zero = NULL;
82+
__thread SrsPps* _srs_pps_epoll_shake = NULL;
83+
__thread SrsPps* _srs_pps_epoll_spin = NULL;
84+
85+
extern __thread unsigned long long _st_stat_sched_15ms;
86+
extern __thread unsigned long long _st_stat_sched_20ms;
87+
extern __thread unsigned long long _st_stat_sched_25ms;
88+
extern __thread unsigned long long _st_stat_sched_30ms;
89+
extern __thread unsigned long long _st_stat_sched_35ms;
90+
extern __thread unsigned long long _st_stat_sched_40ms;
91+
extern __thread unsigned long long _st_stat_sched_80ms;
92+
extern __thread unsigned long long _st_stat_sched_160ms;
93+
extern __thread unsigned long long _st_stat_sched_s;
94+
__thread SrsPps* _srs_pps_sched_15ms = NULL;
95+
__thread SrsPps* _srs_pps_sched_20ms = NULL;
96+
__thread SrsPps* _srs_pps_sched_25ms = NULL;
97+
__thread SrsPps* _srs_pps_sched_30ms = NULL;
98+
__thread SrsPps* _srs_pps_sched_35ms = NULL;
99+
__thread SrsPps* _srs_pps_sched_40ms = NULL;
100+
__thread SrsPps* _srs_pps_sched_80ms = NULL;
101+
__thread SrsPps* _srs_pps_sched_160ms = NULL;
102+
__thread SrsPps* _srs_pps_sched_s = NULL;
103103
#endif
104104

105-
SrsPps* _srs_pps_clock_15ms = new SrsPps();
106-
SrsPps* _srs_pps_clock_20ms = new SrsPps();
107-
SrsPps* _srs_pps_clock_25ms = new SrsPps();
108-
SrsPps* _srs_pps_clock_30ms = new SrsPps();
109-
SrsPps* _srs_pps_clock_35ms = new SrsPps();
110-
SrsPps* _srs_pps_clock_40ms = new SrsPps();
111-
SrsPps* _srs_pps_clock_80ms = new SrsPps();
112-
SrsPps* _srs_pps_clock_160ms = new SrsPps();
113-
SrsPps* _srs_pps_timer_s = new SrsPps();
105+
__thread SrsPps* _srs_pps_clock_15ms = NULL;
106+
__thread SrsPps* _srs_pps_clock_20ms = NULL;
107+
__thread SrsPps* _srs_pps_clock_25ms = NULL;
108+
__thread SrsPps* _srs_pps_clock_30ms = NULL;
109+
__thread SrsPps* _srs_pps_clock_35ms = NULL;
110+
__thread SrsPps* _srs_pps_clock_40ms = NULL;
111+
__thread SrsPps* _srs_pps_clock_80ms = NULL;
112+
__thread SrsPps* _srs_pps_clock_160ms = NULL;
113+
__thread SrsPps* _srs_pps_timer_s = NULL;
114114

115115
#if defined(SRS_DEBUG) && defined(SRS_DEBUG_STATS)
116-
extern int _st_active_count;
117-
extern unsigned long long _st_stat_thread_run;
118-
extern unsigned long long _st_stat_thread_idle;
119-
extern unsigned long long _st_stat_thread_yield;
120-
extern unsigned long long _st_stat_thread_yield2;
121-
SrsPps* _srs_pps_thread_run = new SrsPps();
122-
SrsPps* _srs_pps_thread_idle = new SrsPps();
123-
SrsPps* _srs_pps_thread_yield = new SrsPps();
124-
SrsPps* _srs_pps_thread_yield2 = new SrsPps();
116+
extern __thread int _st_active_count;
117+
extern __thread unsigned long long _st_stat_thread_run;
118+
extern __thread unsigned long long _st_stat_thread_idle;
119+
extern __thread unsigned long long _st_stat_thread_yield;
120+
extern __thread unsigned long long _st_stat_thread_yield2;
121+
__thread SrsPps* _srs_pps_thread_run = NULL;
122+
__thread SrsPps* _srs_pps_thread_idle = NULL;
123+
__thread SrsPps* _srs_pps_thread_yield = NULL;
124+
__thread SrsPps* _srs_pps_thread_yield2 = NULL;
125125
#endif
126126

127-
extern SrsPps* _srs_pps_objs_rtps;
128-
extern SrsPps* _srs_pps_objs_rraw;
129-
extern SrsPps* _srs_pps_objs_rfua;
130-
extern SrsPps* _srs_pps_objs_rbuf;
131-
extern SrsPps* _srs_pps_objs_msgs;
132-
extern SrsPps* _srs_pps_objs_rothers;
127+
extern __thread SrsPps* _srs_pps_objs_rtps;
128+
extern __thread SrsPps* _srs_pps_objs_rraw;
129+
extern __thread SrsPps* _srs_pps_objs_rfua;
130+
extern __thread SrsPps* _srs_pps_objs_rbuf;
131+
extern __thread SrsPps* _srs_pps_objs_msgs;
132+
extern __thread SrsPps* _srs_pps_objs_rothers;
133133

134134
ISrsHybridServer::ISrsHybridServer()
135135
{

‎trunk/src/app/srs_app_listener.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,11 @@ using namespace std;
4747

4848
#include <srs_protocol_kbps.hpp>
4949

50-
SrsPps* _srs_pps_rpkts = new SrsPps();
51-
SrsPps* _srs_pps_addrs = new SrsPps();
52-
SrsPps* _srs_pps_fast_addrs = new SrsPps();
50+
__thread SrsPps* _srs_pps_rpkts = NULL;
51+
__thread SrsPps* _srs_pps_addrs = NULL;
52+
__thread SrsPps* _srs_pps_fast_addrs = NULL;
5353

54-
SrsPps* _srs_pps_spkts = new SrsPps();
54+
__thread SrsPps* _srs_pps_spkts = NULL;
5555

5656
// set the max packet size.
5757
const int SRS_UDP_MAX_PACKET_SIZE = 1500;

‎trunk/src/app/srs_app_rtc_conn.cpp

+16-16
Original file line numberDiff line numberDiff line change
@@ -61,22 +61,22 @@ using namespace std;
6161

6262
#include <srs_protocol_kbps.hpp>
6363

64-
SrsPps* _srs_pps_sstuns = new SrsPps();
65-
SrsPps* _srs_pps_srtcps = new SrsPps();
66-
SrsPps* _srs_pps_srtps = new SrsPps();
67-
68-
SrsPps* _srs_pps_pli = new SrsPps();
69-
SrsPps* _srs_pps_twcc = new SrsPps();
70-
SrsPps* _srs_pps_rr = new SrsPps();
71-
SrsPps* _srs_pps_pub = new SrsPps();
72-
SrsPps* _srs_pps_conn = new SrsPps();
73-
74-
extern SrsPps* _srs_pps_snack;
75-
extern SrsPps* _srs_pps_snack2;
76-
77-
extern SrsPps* _srs_pps_rnack;
78-
extern SrsPps* _srs_pps_rnack2;
79-
extern SrsPps* _srs_pps_snack4;
64+
__thread SrsPps* _srs_pps_sstuns = NULL;
65+
__thread SrsPps* _srs_pps_srtcps = NULL;
66+
__thread SrsPps* _srs_pps_srtps = NULL;
67+
68+
__thread SrsPps* _srs_pps_pli = NULL;
69+
__thread SrsPps* _srs_pps_twcc = NULL;
70+
__thread SrsPps* _srs_pps_rr = NULL;
71+
__thread SrsPps* _srs_pps_pub = NULL;
72+
__thread SrsPps* _srs_pps_conn = NULL;
73+
74+
extern __thread SrsPps* _srs_pps_snack;
75+
extern __thread SrsPps* _srs_pps_snack2;
76+
77+
extern __thread SrsPps* _srs_pps_rnack;
78+
extern __thread SrsPps* _srs_pps_rnack2;
79+
extern __thread SrsPps* _srs_pps_snack4;
8080

8181
#define SRS_TICKID_RTCP 0
8282
#define SRS_TICKID_TWCC 1

‎trunk/src/app/srs_app_rtc_queue.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ using namespace std;
3737

3838
#include <srs_protocol_kbps.hpp>
3939

40-
extern SrsPps* _srs_pps_snack3;
41-
extern SrsPps* _srs_pps_snack4;
40+
extern __thread SrsPps* _srs_pps_snack3;
41+
extern __thread SrsPps* _srs_pps_snack4;
4242

4343
SrsRtpRingBuffer::SrsRtpRingBuffer(int capacity)
4444
{

‎trunk/src/app/srs_app_rtc_server.cpp

+36-36
Original file line numberDiff line numberDiff line change
@@ -45,42 +45,42 @@ using namespace std;
4545
#include <srs_app_rtc_api.hpp>
4646
#include <srs_protocol_utility.hpp>
4747

48-
extern SrsPps* _srs_pps_rpkts;
49-
SrsPps* _srs_pps_rstuns = new SrsPps();
50-
SrsPps* _srs_pps_rrtps = new SrsPps();
51-
SrsPps* _srs_pps_rrtcps = new SrsPps();
52-
extern SrsPps* _srs_pps_addrs;
53-
extern SrsPps* _srs_pps_fast_addrs;
54-
55-
extern SrsPps* _srs_pps_spkts;
56-
extern SrsPps* _srs_pps_sstuns;
57-
extern SrsPps* _srs_pps_srtcps;
58-
extern SrsPps* _srs_pps_srtps;
59-
60-
extern SrsPps* _srs_pps_ids;
61-
extern SrsPps* _srs_pps_fids;
62-
extern SrsPps* _srs_pps_fids_level0;
63-
64-
extern SrsPps* _srs_pps_pli;
65-
extern SrsPps* _srs_pps_twcc;
66-
extern SrsPps* _srs_pps_rr;
67-
68-
extern SrsPps* _srs_pps_snack;
69-
extern SrsPps* _srs_pps_snack2;
70-
extern SrsPps* _srs_pps_snack3;
71-
extern SrsPps* _srs_pps_snack4;
72-
extern SrsPps* _srs_pps_sanack;
73-
extern SrsPps* _srs_pps_svnack;
74-
75-
extern SrsPps* _srs_pps_rnack;
76-
extern SrsPps* _srs_pps_rnack2;
77-
extern SrsPps* _srs_pps_rhnack;
78-
extern SrsPps* _srs_pps_rmnack;
79-
80-
extern SrsPps* _srs_pps_rloss;
81-
extern SrsPps* _srs_pps_sloss;
82-
extern SrsPps* _srs_pps_aloss;
83-
extern SrsPps* _srs_pps_aloss2;
48+
extern __thread SrsPps* _srs_pps_rpkts;
49+
__thread SrsPps* _srs_pps_rstuns = NULL;
50+
__thread SrsPps* _srs_pps_rrtps = NULL;
51+
__thread SrsPps* _srs_pps_rrtcps = NULL;
52+
extern __thread SrsPps* _srs_pps_addrs;
53+
extern __thread SrsPps* _srs_pps_fast_addrs;
54+
55+
extern __thread SrsPps* _srs_pps_spkts;
56+
extern __thread SrsPps* _srs_pps_sstuns;
57+
extern __thread SrsPps* _srs_pps_srtcps;
58+
extern __thread SrsPps* _srs_pps_srtps;
59+
60+
extern __thread SrsPps* _srs_pps_ids;
61+
extern __thread SrsPps* _srs_pps_fids;
62+
extern __thread SrsPps* _srs_pps_fids_level0;
63+
64+
extern __thread SrsPps* _srs_pps_pli;
65+
extern __thread SrsPps* _srs_pps_twcc;
66+
extern __thread SrsPps* _srs_pps_rr;
67+
68+
extern __thread SrsPps* _srs_pps_snack;
69+
extern __thread SrsPps* _srs_pps_snack2;
70+
extern __thread SrsPps* _srs_pps_snack3;
71+
extern __thread SrsPps* _srs_pps_snack4;
72+
extern __thread SrsPps* _srs_pps_sanack;
73+
extern __thread SrsPps* _srs_pps_svnack;
74+
75+
extern __thread SrsPps* _srs_pps_rnack;
76+
extern __thread SrsPps* _srs_pps_rnack2;
77+
extern __thread SrsPps* _srs_pps_rhnack;
78+
extern __thread SrsPps* _srs_pps_rmnack;
79+
80+
extern __thread SrsPps* _srs_pps_rloss;
81+
extern __thread SrsPps* _srs_pps_sloss;
82+
extern __thread SrsPps* _srs_pps_aloss;
83+
extern __thread SrsPps* _srs_pps_aloss2;
8484

8585
SrsRtcBlackhole::SrsRtcBlackhole()
8686
{

‎trunk/src/app/srs_app_rtc_source.cpp

+13-13
Original file line numberDiff line numberDiff line change
@@ -52,19 +52,19 @@
5252
#include <srs_protocol_kbps.hpp>
5353

5454
// The NACK sent by us(SFU).
55-
SrsPps* _srs_pps_snack = new SrsPps();
56-
SrsPps* _srs_pps_snack2 = new SrsPps();
57-
SrsPps* _srs_pps_snack3 = new SrsPps();
58-
SrsPps* _srs_pps_snack4 = new SrsPps();
59-
SrsPps* _srs_pps_sanack = new SrsPps();
60-
SrsPps* _srs_pps_svnack = new SrsPps();
61-
62-
SrsPps* _srs_pps_rnack = new SrsPps();
63-
SrsPps* _srs_pps_rnack2 = new SrsPps();
64-
SrsPps* _srs_pps_rhnack = new SrsPps();
65-
SrsPps* _srs_pps_rmnack = new SrsPps();
66-
67-
extern SrsPps* _srs_pps_aloss2;
55+
__thread SrsPps* _srs_pps_snack = NULL;
56+
__thread SrsPps* _srs_pps_snack2 = NULL;
57+
__thread SrsPps* _srs_pps_snack3 = NULL;
58+
__thread SrsPps* _srs_pps_snack4 = NULL;
59+
__thread SrsPps* _srs_pps_sanack = NULL;
60+
__thread SrsPps* _srs_pps_svnack = NULL;
61+
62+
__thread SrsPps* _srs_pps_rnack = NULL;
63+
__thread SrsPps* _srs_pps_rnack2 = NULL;
64+
__thread SrsPps* _srs_pps_rhnack = NULL;
65+
__thread SrsPps* _srs_pps_rmnack = NULL;
66+
67+
extern __thread SrsPps* _srs_pps_aloss2;
6868

6969
// Firefox defaults as 109, Chrome is 111.
7070
const int kAudioPayloadType = 111;

0 commit comments

Comments
 (0)