ARCHIVE/clio
1
0
Fork 0
mirror of https://github.com/XRPLF/clio.git synced 2025-12-06 09:18:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

add ref counting for cassandra callbacks

Browse Source
This commit is contained in:
CJ Cobb
2021-01-21 10:28:46 -05:00
parent 176f91e15c
commit eca85b3538
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
reporting/ETLSource.cpp
View File

@@ -474,7 +474,7 @@ public:
if (next_->marker().size() == 0) if (next_->marker().size() == 0)
return ""; return "";
else else
return std::string{next_->marker().data()[0]}; return ripple::strHex(std::string{next_->marker().data()[0]});
} }
}; };

8
reporting/ReportingBackend.cpp
View File

@@ -33,7 +33,9 @@ flatMapWriteCallback(CassFuture* fut, void* cbData)
backend.throttleCv_.notify_all(); backend.throttleCv_.notify_all();
if (backend.numRequestsOutstanding_ == 0) if (backend.numRequestsOutstanding_ == 0)
backend.syncCv_.notify_all(); backend.syncCv_.notify_all();
delete &requestParams; int remaining = --requestParams.refs;
if (remaining == 0)
delete &requestParams;
} }
} }
@@ -71,7 +73,9 @@ flatMapWriteKeyCallback(CassFuture* fut, void* cbData)
backend.throttleCv_.notify_all(); backend.throttleCv_.notify_all();
if (backend.numRequestsOutstanding_ == 0) if (backend.numRequestsOutstanding_ == 0)
backend.syncCv_.notify_all(); backend.syncCv_.notify_all();
delete &requestParams; int remaining = --requestParams.refs;
if (remaining == 0)
delete &requestParams;
} }
} }
void void

3
reporting/ReportingBackend.h
View File

@@ -1315,6 +1315,7 @@ public:
bool isDeleted; bool isDeleted;
uint32_t currentRetries = 0; uint32_t currentRetries = 0;
std::atomic<int> refs = 1;
WriteCallbackData( WriteCallbackData(
CassandraFlatMapBackend const* f, CassandraFlatMapBackend const* f,
@@ -1330,6 +1331,8 @@ public:
, isCreated(isCreated) , isCreated(isCreated)
, isDeleted(isDeleted) , isDeleted(isDeleted)
{ {
if (isCreated or isDeleted)
refs = 2;
} }
}; };