Update include/Orderbook.h

include/Orderbook.h

@@ -15,18 +15,6 @@
 #include "Types.h"
 #include "Order.h"
 #include "Trade.h"
-#include "MemoryPool.h"
-
-// GLOBAL MEMORY POOL (25M capacity)
-extern ObjectPool<Order, 25000000> g_OrderPool;
-
-// CUSTOM SPINLOCK (To avoid OS context switch)
-class SpinLock {
-    std::atomic_flag flag = ATOMIC_FLAG_INIT;
-public:
-    void lock() { while(flag.test_and_set(std::memory_order_acquire)) { /* spin */ } }
-    void unlock() { flag.clear(std::memory_order_release); }
-};
 
 class Orderbook {
 public:
@@ -41,10 +29,12 @@ public:
     Orderbook(Orderbook&&)                 = delete;
     Orderbook& operator=(Orderbook&&)      = delete;
 
+    // ─── Core API ─────────────────────────────────────────────────────────────
     Trades   AddOrder   (OrderPointer order);
     void     CancelOrder(OrderId orderId);
     Trades   ModifyOrder(OrderModify order);
 
+    // ─── Query API ────────────────────────────────────────────────────────────
     std::size_t        Size()         const;
     bool               HasOrder(OrderId) const;
     OrderbookSnapshot  GetSnapshot()  const;
@@ -53,14 +43,16 @@ public:
     Price              MidPrice()     const;
     Price              Spread()       const;
 
+    // ─── Statistics ───────────────────────────────────────────────────────────
     uint64_t GetTotalOrders()    const noexcept { return stats_.totalOrders.load();   }
     uint64_t GetTotalTrades()    const noexcept { return stats_.totalTrades.load();   }
     uint64_t GetTotalCancels()   const noexcept { return stats_.totalCancels.load();  }
     uint64_t GetTotalVolume()    const noexcept { return stats_.totalVolume.load();   }
     uint64_t GetSequenceNumber() const noexcept { return stats_.seqNum.load();        }
 
-    void SetOnTrade(OnTradeCallback cb)    { onTrade_    = std::move(cb); }
-    void SetOnOrderAdded(OnOrderCallback cb) { onAdded_ = std::move(cb); }
+    // ─── Event Hooks ──────────────────────────────────────────────────────────
+    void SetOnTrade(OnTradeCallback cb)          { onTrade_     = std::move(cb); }
+    void SetOnOrderAdded(OnOrderCallback cb)     { onAdded_     = std::move(cb); }
     void SetOnOrderCancelled(OnOrderCallback cb) { onCancelled_ = std::move(cb); }
 
     void CheckAndTriggerStops(Price lastTrade);
@@ -84,10 +76,7 @@ private:
     std::multimap<Price, OrderPointer>                  stopBuys_;
     std::multimap<Price, OrderPointer, std::greater<Price>> stopSells_;
 
-    // USING SPINLOCK INSTEAD OF MUTEX
-    mutable SpinLock ordersMutex_;
-    std::mutex cvMutex_; // Only for sleep/CV
-    
+    mutable std::mutex ordersMutex_;
     std::thread        pruneThread_;
     std::condition_variable shutdownCV_;
     std::atomic<bool>  shutdown_{false};
@@ -110,6 +99,11 @@ private:
     void     CancelOrdersInternal(const OrderIds& ids);
     void     CancelOrderInternal (OrderId orderId);
 
+    // BUG FIX: Internal add/match that assumes mutex is already held.
+    // Required to fix the deadlock in CheckAndTriggerStops and the race
+    // condition in ModifyOrder.
+    Trades   AddOrderInternal(OrderPointer order);
+
     bool     CanMatch     (Side side, Price price) const;
     bool     CanFullyFill (Side side, Price price, Quantity qty) const;
 
@@ -120,6 +114,4 @@ private:
     void     OnOrderAdded      (OrderPointer order);
     void     OnOrderCancelled  (OrderPointer order);
     void     OnOrderMatched    (Price price, Quantity qty, bool fullyFilled);
-};
-
-}
+};