Merge branch 'spark_crypto' of bitbucket.org:bluetradesys/spark into spark_crypto

This commit is contained in:
taha afzal committed 2022-01-19 15:44:53 -05:00
commit d4be0e7ef6
2 files changed
+23 -19

No files matched your search

+19 -15
View File
@@ -16,18 +16,28 @@ class UnorderedSetMap {
template <typename T, typename... Ts>
using AllSame = std::enable_if_t<std::conjunction_v<std::is_same<T, Ts>...>>;
struct AddResult {
typename Data::iterator iterator;
bool added_key;
std::size_t count;
};
struct RemoveResult {
typename Data::iterator iterator;
bool removed_key;
std::size_t count;
};
std::size_t size() const;
std::size_t size(Key key) const;
template <typename... ValuesToAdd, typename = AllSame<Value, ValuesToAdd...>>
std::tuple<typename Data::iterator, bool, std::size_t> add(
Key key, ValuesToAdd... values);
AddResult add(Key key, ValuesToAdd... values);
template <
typename... ValuesToRemove,
typename = AllSame<Value, ValuesToRemove...>>
std::tuple<typename Data::iterator, bool, std::size_t> remove(
Key key, ValuesToRemove... values);
RemoveResult remove(Key key, ValuesToRemove... values);
private:
Data data_;
@@ -51,10 +61,7 @@ std::size_t UnorderedSetMap<Key, Value, KeyHash, ValueHash>::size(
template <class Key, class Value, class KeyHash, class ValueHash>
template <typename... ValuesToAdd, typename AllSame>
std::tuple<
typename UnorderedSetMap<Key, Value, KeyHash, ValueHash>::Data::iterator,
bool,
std::size_t>
typename UnorderedSetMap<Key, Value, KeyHash, ValueHash>::AddResult
UnorderedSetMap<Key, Value, KeyHash, ValueHash>::add(
Key key, ValuesToAdd... values) {
auto [it, is_new] = data_.try_emplace(key);
@@ -62,20 +69,17 @@ UnorderedSetMap<Key, Value, KeyHash, ValueHash>::add(
auto sz_before = val_set.size();
[](...) {}((val_set.insert(values))...);
std::size_t n_added = val_set.size() - sz_before;
return std::make_tuple(it, is_new, n_added);
return {it, is_new, n_added};
}
template <class Key, class Value, class KeyHash, class ValueHash>
template <typename... ValuesToRemove, typename AllSame>
std::tuple<
typename UnorderedSetMap<Key, Value, KeyHash, ValueHash>::Data::iterator,
bool,
std::size_t>
typename UnorderedSetMap<Key, Value, KeyHash, ValueHash>::RemoveResult
UnorderedSetMap<Key, Value, KeyHash, ValueHash>::remove(
Key key, ValuesToRemove... values) {
auto it = data_.find(key);
if (it == data_.end()) {
return std::make_tuple(it, false, std::size_t(0));
return {it, false, std::size_t(0)};
}
auto &val_set = it->second;
auto sz_before = val_set.size();
@@ -86,7 +90,7 @@ UnorderedSetMap<Key, Value, KeyHash, ValueHash>::remove(
data_.erase(it);
it = data_.end();
}
return std::make_tuple(it, remove_key, n_removed);
return {it, remove_key, n_removed};
}
} // namespace bts::collections
+4 -4
View File
@@ -111,8 +111,8 @@ void BinanceDepthStreamSite::subscribe(
"Cannot subscribe. Listener already subscribed to sec. sid: "
"{}; sym: {}",
sym, sid);
auto [it, is_new_sym, _] = sec_listeners_().add(sid, listener_id);
if (is_new_sym) {
auto res = sec_listeners_().add(sid, listener_id);
if (res.added_key) {
ensure_connect_();
// first subscription for this symbol
binance_->add_symbol(sym);
@@ -137,8 +137,8 @@ void BinanceDepthStreamSite::unsubscribe(
"Cannot unsubscribe. Listener not subscribed to sec. sid: {}; "
"sym: {}",
sid, sym);
auto [it, removed_sym, _] = sec_listeners_().remove(sid, listener_id);
if (removed_sym) {
auto res = sec_listeners_().remove(sid, listener_id);
if (res.removed_key) {
binance_->remove_symbol(sym);
}
}