stephenseo/EntityComponentMetaSystem
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix bug using callForMatchingFunction(s)

Browse source 
Fixed bug where invalid entity ids were used when using the
callForMatchingFunction(s) functions.
This commit is contained in:
Stephen Seo 2021-05-16 20:07:14 +09:00
parent d1b0de62f2
commit e0f30db951
1 changed files with 53 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

81
src/EC/Manager.hpp
View file

@ -888,7 +888,7 @@ namespace EC
std::vector<std::size_t> matching, std::vector<std::size_t> matching,
void* context) void* context)
{ {
if(threadCount <= 1) if(threadCount <= 1 || matching.size() < threadCount)
{ {
for(auto eid : matching) for(auto eid : matching)
{ {
@ -907,24 +907,21 @@ namespace EC
{ {
std::size_t begin = s * i; std::size_t begin = s * i;
std::size_t end; std::size_t end;
if(i == threadCount - 1) if(i == threadCount - 1) {
{
end = matching.size(); end = matching.size();
} } else {
else
{
end = s * (i + 1); end = s * (i + 1);
} }
threads[i] = std::thread( threads[i] = std::thread(
[this, &function, &helper, &context] [this, &function, &helper, &context, &matching]
(std::size_t begin, (std::size_t begin,
std::size_t end) { std::size_t end) {
for(std::size_t i = begin; i < end; ++i) for(std::size_t j = begin; j < end; ++j)
{ {
if(isAlive(i)) if(isAlive(matching[j]))
{ {
helper.callInstancePtr( helper.callInstancePtr(
i, *this, &function, context); matching[j], *this, &function, context);
} }
} }
}, },
@ -946,7 +943,7 @@ namespace EC
{ {
std::vector<std::vector<std::size_t> > matchingV(bitsets.size()); std::vector<std::vector<std::size_t> > matchingV(bitsets.size());
if(threadCount <= 1) if(threadCount <= 1 || currentSize <= threadCount)
{ {
for(std::size_t i = 0; i < currentSize; ++i) for(std::size_t i = 0; i < currentSize; ++i)
{ {
@ -969,34 +966,50 @@ namespace EC
std::vector<std::thread> threads(threadCount); std::vector<std::thread> threads(threadCount);
std::size_t s = currentSize / threadCount; std::size_t s = currentSize / threadCount;
std::mutex mutex; std::mutex mutex;
for(std::size_t i = 0; i < threadCount; ++i)
{ if(s == 0) {
std::size_t begin = s * i; for(std::size_t i = 0; i < currentSize; ++i) {
std::size_t end;
if(i == threadCount - 1)
{
end = currentSize;
}
else
{
end = s * (i + 1);
}
threads[i] = std::thread( threads[i] = std::thread(
[this, &matchingV, &bitsets, &mutex] [this, &matchingV, &bitsets, &mutex] (std::size_t idx) {
(std::size_t begin, std::size_t end) if(!isAlive(idx)) {
{ return;
for(std::size_t j = begin; j < end; ++j)
{
if(!isAlive(j))
{
continue;
} }
for(std::size_t k = 0; k < bitsets.size(); ++k) for(std::size_t k = 0; k < bitsets.size(); ++k)
{ {
if(((*bitsets[k]) & if(((*bitsets[k]) &
std::get<BitsetType>(entities[j])) std::get<BitsetType>(entities[idx]))
== (*bitsets[k])) == (*bitsets[k]))
{ {
std::lock_guard<std::mutex> guard(mutex);
matchingV[k].push_back(idx);
}
}
}, i);
}
for(std::size_t i = 0; i < currentSize; ++i) {
threads[i].join();
}
} else {
for (std::size_t i = 0; i < threadCount; ++i) {
std::size_t begin = s * i;
std::size_t end;
if (i == threadCount - 1) {
end = currentSize;
} else {
end = s * (i + 1);
}
threads[i] = std::thread(
[this, &matchingV, &bitsets, &mutex]
(std::size_t begin, std::size_t end) {
for (std::size_t j = begin; j < end; ++j) {
if (!isAlive(j)) {
continue;
}
for (std::size_t k = 0; k < bitsets.size(); ++k) {
if (((*bitsets[k]) &
std::get<BitsetType>(entities[j]))
== (*bitsets[k])) {
std::lock_guard<std::mutex> guard(mutex); std::lock_guard<std::mutex> guard(mutex);
matchingV[k].push_back(j); matchingV[k].push_back(j);
} }
@ -1004,11 +1017,11 @@ namespace EC
} }
}, begin, end); }, begin, end);
} }
for(std::size_t i = 0; i < threadCount; ++i) for (std::size_t i = 0; i < threadCount; ++i) {
{
threads[i].join(); threads[i].join();
} }
} }
}
return matchingV; return matchingV;
} }