Skip to content

Commit 7dbac15

Browse files
winlinvipwinlinvip
committed
Threads-Hybrid: Add TODO as be thread-local
1 parent babe8e6 commit 7dbac15

16 files changed

+38
-22
lines changed

‎trunk/src/app/srs_app_config.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ extern std::string srs_config_bool2switch(std::string sbool);
139139
extern srs_error_t srs_config_transform_vhost(SrsConfDirective* root);
140140
extern srs_error_t srs_config_transform_vhost2(SrsConfDirective* root);
141141

142-
// @global config object.
142+
// TODO: FIXME: It should be thread-local or thread-safe.
143143
extern SrsConfig* _srs_config;
144144

145145
// The config directive.

‎trunk/src/app/srs_app_gb28181.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -501,7 +501,7 @@ class SrsGb28181StreamChannel
501501

502502
};
503503

504-
// Global singleton instance.
504+
// TODO: FIXME: It should be thread-local or thread-safe.
505505
extern SrsGb28181Manger* _srs_gb28181;
506506

507507
//gb28181 module management, management of all RTMP multiplexers,

‎trunk/src/app/srs_app_rtc_conn.hpp

+1
Original file line numberDiff line numberDiff line change
@@ -581,6 +581,7 @@ class ISrsRtcHijacker
581581
virtual srs_error_t on_start_consume(SrsRtcConnection* session, SrsRtcPlayStream* player, SrsRequest* req, SrsRtcConsumer* consumer) = 0;
582582
};
583583

584+
// TODO: FIXME: It should be thread-local or thread-safe.
584585
extern ISrsRtcHijacker* _srs_rtc_hijacker;
585586

586587
#endif

‎trunk/src/app/srs_app_rtc_dtls.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ class SrsDtlsCertificate
6363
bool is_ecdsa();
6464
};
6565

66-
// @global config object.
66+
// TODO: FIXME: It should be thread-local or thread-safe.
6767
extern SrsDtlsCertificate* _srs_rtc_dtls_certificate;
6868

6969
// @remark: play the role of DTLS_CLIENT, will send handshake

‎trunk/src/app/srs_app_rtc_server.cpp

+2-4
Original file line numberDiff line numberDiff line change
@@ -281,6 +281,7 @@ srs_error_t SrsRtcServer::initialize()
281281
_srs_hybrid->timer()->subscribe(5 * SRS_UTIME_SECONDS, this);
282282

283283
// Initialize the black hole.
284+
// TODO: FIXME: It should be thread-local or thread-safe.
284285
if ((err = _srs_blackhole->initialize()) != srs_success) {
285286
return srs_error_wrap(err, "black hole");
286287
}
@@ -733,10 +734,6 @@ srs_error_t RtcServerAdapter::initialize()
733734
{
734735
srs_error_t err = srs_success;
735736

736-
if ((err = _srs_rtc_dtls_certificate->initialize()) != srs_success) {
737-
return srs_error_wrap(err, "rtc dtls certificate initialize");
738-
}
739-
740737
if ((err = rtc->initialize()) != srs_success) {
741738
return srs_error_wrap(err, "rtc server initialize");
742739
}
@@ -752,6 +749,7 @@ srs_error_t RtcServerAdapter::run()
752749
return srs_error_wrap(err, "listen udp");
753750
}
754751

752+
// TODO: FIXME: It should be thread-local or thread-safe.
755753
if ((err = _srs_rtc_manager->start()) != srs_success) {
756754
return srs_error_wrap(err, "start manager");
757755
}

‎trunk/src/app/srs_app_rtc_server.hpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ class SrsRtcBlackhole
6060
void sendto(void* data, int len);
6161
};
6262

63+
// TODO: FIXME: It should be thread-local or thread-safe.
6364
extern SrsRtcBlackhole* _srs_blackhole;
6465

6566
// The handler for RTC server to call.
@@ -144,7 +145,7 @@ class RtcServerAdapter : public ISrsHybridServer
144145
virtual void stop();
145146
};
146147

147-
// Manager for RTC connections.
148+
// TODO: FIXME: It should be thread-local or thread-safe.
148149
extern SrsResourceManager* _srs_rtc_manager;
149150

150151
#endif

‎trunk/src/app/srs_app_rtc_source.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ class SrsRtcStreamManager
138138
virtual SrsRtcStream* fetch(SrsRequest* r);
139139
};
140140

