[DXFC-401] Create entity managers and API context.

dxFeed · May 18, 2023 · c4bddd9 · c4bddd9
1 parent 29420cc
commit c4bddd9
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 53 deletions.
diff --git a/include/dxfeed_graal_cpp_api/api/DXEndpoint.hpp b/include/dxfeed_graal_cpp_api/api/DXEndpoint.hpp
@@ -463,7 +463,6 @@ struct DXEndpoint : std::enable_shared_from_this<DXEndpoint> {
     static inline std::mutex MTX{};
     static std::unordered_map<Role, std::shared_ptr<DXEndpoint>> INSTANCES;
 
-    mutable std::recursive_mutex mtx_{};
     handler_utils::JavaObjectHandler<DXEndpoint> handler_;
     Role role_ = Role::FEED;
     std::string name_{};
@@ -480,7 +479,7 @@ struct DXEndpoint : std::enable_shared_from_this<DXEndpoint> {
     void closeImpl();
 
   protected:
-    DXEndpoint() : mtx_{}, handler_{}, role_{}, feed_{}, publisher_{}, stateChangeListenerHandler_{}, onStateChange_{} {
+    DXEndpoint() : handler_{}, role_{}, feed_{}, publisher_{}, stateChangeListenerHandler_{}, onStateChange_{} {
         if constexpr (isDebug) {
             debug("DXEndpoint()");
         }
@@ -751,8 +750,6 @@ struct DXEndpoint : std::enable_shared_from_this<DXEndpoint> {
             debug("DXEndpoint{{{}}}::close()", handler_.toString());
         }
 
-        std::lock_guard guard(mtx_);
-
         closeImpl();
     }
 
@@ -808,12 +805,12 @@ struct DXEndpoint : std::enable_shared_from_this<DXEndpoint> {
     class Builder : public std::enable_shared_from_this<Builder> {
         friend DXEndpoint;
 
-        mutable std::recursive_mutex mtx_{};
+//        mutable std::recursive_mutex mtx_{};
         handler_utils::JavaObjectHandler<Builder> handler_;
         Role role_ = Role::FEED;
         std::unordered_map<std::string, std::string> properties_;
 
-        Builder() : mtx_{}, handler_{}, properties_{} {
+        Builder() : handler_{}, properties_{} {
             if constexpr (isDebug) {
                 debug("DXEndpoint::Builder::Builder()");
             }
@@ -897,8 +894,6 @@ struct DXEndpoint : std::enable_shared_from_this<DXEndpoint> {
                       properties.size());
             }
 
-            std::lock_guard guard(mtx_);
-
             for (auto &&[k, v] : properties) {
                 withProperty(k, v);
             }

diff --git a/include/dxfeed_graal_cpp_api/api/DXFeed.hpp b/include/dxfeed_graal_cpp_api/api/DXFeed.hpp
@@ -27,15 +27,14 @@ struct DXFeed : std::enable_shared_from_this<DXFeed> {
     friend struct DXEndpoint;
 
   private:
-    mutable std::recursive_mutex mtx_{};
     handler_utils::JavaObjectHandler<DXFeed> handler_;
 
     std::unordered_set<std::shared_ptr<DXFeedSubscription>> subscriptions_{};
 
     static std::shared_ptr<DXFeed> create(void *feedHandle) noexcept;
 
   protected:
-    DXFeed() noexcept : mtx_(), handler_{} {
+    DXFeed() noexcept : handler_{} {
         if constexpr (isDebug) {
             debug("DXFeed()");
         }
@@ -98,8 +97,6 @@ struct DXFeed : std::enable_shared_from_this<DXFeed> {
     }
 
     std::string toString() const {
-        std::lock_guard guard(mtx_);
-
         return fmt::format("DXFeed{{{}}}", handler_.toString());
     }
 };

diff --git a/include/dxfeed_graal_cpp_api/internal/managers/EntityManager.hpp b/include/dxfeed_graal_cpp_api/internal/managers/EntityManager.hpp
@@ -63,8 +63,8 @@ template <typename EntityType> struct EntityManager : private NonCopyable<Entity
         std::lock_guard lockGuard{mutex_};
 
         if (auto it = entitiesById_.find(id); it != entitiesById_.end()) {
-            entitiesById_.erase(id);
             idsByEntities_.erase(it->second);
+            entitiesById_.erase(id);
 
             return true;
         }

diff --git a/samples/cpp/PrintQuoteEvents/src/main.cpp b/samples/cpp/PrintQuoteEvents/src/main.cpp
@@ -33,7 +33,6 @@ int main() {
 
         auto sub =
             endpoint->getFeed()->createSubscription({dxfcpp::EventTypeEnum::QUOTE});
-//            endpoint->getFeed()->createSubscription({dxfcpp::EventTypeEnum::QUOTE, dxfcpp::EventTypeEnum::CANDLE});
 
         sub->addEventListener([](auto &&events) {
             for (const auto &e : events) {

diff --git a/src/api/DXEndpoint.cpp b/src/api/DXEndpoint.cpp
@@ -90,12 +90,14 @@ std::shared_ptr<DXEndpoint> DXEndpoint::create(void *endpointHandle, DXEndpoint:
         auto id = Id<DXEndpoint>::from(bit_cast<Id<DXEndpoint>::ValueType>(userData));
         auto endpoint = ApiContext::getInstance()->getDxEndpointManager()->getEntity(id);
 
+        std::cerr << "onStateChange: id = " + std::to_string(id.getValue()) + ", endpoint = " + ((endpoint) ? endpoint->toString() : "nullptr") + "\n";
+
         if (endpoint) {
             endpoint->onStateChange_(graalStateToState(oldState), graalStateToState(newState));
-        }
 
-        if (newState == DXFG_ENDPOINT_STATE_CLOSED) {
-            ApiContext::getInstance()->getDxEndpointManager()->unregisterEntity(id);
+            if (newState == DXFG_ENDPOINT_STATE_CLOSED) {
+                ApiContext::getInstance()->getDxEndpointManager()->unregisterEntity(id);
+            }
         }
     };
 
@@ -126,8 +128,6 @@ void DXEndpoint::setStateChangeListenerImpl() {
 }
 
 DXEndpoint::State DXEndpoint::getState() const {
-    std::lock_guard guard(mtx_);
-
     return !handler_ ? State::CLOSED
                      : runIsolatedOrElse(
                            [handler = bit_cast<dxfg_endpoint_t *>(handler_.get())](auto threadHandle) {
@@ -154,8 +154,6 @@ std::shared_ptr<DXEndpoint> DXEndpoint::user(const std::string &user) {
         debug("DXEndpoint{{{}}}::user(user = {})", handler_.toString(), user);
     }
 
-    std::lock_guard guard(mtx_);
-
     if (handler_) {
         runIsolatedOrElse(
             [user = user, handler = bit_cast<dxfg_endpoint_t *>(handler_.get())](auto threadHandle) {
@@ -173,8 +171,6 @@ std::shared_ptr<DXEndpoint> DXEndpoint::password(const std::string &password) {
         debug("DXEndpoint{{{}}}::password(password = {})", handler_.toString(), password);
     }
 
-    std::lock_guard guard(mtx_);
-
     if (handler_) {
         runIsolatedOrElse(
             [password = password, handler = bit_cast<dxfg_endpoint_t *>(handler_.get())](auto threadHandle) {
@@ -192,8 +188,6 @@ std::shared_ptr<DXEndpoint> DXEndpoint::connect(const std::string &address) {
         debug("DXEndpoint{{{}}}::connect(address = {})", handler_.toString(), address);
     }
 
-    std::lock_guard guard(mtx_);
-
     if (handler_) {
         runIsolatedOrElse(
             [address = address, handler = bit_cast<dxfg_endpoint_t *>(handler_.get())](auto threadHandle) {
@@ -210,8 +204,6 @@ void DXEndpoint::reconnect() {
         debug("DXEndpoint{{{}}}::reconnect()", handler_.toString());
     }
 
-    std::lock_guard guard(mtx_);
-
     if (!handler_) {
         return;
     }
@@ -226,8 +218,6 @@ void DXEndpoint::disconnect() {
         debug("DXEndpoint{{{}}}::disconnect()", handler_.toString());
     }
 
-    std::lock_guard guard(mtx_);
-
     if (!handler_) {
         return;
     }
@@ -242,8 +232,6 @@ void DXEndpoint::disconnectAndClear() {
         debug("DXEndpoint{{{}}}::disconnectAndClear()", handler_.toString());
     }
 
-    std::lock_guard guard(mtx_);
-
     if (!handler_) {
         return;
     }
@@ -258,8 +246,6 @@ void DXEndpoint::awaitNotConnected() {
         debug("DXEndpoint{{{}}}::awaitNotConnected()", handler_.toString());
     }
 
-    std::lock_guard guard(mtx_);
-
     if (!handler_) {
         return;
     }
@@ -274,8 +260,6 @@ void DXEndpoint::awaitProcessed() {
         debug("DXEndpoint{{{}}}::awaitProcessed()", handler_.toString());
     }
 
-    std::lock_guard guard(mtx_);
-
     if (!handler_) {
         return;
     }
@@ -290,8 +274,6 @@ void DXEndpoint::closeAndAwaitTermination() {
         debug("DXEndpoint{{{}}}::closeAndAwaitTermination()", handler_.toString());
     }
 
-    std::lock_guard guard(mtx_);
-
     if (!handler_) {
         return;
     }
@@ -306,8 +288,6 @@ void DXEndpoint::closeAndAwaitTermination() {
 }
 
 std::shared_ptr<DXFeed> DXEndpoint::getFeed() {
-    std::lock_guard guard(mtx_);
-
     if (!feed_) {
         auto feedHandle = !handler_ ? nullptr
                                     : runIsolatedOrElse(
@@ -388,8 +368,6 @@ std::shared_ptr<DXEndpoint::Builder> DXEndpoint::Builder::withRole(DXEndpoint::R
         debug("DXEndpoint::Builder{{{}}}::withRole(role = {})", handler_.toString(), roleToString(role));
     }
 
-    std::lock_guard guard(mtx_);
-
     role_ = role;
 
     if (handler_) {
@@ -410,8 +388,6 @@ std::shared_ptr<DXEndpoint::Builder> DXEndpoint::Builder::withProperty(const std
         debug("DXEndpoint::Builder{{{}}}::withProperty(key = {}, value = {})", handler_.toString(), key, value);
     }
 
-    std::lock_guard guard(mtx_);
-
     properties_[key] = value;
 
     if (handler_) {
@@ -432,8 +408,6 @@ bool DXEndpoint::Builder::supportsProperty(const std::string &key) {
         debug("DXEndpoint::Builder{{{}}}::supportsProperty(key = {})", handler_.toString(), key);
     }
 
-    std::lock_guard guard(mtx_);
-
     if (!handler_) {
         return false;
     }
@@ -450,8 +424,6 @@ std::shared_ptr<DXEndpoint> DXEndpoint::Builder::build() {
         debug("DXEndpoint::Builder{{{}}}::build()", handler_.toString());
     }
 
-    std::lock_guard guard(mtx_);
-
     loadDefaultPropertiesImpl();
 
     auto endpointHandle =

diff --git a/src/api/DXFeed.cpp b/src/api/DXFeed.cpp
@@ -24,8 +24,6 @@ void DXFeed::attachSubscription(std::shared_ptr<DXFeedSubscription> subscription
         debug("{}::attachSubscription({})", toString(), subscription->toString());
     }
 
-    std::lock_guard guard(mtx_);
-
     if (!handler_ || !subscription || !subscription->handler_) {
         return;
     }
@@ -46,8 +44,6 @@ void DXFeed::detachSubscription(std::shared_ptr<DXFeedSubscription> subscription
         debug("{}::detachSubscription({})", toString(), subscription->toString());
     }
 
-    std::lock_guard guard(mtx_);
-
     if (!handler_ || !subscription || !subscription->handler_) {
         return;
     }
@@ -68,8 +64,6 @@ void DXFeed::detachSubscriptionAndClear(std::shared_ptr<DXFeedSubscription> subs
         debug("{}::detachSubscriptionAndClear({})", toString(), subscription->toString());
     }
 
-    std::lock_guard guard(mtx_);
-
     if (!handler_ || !subscription || !subscription->handler_) {
         return;
     }