Create shared memory in LOCAL namespace;

increase open websocket timeout to 30 sec;
fix unregistor dealock

Author: kzhdev

dependencies/slicksocket/lib/Debug/websockets.pdb

@@ -8,7 +8,7 @@
 
 #include "websocket.h"
 
-#define SHM_OWNER TEXT("Global\\ZorroWebsocketProxy_shm_owner")
+#define SHM_OWNER TEXT("Local\\ZorroWebsocketProxy_shm_owner")
 
 using namespace zorro::websocket;
 
@@ -208,16 +208,14 @@ void ZorroWebsocketProxy::handleClientMessage(Message& msg) {
     case Message::Type::Subscribe:
         handleSubscribe(msg);
         break;
-
     case Message::Type::Unsubscribe:
         handleUnsubscribe(msg);
         break;
-
     case Message::Type::WsData:
     case Message::Type::WsError:
         break;
     default:
-        lwsl_user("Unknown msg, type=\n", msg.type);
+        lwsl_user("Unknown msg, type=%d\n", msg.type);
         break;
     }
 }

zorro_websocket_proxy/src/zorro_websocket_proxy.cpp

@@ -7,8 +7,8 @@
 namespace zorro {
 namespace websocket {
 
-#define CLIENT_TO_SERVER_QUEUE "Global\\ZorroWebsocketProxy_client_server"
-#define SERVER_TO_CLIENT_QUEUE "Global\\ZorroWebsocketProxy_server_client"
+#define CLIENT_TO_SERVER_QUEUE "Local\\ZorroWebsocketProxy_client_server"
+#define SERVER_TO_CLIENT_QUEUE "Local\\ZorroWebsocketProxy_server_client"
 #define HEARTBEAT_INTERVAL 500  // 500ms
 #define HEARTBEAT_TIMEOUT 15000 // 15s
 

zorro_websocket_proxy_client/include/types.h

@@ -104,7 +104,7 @@ namespace websocket {
         uint32_t id_ = 0;
         const DWORD pid_;
         std::atomic<DWORD> server_pid_ = 0;
-        std::atomic_bool run_{ false };
+        std::shared_ptr<std::atomic_bool> run_;
         std::string name_;
         std::unordered_set<uint32_t> websockets_;
         std::unique_ptr<std::thread> worker_thread_;

zorro_websocket_proxy_client/include/zorro_websocket_proxy_client.h

@@ -25,7 +25,7 @@ ZorroWebsocketProxyClient::ZorroWebsocketProxyClient(WebsocketProxyCallback* cal
 
 ZorroWebsocketProxyClient::~ZorroWebsocketProxyClient() {
     if (server_pid_.load(std::memory_order_relaxed)) {
-        unregister();
+        unregister(true);
     }
 }
 
@@ -145,15 +145,20 @@ void ZorroWebsocketProxyClient::unregister(bool destroying) {
     sendMessage(msg, index, size);
     server_pid_.store(0, std::memory_order_release);
     log_(L_INFO, "Unregistered, pid=" + std::to_string(pid_));
-    run_.store(false, std::memory_order_release);
     if (worker_thread_ && worker_thread_->joinable()) {
+        run_->store(false, std::memory_order_release);
         if (destroying) {
 #ifdef _WIN32
             worker_thread_->detach();
             return;
 #endif // _WIN32
         }
+//#ifdef _WIN32
+        //worker_thread_->detach();
+//#else
         worker_thread_->join();
+//#endif
+        run_.reset();
         worker_thread_.reset();
     }
 }
@@ -178,8 +183,8 @@ std::pair<uint32_t, bool> ZorroWebsocketProxyClient::openWebSocket(const std::st
 
     sendMessage(msg, index, size);
 
-    if (!waitForResponse(msg)) {
-        log_(L_DEBUG, "oepn ws timedout");
+    if (!waitForResponse(msg, 30000)) {
+        log_(L_DEBUG, "open ws timedout");
         return std::make_pair(0, false);
     }
 
@@ -248,8 +253,9 @@ void ZorroWebsocketProxyClient::send(uint32_t id, const char* data, size_t len)
 }
 
 void ZorroWebsocketProxyClient::doWork() {
-    run_.store(true, std::memory_order_release);
-    while (run_.load(std::memory_order_relaxed)) {
+    run_ = std::make_shared<std::atomic_bool>(true);
+    std::shared_ptr<std::atomic_bool> run = run_;
+    while (run->load(std::memory_order_relaxed)) {
         auto server_pid = server_pid_.load(std::memory_order_relaxed);
         if (!server_pid) {
             // not connected yet
@@ -259,7 +265,7 @@ void ZorroWebsocketProxyClient::doWork() {
         auto now = get_timestamp();
         auto result = server_queue_->read(server_queue_index_);
         if (result.first) {
-            log_(L_DEBUG, ".");
+            //log_(L_DEBUG, ".");
             auto msg = reinterpret_cast<Message*>(result.first);
             //log_(L_DEBUG, std::to_string(msg->type));
             last_server_heartbeat_time_ = now;
@@ -301,6 +307,7 @@ void ZorroWebsocketProxyClient::doWork() {
             }
         }
     }
+    log_(L_DEBUG, "WebsocketProxyClient work thread exit");
 }
 
 bool ZorroWebsocketProxyClient::sendHeartbeat(uint64_t now) {