141-
// Global singleton instance.
141+
// TODO: FIXME: It should be thread-local or thread-safe.
142142
extern SrsRtcStreamManager* _srs_rtc_sources;
143143

144144
// A publish stream interface, for source to callback with.

‎trunk/src/app/srs_app_server.cpp

+7-2
Original file line numberDiff line numberDiff line change
@@ -812,7 +812,8 @@ srs_error_t SrsServer::initialize(ISrsServerCycle* ch)
812812
// instead, subscribe handler in initialize method.
813813
srs_assert(_srs_config);
814814
_srs_config->subscribe(this);
815-
815+
816+
// TODO: FIXME: It should be thread-local or thread-safe.
816817
handler = ch;
817818
if(handler && (err = handler->initialize()) != srs_success){
818819
return srs_error_wrap(err, "handler initialize");
@@ -946,7 +947,6 @@ srs_error_t SrsServer::ingest()
946947
{
947948
srs_error_t err = srs_success;
948949

949-
// TODO: FIXME: Should move from hybrid to api threads.
950950
if ((err = ingester->start()) != srs_success) {
951951
return srs_error_wrap(err, "ingest start");
952952
}
@@ -1675,14 +1675,17 @@ srs_error_t SrsServerAdapter::run()
16751675
return srs_error_wrap(err, "server initialize");
16761676
}
16771677

1678+
// TODO: FIXME: It should be thread-local or thread-safe.
16781679
if ((err = srs->initialize_st()) != srs_success) {
16791680
return srs_error_wrap(err, "initialize st");
16801681
}
16811682

1683+
// TODO: FIXME: It should be thread-local or thread-safe.
16821684
if ((err = srs->acquire_pid_file()) != srs_success) {
16831685
return srs_error_wrap(err, "acquire pid file");
16841686
}
16851687

1688+
// TODO: FIXME: It should be thread-local or thread-safe.
16861689
if ((err = srs->initialize_signal()) != srs_success) {
16871690
return srs_error_wrap(err, "initialize signal");
16881691
}
@@ -1691,10 +1694,12 @@ srs_error_t SrsServerAdapter::run()
16911694
return srs_error_wrap(err, "listen");
16921695
}
16931696

1697+
// TODO: FIXME: It should be thread-local or thread-safe.
16941698
if ((err = srs->register_signal()) != srs_success) {
16951699
return srs_error_wrap(err, "register signal");
16961700
}
16971701

1702+
// TODO: FIXME: It should be thread-local or thread-safe.
16981703
if ((err = srs->ingest()) != srs_success) {
16991704
return srs_error_wrap(err, "ingest");
17001705
}

‎trunk/src/app/srs_app_source.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1684,7 +1684,7 @@ srs_error_t SrsMetaCache::update_vsh(SrsSharedPtrMessage* msg)
16841684
return vformat->on_video(msg);
16851685
}
16861686

1687-
SrsSourceManager* _srs_sources = new SrsSourceManager();
1687+
__thread SrsSourceManager* _srs_sources = NULL;
16881688

16891689
SrsSourceManager::SrsSourceManager()
16901690
{

‎trunk/src/app/srs_app_source.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -485,7 +485,7 @@ class SrsSourceManager : public ISrsHourGlass
485485
};
486486

487487
// Global singleton instance.
488-
extern SrsSourceManager* _srs_sources;
488+
extern __thread SrsSourceManager* _srs_sources;
489489

490490
// For two sources to bridge with each other.
491491
class ISrsSourceBridger

‎trunk/src/app/srs_app_threads.cpp

+9-1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
#include <srs_kernel_utility.hpp>
3131
#include <srs_app_utility.hpp>
3232
#include <srs_app_hybrid.hpp>
33+
#include <srs_app_source.hpp>
3334

3435
#include <unistd.h>
3536

@@ -509,16 +510,23 @@ srs_error_t SrsThreadPool::setup()
509510
// Create the hybrid RTMP/HTTP/RTC server.
510511
_srs_hybrid = new SrsHybridServer();
511512

513+
// Create the source manager for server.
514+
_srs_sources = new SrsSourceManager();
515+
512516
return err;
513517
}
514518

515519
srs_error_t SrsThreadPool::initialize()
516520
{
517521
srs_error_t err = srs_success;
518522

519-
// Initialize global shared SRTP once.
523+
// Initialize global shared thread-safe objects once.
520524
srs_assert(srtp_init() == 0);
521525

526+
if ((err = _srs_rtc_dtls_certificate->initialize()) != srs_success) {
527+
return srs_error_wrap(err, "rtc dtls certificate initialize");
528+
}
529+
522530
// Initialize the master primordial thread.
523531
SrsThreadEntry* entry = (SrsThreadEntry*)entry_;
524532
#ifndef SRS_OSX

‎trunk/src/app/srs_app_threads.hpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ class SrsThreadPool
362362
static void* start(void* arg);
363363
};
364364

