Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-06 22:32:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

improved clear() and avoid bad indices

Browse source
This commit is contained in:
Andrew Meadows 2018-07-05 13:30:48 -07:00
parent 3a4ce9cf5d
commit 59fcee6bc0
4 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libraries/workload/src/workload/Space.cpp
View file

@ -46,7 +46,7 @@ void Space::processResets(const Transaction::Resets& transactions) {
auto proxyID = std::get<0>(reset);
// Guard against proxyID being past the end of the list.
if (proxyID < 0 || proxyID >= (int32_t)_proxies.size() || proxyID >= (int32_t)_owners.size()) {
if (!_IDAllocator.checkIndex(proxyID)) {
continue;
}
auto& item = _proxies[proxyID];
@ -61,6 +61,9 @@ void Space::processResets(const Transaction::Resets& transactions) {
void Space::processRemoves(const Transaction::Removes& transactions) {
for (auto removedID : transactions) {
if (!_IDAllocator.checkIndex(removedID)) {
continue;
}
_IDAllocator.freeIndex(removedID);
// Access the true item
@ -75,7 +78,7 @@ void Space::processRemoves(const Transaction::Removes& transactions) {
void Space::processUpdates(const Transaction::Updates& transactions) {
for (auto& update : transactions) {
auto updateID = std::get<0>(update);
if (updateID == INVALID_PROXY_ID) {
if (!_IDAllocator.checkIndex(updateID)) {
continue;
}
@ -141,6 +144,7 @@ uint8_t Space::getRegion(int32_t proxyID) const {
}
void Space::clear() {
Collection::clear();
std::unique_lock<std::mutex> lock(_proxiesMutex);
_IDAllocator.clear();
_proxies.clear();

4
libraries/workload/src/workload/Space.h
View file

@ -42,7 +42,7 @@ public:
uint32_t getNumViews() const { return (uint32_t)(_views.size()); }
void copyViews(std::vector<View>& copy) const;
uint32_t getNumObjects() const { return _IDAllocator.getNumLiveIndices(); } // (uint32_t)(_proxies.size() - _freeIndices.size()); }
uint32_t getNumObjects() const { return _IDAllocator.getNumLiveIndices(); }
uint32_t getNumAllocatedProxies() const { return (uint32_t)(_IDAllocator.getNumAllocatedIndices()); }
void categorizeAndGetChanges(std::vector<Change>& changes);
@ -51,7 +51,7 @@ public:
const Owner getOwner(int32_t proxyID) const;
uint8_t getRegion(int32_t proxyID) const;
void clear();
void clear() override;
private:
void processTransactionFrame(const Transaction& transaction) override;

6
libraries/workload/src/workload/Transaction.cpp
View file

@ -111,6 +111,12 @@ Collection::Collection() {
Collection::~Collection() {
}
void Collection::clear() {
std::unique_lock<std::mutex> lock(_transactionQueueMutex);
_transactionQueue.clear();
_transactionFrames.clear();
}
ProxyID Collection::allocateID() {
// Just increment and return the previous value initialized at 0
return _IDAllocator.allocateIndex();

2
libraries/workload/src/workload/Transaction.h
View file

@ -137,6 +137,8 @@ public:
Collection();
~Collection();
virtual void clear();
// This call is thread safe, can be called from anywhere to allocate a new ID
ProxyID allocateID();