lock should be global
This commit is contained in:
parent
271c02c2c1
commit
6a60a997ef
|
@ -54,10 +54,10 @@ JSGlobalContextRef RealmReactGetJSGlobalContextForExecutor(id executor, bool cre
|
||||||
@interface RealmReact () {
|
@interface RealmReact () {
|
||||||
GCDWebServer *_webServer;
|
GCDWebServer *_webServer;
|
||||||
std::unique_ptr<realm_js::RPCServer> _rpcServer;
|
std::unique_ptr<realm_js::RPCServer> _rpcServer;
|
||||||
std::mutex _rpcMutex;
|
|
||||||
}
|
}
|
||||||
@end
|
@end
|
||||||
|
|
||||||
|
static std::mutex s_rpcMutex;
|
||||||
static __weak RealmReact *s_currentRealmModule = nil;
|
static __weak RealmReact *s_currentRealmModule = nil;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -86,7 +86,7 @@ static __weak RealmReact *s_currentRealmModule = nil;
|
||||||
|
|
||||||
#if DEBUG
|
#if DEBUG
|
||||||
- (void)startRPC {
|
- (void)startRPC {
|
||||||
std::lock_guard<std::mutex> lock(_rpcMutex);
|
std::lock_guard<std::mutex> lock(s_rpcMutex);
|
||||||
|
|
||||||
[GCDWebServer setLogLevel:3];
|
[GCDWebServer setLogLevel:3];
|
||||||
_webServer = [[GCDWebServer alloc] init];
|
_webServer = [[GCDWebServer alloc] init];
|
||||||
|
@ -104,7 +104,7 @@ static __weak RealmReact *s_currentRealmModule = nil;
|
||||||
dispatch_sync(dispatch_get_main_queue(), ^{
|
dispatch_sync(dispatch_get_main_queue(), ^{
|
||||||
RealmReact *self = weakSelf;
|
RealmReact *self = weakSelf;
|
||||||
if (self) {
|
if (self) {
|
||||||
std::lock_guard<std::mutex> lock(_rpcMutex);
|
std::lock_guard<std::mutex> lock(s_rpcMutex);
|
||||||
if (_rpcServer) {
|
if (_rpcServer) {
|
||||||
realm_js::json args = realm_js::json::parse([[(GCDWebServerDataRequest *)request text] UTF8String]);
|
realm_js::json args = realm_js::json::parse([[(GCDWebServerDataRequest *)request text] UTF8String]);
|
||||||
std::string responseText = _rpcServer->perform_request(request.path.UTF8String, args).dump();
|
std::string responseText = _rpcServer->perform_request(request.path.UTF8String, args).dump();
|
||||||
|
@ -133,7 +133,7 @@ static __weak RealmReact *s_currentRealmModule = nil;
|
||||||
}
|
}
|
||||||
|
|
||||||
- (void)shutdownRPC {
|
- (void)shutdownRPC {
|
||||||
std::lock_guard<std::mutex> lock(_rpcMutex);
|
std::lock_guard<std::mutex> lock(s_rpcMutex);
|
||||||
[_webServer stop];
|
[_webServer stop];
|
||||||
[_webServer removeAllHandlers];
|
[_webServer removeAllHandlers];
|
||||||
_webServer = nil;
|
_webServer = nil;
|
||||||
|
|
Loading…
Reference in New Issue