365-
// The global thread pool.
365+
// TODO: FIXME: It should be thread-local or thread-safe.
366366
extern SrsThreadPool* _srs_thread_pool;
367367

368368
// Async file writer, it's thread safe.
@@ -426,7 +426,7 @@ class SrsAsyncLogManager
426426
srs_error_t do_start();
427427
};
428428

429-
// The global async log manager.
429+
// TODO: FIXME: It should be thread-local or thread-safe.
430430
extern SrsAsyncLogManager* _srs_async_log;
431431

432432
// The async SRTP codec.
@@ -527,7 +527,7 @@ class SrsAsyncSRTPManager
527527
virtual srs_error_t consume(SrsThreadEntry* entry, int* nn_consumed);
528528
};
529529

530-
// The global async SRTP manager.
530+
// TODO: FIXME: It should be thread-local or thread-safe.
531531
extern SrsAsyncSRTPManager* _srs_async_srtp;
532532

533533
// A thread-safe UDP listener.
@@ -608,7 +608,7 @@ class SrsAsyncRecvManager
608608
bool consume_by_tunnel(SrsUdpMuxSocket* skt);
609609
};
610610

611-
// The global async RECV manager.
611+
// TODO: FIXME: It should be thread-local or thread-safe.
612612
extern SrsAsyncRecvManager* _srs_async_recv;
613613

614614
// The async UDP packet.
@@ -651,7 +651,7 @@ class SrsAsyncSendManager
651651
srs_error_t do_start();
652652
};
653653

654-
// The global async SEND manager.
654+
// TODO: FIXME: It should be thread-local or thread-safe.
655655
extern SrsAsyncSendManager* _srs_async_send;
656656

657657
#endif

‎trunk/src/kernel/srs_kernel_kbps.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ class SrsWallClock
9292
virtual srs_utime_t now();
9393
};
9494

95-
// The global clock.
95+
// TODO: FIXME: It should be thread-local or thread-safe.
9696
extern SrsWallClock* _srs_clock;
9797

9898
#endif

‎trunk/src/kernel/srs_kernel_log.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,10 @@ class ISrsContext
9797
virtual const SrsContextId& set_id(const SrsContextId& v) = 0;
9898
};
9999

100-
// @global User must provides a log object
100+
// TODO: FIXME: It should be thread-local or thread-safe.
101101
extern ISrsLog* _srs_log;
102102

103-
// @global User must implements the LogContext and define a global instance.
103+
// TODO: FIXME: It should be thread-local or thread-safe.
104104
extern ISrsContext* _srs_context;
105105

106106
// Log style.

‎trunk/src/kernel/srs_kernel_rtc_rtp.hpp

+2
Original file line numberDiff line numberDiff line change
@@ -582,11 +582,13 @@ class SrsRtpFUAPayload2 : public ISrsRtpPayloader
582582
virtual ISrsRtpPayloader* copy();
583583
};
584584

585+
// TODO: FIXME: It should be thread-local or thread-safe.
585586
// For RTP packets cache.
586587
extern SrsRtpObjectCacheManager<SrsRtpPacket2>* _srs_rtp_cache;
587588
extern SrsRtpObjectCacheManager<SrsRtpRawPayload>* _srs_rtp_raw_cache;
588589
extern SrsRtpObjectCacheManager<SrsRtpFUAPayload2>* _srs_rtp_fua_cache;
589590

591+
// TODO: FIXME: It should be thread-local or thread-safe.
590592
// For shared message cache, with payload.
591593
extern SrsRtpObjectCacheManager<SrsSharedPtrMessage>* _srs_rtp_msg_cache_buffers;
592594
// For shared message cache, without payload.

‎trunk/src/main/srs_main_server.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ SrsConfig* _srs_config = new SrsConfig();
8181
// @global version of srs, which can grep keyword "XCORE"
8282
extern const char* _srs_version;
8383

84+
// TODO: FIXME: It should be thread-local or thread-safe.
8485
// @global main SRS server, for debugging
8586
SrsServer* _srs_server = NULL;
8687

0 commit comments

Comments
 (0)