Skip to content
Permalink
Browse files

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.
  • Loading branch information...
osjc authored and SmallJoker committed May 18, 2019
1 parent 5686941 commit eb2bda7d0bbb1ef5f74e8ff88eeedddfe4d75669
@@ -1062,7 +1062,7 @@ void GenericCAO::updateTexturePos()
}
}

void GenericCAO::updateTextures(std::string mod)
void GenericCAO::updateTextures(const std::string &modref)
{
ITextureSource *tsrc = m_client->tsrc();

@@ -1071,9 +1071,21 @@ void GenericCAO::updateTextures(std::string mod)
bool use_anisotropic_filter = g_settings->getBool("anisotropic_filter");

m_previous_texture_modifier = m_current_texture_modifier;
m_current_texture_modifier = mod;
m_current_texture_modifier = modref;
m_glow = m_prop.glow;

// Create a reference to the copy of "modref" just created. The
// following code will then use this reference instead of the
// original parameter which was passed by reference. This is
// necessary as "modref" can be a class member and there is a swap on
// those class members which can get triggered by the rest of the
// code of this method. This is faster than passing the "mod" by
// value because it reuses the copy made by the assignment to
// m_current_texture_modifier for the "mod" instead of having two
// copies, one for "mod" and another one (created from "mod") for
// the m_current_texture_modifier class member.
const std::string &mod = m_current_texture_modifier;

video::E_MATERIAL_TYPE material_type = (m_prop.use_texture_alpha) ?
video::EMT_TRANSPARENT_ALPHA_CHANNEL : video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF;

@@ -225,9 +225,7 @@ class GenericCAO : public ClientActiveObject

void updateTexturePos();

// 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
void updateTextures(std::string mod);
void updateTextures(const std::string &modref);

void updateAnimation();

@@ -39,7 +39,7 @@ std::map<io::path, video::ITexture *> g_txrCache;
/* Manually insert an image into the cache, useful to avoid texture-to-image
* conversion whenever we can intercept it.
*/
void guiScalingCache(io::path key, video::IVideoDriver *driver, video::IImage *value)
void guiScalingCache(const io::path &key, video::IVideoDriver *driver, video::IImage *value)
{
if (!g_settings->getBool("gui_scaling_filter"))
return;
@@ -23,7 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
/* Manually insert an image into the cache, useful to avoid texture-to-image
* conversion whenever we can intercept it.
*/
void guiScalingCache(io::path key, video::IVideoDriver *driver, video::IImage *value);
void guiScalingCache(const io::path &key, video::IVideoDriver *driver, video::IImage *value);

// Manually clear the cache, e.g. when switching to different worlds.
void guiScalingCacheClear();
@@ -372,7 +372,7 @@ void Hud::drawLuaElements(const v3s16 &camera_offset)
}


void Hud::drawStatbar(v2s32 pos, u16 corner, u16 drawdir, std::string texture,
void Hud::drawStatbar(v2s32 pos, u16 corner, u16 drawdir, const std::string &texture,
s32 count, v2s32 offset, v2s32 size)
{
const video::SColor color(255, 255, 255, 255);
@@ -81,7 +81,7 @@ class Hud
void drawLuaElements(const v3s16 &camera_offset);

private:
void drawStatbar(v2s32 pos, u16 corner, u16 drawdir, std::string texture,
void drawStatbar(v2s32 pos, u16 corner, u16 drawdir, const std::string &texture,
s32 count, v2s32 offset, v2s32 size = v2s32());

void drawItems(v2s32 upperleftpos, v2s32 screen_offset, s32 itemcount,
@@ -131,7 +131,8 @@ std::string getTexturePath(const std::string &filename)
Check from texture_path
*/
for (const auto &path : getTextureDirs()) {
std::string testpath = path + DIR_DELIM + filename;
std::string testpath = path + DIR_DELIM;
testpath.append(filename);
// Check all filename extensions. Returns "" if not found.
fullpath = getImagePath(testpath);
if (!fullpath.empty())
@@ -139,7 +139,7 @@ f32 GUIChatConsole::getDesiredHeight() const
return m_desired_height_fraction;
}

void GUIChatConsole::replaceAndAddToHistory(std::wstring line)
void GUIChatConsole::replaceAndAddToHistory(const std::wstring &line)
{
ChatPrompt& prompt = m_chat_backend->getPrompt();
prompt.addToHistory(prompt.getLine());
@@ -60,7 +60,7 @@ class GUIChatConsole : public gui::IGUIElement
f32 getDesiredHeight() const;

// Replace actual line when adding the actual to the history (if there is any)
void replaceAndAddToHistory(std::wstring line);
void replaceAndAddToHistory(const std::wstring &line);

// Change how the cursor looks
void setCursor(
@@ -518,7 +518,7 @@ void GUIEngine::drawFooter(video::IVideoDriver *driver)
}

/******************************************************************************/
bool GUIEngine::setTexture(texture_layer layer, std::string texturepath,
bool GUIEngine::setTexture(texture_layer layer, const std::string &texturepath,
bool tile_image, unsigned int minsize)
{
video::IVideoDriver *driver = RenderingEngine::get_video_driver();
@@ -593,7 +593,7 @@ void GUIEngine::updateTopLeftTextSize()
}

/******************************************************************************/
s32 GUIEngine::playSound(SimpleSoundSpec spec, bool looped)
s32 GUIEngine::playSound(const SimpleSoundSpec &spec, bool looped)
{
s32 handle = m_sound_manager->playSound(spec, looped);
return handle;
@@ -247,7 +247,7 @@ class GUIEngine {
* @param layer draw layer to specify texture
* @param texturepath full path of texture to load
*/
bool setTexture(texture_layer layer, std::string texturepath,
bool setTexture(texture_layer layer, const std::string &texturepath,
bool tile_image, unsigned int minsize);

/**
@@ -296,7 +296,7 @@ class GUIEngine {
clouddata m_cloud;

/** start playing a sound and return handle */
s32 playSound(SimpleSoundSpec spec, bool looped);
s32 playSound(const SimpleSoundSpec &spec, bool looped);
/** stop playing a sound started with playSound() */
void stopSound(s32 handle);

@@ -86,7 +86,7 @@ inline u32 clamp_u8(s32 value)
GUIFormSpecMenu::GUIFormSpecMenu(JoystickController *joystick,
gui::IGUIElement *parent, s32 id, IMenuManager *menumgr,
Client *client, ISimpleTextureSource *tsrc, IFormSource *fsrc, TextDest *tdst,
std::string formspecPrepend,
const std::string &formspecPrepend,
bool remap_dbl_click):
GUIModalMenu(RenderingEngine::get_gui_env(), parent, id, menumgr),
m_invmgr(client),
@@ -287,7 +287,7 @@ class GUIFormSpecMenu : public GUIModalMenu
ISimpleTextureSource *tsrc,
IFormSource* fs_src,
TextDest* txt_dst,
std::string formspecPrepend,
const std::string &formspecPrepend,
bool remap_dbl_click = true);

~GUIFormSpecMenu();
@@ -93,7 +93,7 @@ void InventoryLocation::deSerialize(std::istream &is)
}
}

void InventoryLocation::deSerialize(std::string s)
void InventoryLocation::deSerialize(const std::string &s)
{
std::istringstream is(s, std::ios::binary);
deSerialize(is);
@@ -97,7 +97,7 @@ struct InventoryLocation
std::string dump() const;
void serialize(std::ostream &os) const;
void deSerialize(std::istream &is);
void deSerialize(std::string s);
void deSerialize(const std::string &s);
};

struct InventoryAction;
@@ -1717,7 +1717,7 @@ bool ServerMap::loadFromFolders() {
return false;
}

void ServerMap::createDirs(std::string path)
void ServerMap::createDirs(const std::string &path)
{
if (!fs::CreateAllDirs(path)) {
m_dout<<"ServerMap: Failed to create directory "
@@ -389,7 +389,7 @@ class ServerMap : public Map
Misc. helper functions for fiddling with directory and file
names when saving
*/
void createDirs(std::string path);
void createDirs(const std::string &path);
// returns something like "map/sectors/xxxxxxxx"
std::string getSectorDir(v2s16 pos, int layout = 2);
// dirname: final directory name
@@ -3207,7 +3207,7 @@ bool Server::hudSetHotbarItemcount(RemotePlayer *player, s32 hotbar_itemcount)
return true;
}

void Server::hudSetHotbarImage(RemotePlayer *player, std::string name)
void Server::hudSetHotbarImage(RemotePlayer *player, const std::string &name)
{
if (!player)
return;
@@ -3216,7 +3216,7 @@ void Server::hudSetHotbarImage(RemotePlayer *player, std::string name)
SendHUDSetParam(player->getPeerId(), HUD_PARAM_HOTBAR_IMAGE, name);
}

void Server::hudSetHotbarSelectedImage(RemotePlayer *player, std::string name)
void Server::hudSetHotbarSelectedImage(RemotePlayer *player, const std::string &name)
{
if (!player)
return;
@@ -296,8 +296,8 @@ class Server : public con::PeerHandler, public MapEventReceiver,
bool hudChange(RemotePlayer *player, u32 id, HudElementStat stat, void *value);
bool hudSetFlags(RemotePlayer *player, u32 flags, u32 mask);
bool hudSetHotbarItemcount(RemotePlayer *player, s32 hotbar_itemcount);
void hudSetHotbarImage(RemotePlayer *player, std::string name);
void hudSetHotbarSelectedImage(RemotePlayer *player, std::string name);
void hudSetHotbarImage(RemotePlayer *player, const std::string &name);
void hudSetHotbarSelectedImage(RemotePlayer *player, const std::string &name);

Address getPeerAddress(session_t peer_id);

@@ -149,6 +149,8 @@ void Translations::loadTranslation(const std::string &data)
<< wide_to_utf8(oword1) << "\"" << std::endl;
}

m_translations[textdomain + L"|" + oword1] = oword2;
std::wstring translation_index = textdomain + L"|";
translation_index.append(oword1);
m_translations[translation_index] = oword2;
}
}
@@ -152,7 +152,7 @@ void TestAreaStore::testSerialization()
1 + 2 +
6 + 6 + 2 + 6 +
6 + 6 + 2 + 6);
UASSERTEQ(std::string, str, str_wanted);
UASSERTEQ(const std::string &, str, str_wanted);

std::istringstream is(str);
store.deserialize(is);

0 comments on commit eb2bda7

Please sign in to comment.
You can’t perform that action at this time.