2015-07-11 02:24:00 +02:00
|
|
|
/*
|
|
|
|
Minetest
|
|
|
|
Copyright (C) 2015 est31, <MTest31@outlook.com>
|
|
|
|
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
|
|
it under the terms of the GNU Lesser General Public License as published by
|
|
|
|
the Free Software Foundation; either version 2.1 of the License, or
|
|
|
|
(at your option) any later version.
|
|
|
|
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
GNU Lesser General Public License for more details.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU Lesser General Public License along
|
|
|
|
with this program; if not, write to the Free Software Foundation, Inc.,
|
|
|
|
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "test.h"
|
|
|
|
|
2015-10-30 04:26:03 +01:00
|
|
|
#include "util/areastore.h"
|
2015-07-11 02:24:00 +02:00
|
|
|
|
|
|
|
class TestAreaStore : public TestBase {
|
|
|
|
public:
|
|
|
|
TestAreaStore() { TestManager::registerTestModule(this); }
|
|
|
|
const char *getName() { return "TestAreaStore"; }
|
|
|
|
|
|
|
|
void runTests(IGameDef *gamedef);
|
|
|
|
|
|
|
|
void genericStoreTest(AreaStore *store);
|
|
|
|
void testVectorStore();
|
|
|
|
void testSpatialStore();
|
2015-10-31 00:27:48 +01:00
|
|
|
void testSerialization();
|
2015-07-11 02:24:00 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
static TestAreaStore g_test_instance;
|
|
|
|
|
|
|
|
void TestAreaStore::runTests(IGameDef *gamedef)
|
|
|
|
{
|
|
|
|
TEST(testVectorStore);
|
|
|
|
#if USE_SPATIAL
|
|
|
|
TEST(testSpatialStore);
|
|
|
|
#endif
|
2015-10-31 00:27:48 +01:00
|
|
|
TEST(testSerialization);
|
2015-07-11 02:24:00 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
////////////////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
|
|
void TestAreaStore::testVectorStore()
|
|
|
|
{
|
|
|
|
VectorAreaStore store;
|
|
|
|
genericStoreTest(&store);
|
|
|
|
}
|
|
|
|
|
|
|
|
void TestAreaStore::testSpatialStore()
|
|
|
|
{
|
|
|
|
#if USE_SPATIAL
|
|
|
|
SpatialAreaStore store;
|
|
|
|
genericStoreTest(&store);
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
void TestAreaStore::genericStoreTest(AreaStore *store)
|
|
|
|
{
|
|
|
|
Area a(v3s16(-10, -3, 5), v3s16(0, 29, 7));
|
|
|
|
Area b(v3s16(-5, -2, 5), v3s16(0, 28, 6));
|
|
|
|
Area c(v3s16(-7, -3, 6), v3s16(-1, 27, 7));
|
|
|
|
std::vector<Area *> res;
|
|
|
|
|
|
|
|
UASSERTEQ(size_t, store->size(), 0);
|
|
|
|
store->reserve(2); // sic
|
2015-10-30 04:08:32 +01:00
|
|
|
store->insertArea(&a);
|
|
|
|
store->insertArea(&b);
|
|
|
|
store->insertArea(&c);
|
2015-07-11 02:24:00 +02:00
|
|
|
UASSERTEQ(size_t, store->size(), 3);
|
|
|
|
|
|
|
|
store->getAreasForPos(&res, v3s16(-1, 0, 6));
|
|
|
|
UASSERTEQ(size_t, res.size(), 3);
|
|
|
|
res.clear();
|
|
|
|
store->getAreasForPos(&res, v3s16(0, 0, 7));
|
|
|
|
UASSERTEQ(size_t, res.size(), 1);
|
|
|
|
res.clear();
|
|
|
|
|
2015-10-30 04:08:32 +01:00
|
|
|
store->removeArea(a.id);
|
2015-07-11 02:24:00 +02:00
|
|
|
|
|
|
|
store->getAreasForPos(&res, v3s16(0, 0, 7));
|
|
|
|
UASSERTEQ(size_t, res.size(), 0);
|
|
|
|
res.clear();
|
|
|
|
|
2015-10-30 04:08:32 +01:00
|
|
|
store->insertArea(&a);
|
2015-07-11 02:24:00 +02:00
|
|
|
|
|
|
|
store->getAreasForPos(&res, v3s16(0, 0, 7));
|
|
|
|
UASSERTEQ(size_t, res.size(), 1);
|
|
|
|
res.clear();
|
|
|
|
|
|
|
|
store->getAreasInArea(&res, v3s16(-10, -3, 5), v3s16(0, 29, 7), false);
|
|
|
|
UASSERTEQ(size_t, res.size(), 3);
|
|
|
|
res.clear();
|
|
|
|
|
|
|
|
store->getAreasInArea(&res, v3s16(-100, 0, 6), v3s16(200, 0, 6), false);
|
|
|
|
UASSERTEQ(size_t, res.size(), 0);
|
|
|
|
res.clear();
|
|
|
|
|
|
|
|
store->getAreasInArea(&res, v3s16(-100, 0, 6), v3s16(200, 0, 6), true);
|
|
|
|
UASSERTEQ(size_t, res.size(), 3);
|
|
|
|
res.clear();
|
|
|
|
|
2015-10-30 04:08:32 +01:00
|
|
|
store->removeArea(a.id);
|
|
|
|
store->removeArea(b.id);
|
|
|
|
store->removeArea(c.id);
|
2015-07-11 02:24:00 +02:00
|
|
|
|
|
|
|
Area d(v3s16(-100, -300, -200), v3s16(-50, -200, -100));
|
|
|
|
d.data = "Hi!";
|
2015-10-30 04:08:32 +01:00
|
|
|
store->insertArea(&d);
|
2015-07-11 02:24:00 +02:00
|
|
|
|
|
|
|
store->getAreasForPos(&res, v3s16(-75, -250, -150));
|
|
|
|
UASSERTEQ(size_t, res.size(), 1);
|
|
|
|
UASSERTEQ(u16, res[0]->data.size(), 3);
|
|
|
|
UASSERT(strncmp(res[0]->data.c_str(), "Hi!", 3) == 0);
|
|
|
|
res.clear();
|
|
|
|
|
2015-10-30 04:08:32 +01:00
|
|
|
store->removeArea(d.id);
|
2015-07-11 02:24:00 +02:00
|
|
|
}
|
2015-10-30 04:08:32 +01:00
|
|
|
|
2015-10-31 00:27:48 +01:00
|
|
|
void TestAreaStore::testSerialization()
|
|
|
|
{
|
|
|
|
VectorAreaStore store;
|
|
|
|
|
|
|
|
Area a(v3s16(-1, 0, 1), v3s16(0, 1, 2));
|
2019-09-21 17:54:52 +02:00
|
|
|
a.data = "Area AA";
|
2015-10-31 00:27:48 +01:00
|
|
|
store.insertArea(&a);
|
|
|
|
|
|
|
|
Area b(v3s16(123, 456, 789), v3s16(32000, 100, 10));
|
2019-09-21 17:54:52 +02:00
|
|
|
b.data = "Area BB";
|
2015-10-31 00:27:48 +01:00
|
|
|
store.insertArea(&b);
|
|
|
|
|
2021-09-11 21:06:57 +02:00
|
|
|
std::ostringstream os(std::ios_base::binary);
|
2015-10-31 00:27:48 +01:00
|
|
|
store.serialize(os);
|
|
|
|
std::string str = os.str();
|
|
|
|
|
|
|
|
std::string str_wanted("\x00" // Version
|
|
|
|
"\x00\x02" // Count
|
|
|
|
"\xFF\xFF\x00\x00\x00\x01" // Area A min edge
|
|
|
|
"\x00\x00\x00\x01\x00\x02" // Area A max edge
|
2019-09-21 17:54:52 +02:00
|
|
|
"\x00\x07" // Area A data length
|
|
|
|
"Area AA" // Area A data
|
2015-10-31 00:27:48 +01:00
|
|
|
"\x00\x7B\x00\x64\x00\x0A" // Area B min edge (last two swapped with max edge for sorting)
|
|
|
|
"\x7D\x00\x01\xC8\x03\x15" // Area B max edge (^)
|
2019-09-21 17:54:52 +02:00
|
|
|
"\x00\x07" // Area B data length
|
|
|
|
"Area BB" // Area B data
|
|
|
|
"\x00\x00\x00\x00" // ID A = 0
|
|
|
|
"\x00\x00\x00\x01", // ID B = 1
|
2015-10-31 00:27:48 +01:00
|
|
|
1 + 2 +
|
2019-09-21 17:54:52 +02:00
|
|
|
(6 + 6 + 2 + 7) * 2 + // min/max edge, length, data
|
|
|
|
2 * 4); // Area IDs
|
|
|
|
|
Optimize string (mis)handling (#8128)
* Optimize statbar drawing
The texture name of the statbar is a string passed by value.
That slows down the client and creates litter in the heap
as the content of the string is allocated there. Convert the
offending parameter to a const reference to avoid the
performance hit.
* Optimize texture cache
There is an unnecessary temporary created when the texture
path is being generated. This slows down the cache each time
a new texture is encountered and it needs to be loaded into
the cache. Additionally, the heap litter created by this
unnecessary temporary is particularly troublesome here as
the following code then piles another string (the resulting
full path of the texture) on top of it, followed by the
texture itself, which both are quite long term objects as
they are subsequently inserted into the cache where they can
remain for quite a while (especially if the texture turns
out to be a common one like dirt, grass or stone).
Use std::string.append to get rid of the temporary which
solves both issues (speed and heap fragmentation).
* Optimize animations in client
Each time an animated node is updated, an unnecessary copy of
the texture name is created, littering the heap with lots of
fragments. This can be specifically troublesome when looking
at oceans or large lava lakes as both of these nodes are
usually animated (the lava animation is pretty visible).
Convert the parameter of GenericCAO::updateTextures to a
const reference to get rid of the unnecessary copy.
There is a comment stating "std::string copy is mandatory as
mod can be a class member and there is a swap on those class
members ... do NOT pass by reference", reinforcing the
belief that the unnecessary copy is in fact necessary.
However one of the first things the code of the method does
is to assign the parameter to its class member, creating
another copy. By rearranging the code a little bit this
"another copy" can then be used by the subsequent code,
getting rid of the need to pass the parameter by value and
thus saving that copying effort.
* Optimize chat console history handling
The GUIChatConsole::replaceAndAddToHistory was getting the
line to work on by value which turns out to be unnecessary.
Get rid of that unnecessary copy by converting the parameter
to a const reference.
* Optimize gui texture setting
The code used to set the texture for GUI components was
getting the name of the texture by value, creating
unnecessary performance bottleneck for mods/games with
heavily textured GUIs. Get rid of the bottleneck by passing
the texture name as a const reference.
* Optimize sound playing code in GUIEngine
The GUIEngine's code receives the specification of the sound
to be played by value, which turns out to be most likely a
mistake as the underlying sound manager interface receives
the same thing by reference. Convert the offending parameter
to a const reference to get rid of the rather bulky copying
effort and the associated performance hit.
* Silence CLANG TIDY warnings for unit tests
Change "std::string" to "const std::string &" to avoid an
unnecessary local value copy, silencing the CLANG TIDY
process.
* Optimize formspec handling
The "formspec prepend" parameter was passed to the formspec
handling code by value, creating unnecessary copy of
std::string and slowing down the game if mods add things like
textured backgrounds for the player inventory and/or other
forms. Get rid of that performance bottleneck by converting
the parameter to a const reference.
* Optimize hotbar image handling
The code that sets the background images for the hotbar is
getting the name of the image by value, creating an
unnecessary std::string copying effort. Fix that by
converting the relevant parameters to const references.
* Optimize inventory deserialization
The inventory manager deserialization code gets the
serialized version of the inventory by value, slowing the
server and the client down when there are inventory updates.
This can get particularly troublesome with pipeworks which
adds nodes that can mess around with inventories
automatically or with mods that have mobs with inventories
that actively use them.
* Optimize texture scaling cache
There is an io::path parameter passed by value in the
procedure used to add images converted from textures,
leading to slowdown when the image is not yet created and
the conversion is thus needed. The performance hit is
quite significant as io::path is similar to std::string
so convert the parameter to a const reference to get rid of
it.
* Optimize translation file loader
Use "std::string::append" when calculating the final index
for the translation table to avoid unnecessary temporary
strings. This speeds the translation file loader up
significantly as std::string uses heap allocation which
tends to be rather slow. Additionally, the heap is no
longer being littered by these unnecessary string
temporaries, increasing performance of code that gets
executed after the translation file loader finishes.
* Optimize server map saving
When the directory structure for the world data is created
during server map saving, an unnecessary value passing of
the directory name slows things down. Remove that overhead
by converting the offending parameter to a const reference.
2019-05-18 17:19:13 +02:00
|
|
|
UASSERTEQ(const std::string &, str, str_wanted);
|
2015-10-31 00:27:48 +01:00
|
|
|
|
2021-09-11 21:06:57 +02:00
|
|
|
std::istringstream is(str, std::ios_base::binary);
|
2015-10-31 00:27:48 +01:00
|
|
|
store.deserialize(is);
|
|
|
|
|
2019-09-21 17:54:52 +02:00
|
|
|
// deserialize() doesn't clear the store
|
|
|
|
// But existing IDs are overridden
|
|
|
|
UASSERTEQ(size_t, store.size(), 2);
|
|
|
|
|
|
|
|
Area c(v3s16(33, -2, -6), v3s16(4, 77, -76));
|
|
|
|
c.data = "Area CC";
|
|
|
|
store.insertArea(&c);
|
|
|
|
|
|
|
|
UASSERTEQ(u32, c.id, 2);
|
2015-10-31 00:27:48 +01:00
|
|
|
}
|
|
|
|
|