Skip to content

Commit 9404a56

Browse files
winlinvipwinlinvip
committed
ST: Support thread-local state-threads
commit 755c3b227d3207458c251156cc9bf14df9da13fc Author: winlin <[email protected]> Date: Tue Apr 6 19:46:33 2021 +0800 ST: Change global stat variables to thread-local. commit 2307a511567cbad01c232f0afdd3c283656aee78 Author: winlin <[email protected]> Date: Tue Apr 6 15:21:14 2021 +0800 ST: Support thread-local ST, fix bug. commit a385d361a654acd9e477ec5eef53d0eae975a63a Author: winlin <[email protected]> Date: Mon Apr 5 12:37:53 2021 +0800 ST: Change ST to thread-local 1. All statick and global variables is thread-local. 2. Call st_init() to init st for each thread. 3. Notice that ST is isolate for threads.
1 parent b1bc4dd commit 9404a56

File tree

6 files changed

+60
-54
lines changed

6 files changed

+60
-54
lines changed

‎trunk/3rdparty/st-srs/common.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -264,9 +264,9 @@ typedef struct _st_netfd {
264264
* Current vp, thread, and event system
265265
*/
266266

267-
extern _st_vp_t _st_this_vp;
268-
extern _st_thread_t *_st_this_thread;
269-
extern _st_eventsys_t *_st_eventsys;
267+
extern __thread _st_vp_t _st_this_vp;
268+
extern __thread _st_thread_t *_st_this_thread;
269+
extern __thread _st_eventsys_t *_st_eventsys;
270270

271271
#define _ST_CURRENT_THREAD() (_st_this_thread)
272272
#define _ST_SET_CURRENT_THREAD(_thread) (_st_this_thread = (_thread))

‎trunk/3rdparty/st-srs/event.c

+7-7
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@
4949

5050
// Global stat.
5151
#if defined(DEBUG) && defined(DEBUG_STATS)
52-
unsigned long long _st_stat_epoll = 0;
53-
unsigned long long _st_stat_epoll_zero = 0;
54-
unsigned long long _st_stat_epoll_shake = 0;
55-
unsigned long long _st_stat_epoll_spin = 0;
52+
__thread unsigned long long _st_stat_epoll = 0;
53+
__thread unsigned long long _st_stat_epoll_zero = 0;
54+
__thread unsigned long long _st_stat_epoll_shake = 0;
55+
__thread unsigned long long _st_stat_epoll_spin = 0;
5656
#endif
5757

5858
#if !defined(MD_HAVE_KQUEUE) && !defined(MD_HAVE_EPOLL)
@@ -67,7 +67,7 @@ typedef struct _kq_fd_data {
6767
int revents;
6868
} _kq_fd_data_t;
6969

70-
static struct _st_kqdata {
70+
static __thread struct _st_kqdata {
7171
_kq_fd_data_t *fd_data;
7272
struct kevent *evtlist;
7373
struct kevent *addlist;
@@ -99,7 +99,7 @@ typedef struct _epoll_fd_data {
9999
int revents;
100100
} _epoll_fd_data_t;
101101

102-
static struct _st_epolldata {
102+
static __thread struct _st_epolldata {
103103
_epoll_fd_data_t *fd_data;
104104
struct epoll_event *evtlist;
105105
int fd_data_size;
@@ -127,7 +127,7 @@ static struct _st_epolldata {
127127

128128
#endif /* MD_HAVE_EPOLL */
129129

130-
_st_eventsys_t *_st_eventsys = NULL;
130+
__thread _st_eventsys_t *_st_eventsys = NULL;
131131

132132

133133
#ifdef MD_HAVE_KQUEUE

‎trunk/3rdparty/st-srs/io.c

+15-15
Original file line numberDiff line numberDiff line change
@@ -54,20 +54,20 @@
5454

5555
// Global stat.
5656
#if defined(DEBUG) && defined(DEBUG_STATS)
57-
unsigned long long _st_stat_recvfrom = 0;
58-
unsigned long long _st_stat_recvfrom_eagain = 0;
59-
unsigned long long _st_stat_sendto = 0;
60-
unsigned long long _st_stat_sendto_eagain = 0;
61-
unsigned long long _st_stat_read = 0;
62-
unsigned long long _st_stat_read_eagain = 0;
63-
unsigned long long _st_stat_readv = 0;
64-
unsigned long long _st_stat_readv_eagain = 0;
65-
unsigned long long _st_stat_writev = 0;
66-
unsigned long long _st_stat_writev_eagain = 0;
67-
unsigned long long _st_stat_recvmsg = 0;
68-
unsigned long long _st_stat_recvmsg_eagain = 0;
69-
unsigned long long _st_stat_sendmsg = 0;
70-
unsigned long long _st_stat_sendmsg_eagain = 0;
57+
__thread unsigned long long _st_stat_recvfrom = 0;
58+
__thread unsigned long long _st_stat_recvfrom_eagain = 0;
59+
__thread unsigned long long _st_stat_sendto = 0;
60+
__thread unsigned long long _st_stat_sendto_eagain = 0;
61+
__thread unsigned long long _st_stat_read = 0;
62+
__thread unsigned long long _st_stat_read_eagain = 0;
63+
__thread unsigned long long _st_stat_readv = 0;
64+
__thread unsigned long long _st_stat_readv_eagain = 0;
65+
__thread unsigned long long _st_stat_writev = 0;
66+
__thread unsigned long long _st_stat_writev_eagain = 0;
67+
__thread unsigned long long _st_stat_recvmsg = 0;
68+
__thread unsigned long long _st_stat_recvmsg_eagain = 0;
69+
__thread unsigned long long _st_stat_sendmsg = 0;
70+
__thread unsigned long long _st_stat_sendmsg_eagain = 0;
7171
#endif
7272

7373
#if EAGAIN != EWOULDBLOCK
@@ -79,7 +79,7 @@ unsigned long long _st_stat_sendmsg_eagain = 0;
7979
#define _LOCAL_MAXIOV 16
8080

8181
/* File descriptor object free list */
82-
static _st_netfd_t *_st_netfd_freelist = NULL;
82+
static __thread _st_netfd_t *_st_netfd_freelist = NULL;
8383
/* Maximum number of file descriptors that the process can open */
8484
static int _st_osfd_limit = -1;
8585

‎trunk/3rdparty/st-srs/sched.c

+29-23
Original file line numberDiff line numberDiff line change
@@ -54,31 +54,33 @@
5454

5555
// Global stat.
5656
#if defined(DEBUG) && defined(DEBUG_STATS)
57-
unsigned long long _st_stat_sched_15ms = 0;
58-
unsigned long long _st_stat_sched_20ms = 0;
59-
unsigned long long _st_stat_sched_25ms = 0;
60-
unsigned long long _st_stat_sched_30ms = 0;
61-
unsigned long long _st_stat_sched_35ms = 0;
62-
unsigned long long _st_stat_sched_40ms = 0;
63-
unsigned long long _st_stat_sched_80ms = 0;
64-
unsigned long long _st_stat_sched_160ms = 0;
65-
unsigned long long _st_stat_sched_s = 0;
66-
67-
unsigned long long _st_stat_thread_run = 0;
68-
unsigned long long _st_stat_thread_idle = 0;
69-
unsigned long long _st_stat_thread_yield = 0;
70-
unsigned long long _st_stat_thread_yield2 = 0;
57+
__thread unsigned long long _st_stat_sched_15ms = 0;
58+
__thread unsigned long long _st_stat_sched_20ms = 0;
59+
__thread unsigned long long _st_stat_sched_25ms = 0;
60+
__thread unsigned long long _st_stat_sched_30ms = 0;
61+
__thread unsigned long long _st_stat_sched_35ms = 0;
62+
__thread unsigned long long _st_stat_sched_40ms = 0;
63+
__thread unsigned long long _st_stat_sched_80ms = 0;
64+
__thread unsigned long long _st_stat_sched_160ms = 0;
65+
__thread unsigned long long _st_stat_sched_s = 0;
66+
67+
__thread unsigned long long _st_stat_thread_run = 0;
68+
__thread unsigned long long _st_stat_thread_idle = 0;
69+
__thread unsigned long long _st_stat_thread_yield = 0;
70+
__thread unsigned long long _st_stat_thread_yield2 = 0;
7171
#endif
7272

7373

7474
/* Global data */
75-
_st_vp_t _st_this_vp; /* This VP */
76-
_st_thread_t *_st_this_thread; /* Current thread */
77-
int _st_active_count = 0; /* Active thread count */
75+
__thread _st_vp_t _st_this_vp; /* This VP */
76+
__thread _st_thread_t *_st_this_thread; /* Current thread */
77+
__thread int _st_active_count = 0; /* Active thread count */
7878

79-
time_t _st_curr_time = 0; /* Current time as returned by time(2) */
80-
st_utime_t _st_last_tset; /* Last time it was fetched */
79+
__thread time_t _st_curr_time = 0; /* Current time as returned by time(2) */
80+
__thread st_utime_t _st_last_tset; /* Last time it was fetched */
8181

82+
// We should initialize the thread-local variable in st_init().
83+
extern __thread _st_clist_t _st_free_stacks;
8284

8385
int st_poll(struct pollfd *pds, int npds, st_utime_t timeout)
8486
{
@@ -165,7 +167,7 @@ void _st_vp_schedule(void)
165167
int st_init(void)
166168
{
167169
_st_thread_t *thread;
168-
170+
169171
if (_st_active_count) {
170172
/* Already initialized */
171173
return 0;
@@ -176,7 +178,11 @@ int st_init(void)
176178

177179
if (_st_io_init() < 0)
178180
return -1;
179-
181+
182+
// Initialize the thread-local variables.
183+
ST_INIT_CLIST(&_st_free_stacks);
184+
185+
// Initialize ST.
180186
memset(&_st_this_vp, 0, sizeof(_st_vp_t));
181187

182188
ST_INIT_CLIST(&_ST_RUNQ);
@@ -711,8 +717,8 @@ int _st_iterate_threads_flag = 0;
711717

712718
void _st_iterate_threads(void)
713719
{
714-
static _st_thread_t *thread = NULL;
715-
static jmp_buf orig_jb, save_jb;
720+
static __thread _st_thread_t *thread = NULL;
721+
static __thread jmp_buf orig_jb, save_jb;
716722
_st_clist_t *q;
717723

718724
if (!_st_iterate_threads_flag) {

‎trunk/3rdparty/st-srs/stk.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@
5050
/* How much space to leave between the stacks, at each end */
5151
#define REDZONE _ST_PAGE_SIZE
5252

53-
_st_clist_t _st_free_stacks = ST_INIT_STATIC_CLIST(&_st_free_stacks);
54-
int _st_num_free_stacks = 0;
55-
int _st_randomize_stacks = 0;
53+
__thread _st_clist_t _st_free_stacks;
54+
__thread int _st_num_free_stacks = 0;
55+
__thread int _st_randomize_stacks = 0;
5656

5757
static char *_st_new_stk_segment(int size);
5858

‎trunk/3rdparty/st-srs/sync.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@
4545
#include "common.h"
4646

4747

48-
extern time_t _st_curr_time;
49-
extern st_utime_t _st_last_tset;
50-
extern int _st_active_count;
48+
extern __thread time_t _st_curr_time;
49+
extern __thread st_utime_t _st_last_tset;
50+
extern __thread int _st_active_count;
5151

5252
static st_utime_t (*_st_utime)(void) = NULL;
5353

0 commit comments

Comments
 (0)