matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do a single CoordStack allocation per thread

Browse Source
This commit is contained in:
Secundario 2019-09-17 18:00:49 -03:00 committed by jacob1
parent ac0bb01dec
commit a05e20f1bf
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/simulation/Simulation.cpp
View File

@ -599,6 +599,13 @@ bool Simulation::FloodFillPmapCheck(int x, int y, int type)
return TYP(pmap[y][x]) == type; return TYP(pmap[y][x]) == type;
} }
CoordStack& Simulation::getCoordStackSingleton()
{
// Future-proofing in case Simulation is later multithreaded
thread_local CoordStack cs;
return cs;
}
int Simulation::flood_prop(int x, int y, size_t propoffset, PropertyValue propvalue, StructProperty::PropertyType proptype) int Simulation::flood_prop(int x, int y, size_t propoffset, PropertyValue propvalue, StructProperty::PropertyType proptype)
{ {
int i, x1, x2, dy = 1; int i, x1, x2, dy = 1;
@ -614,7 +621,9 @@ int Simulation::flood_prop(int x, int y, size_t propoffset, PropertyValue propva
memset(bitmap, 0, XRES*YRES); memset(bitmap, 0, XRES*YRES);
try try
{ {
CoordStack cs; CoordStack& cs = getCoordStackSingleton();
cs.clear();
cs.push(x, y); cs.push(x, y);
do do
{ {
@ -745,7 +754,8 @@ int Simulation::FloodINST(int x, int y, int fullc, int cm)
if (TYP(pmap[y][x])!=cm || parts[ID(pmap[y][x])].life!=0) if (TYP(pmap[y][x])!=cm || parts[ID(pmap[y][x])].life!=0)
return 1; return 1;
CoordStack cs; CoordStack& cs = getCoordStackSingleton();
cs.clear();
cs.push(x, y); cs.push(x, y);
@ -857,7 +867,9 @@ bool Simulation::flood_water(int x, int y, int i)
try try
{ {
CoordStack cs; CoordStack& cs = getCoordStackSingleton();
cs.clear();
cs.push(x, y); cs.push(x, y);
do do
{ {
@ -1272,7 +1284,9 @@ void Simulation::ApplyDecorationFill(Renderer *ren, int x, int y, int colR, int
try try
{ {
CoordStack cs; CoordStack& cs = getCoordStackSingleton();
cs.clear();
cs.push(x, y); cs.push(x, y);
do do
{ {

5
src/simulation/Simulation.h
View File

@ -13,6 +13,8 @@
#include "GOLMenu.h" #include "GOLMenu.h"
#include "MenuSection.h" #include "MenuSection.h"
#include "CoordStack.h"
#include "elements/Element.h" #include "elements/Element.h"
#define CHANNELS ((int)(MAX_TEMP-73)/100+2) #define CHANNELS ((int)(MAX_TEMP-73)/100+2)
@ -220,6 +222,9 @@ public:
String ElementResolve(int type, int ctype); String ElementResolve(int type, int ctype);
String BasicParticleInfo(Particle const &sample_part); String BasicParticleInfo(Particle const &sample_part);
private:
CoordStack& getCoordStackSingleton();
}; };
#endif /* SIMULATION_H */ #endif /* SIMULATION_H */