mirror of
https://github.com/minetest/minetest.git
synced 2024-09-20 15:30:46 +03:00
eb2bda7d0b
* 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.
157 lines
3.9 KiB
C++
157 lines
3.9 KiB
C++
/*
|
|
Minetest
|
|
Copyright (C) 2017 Nore, Nathanaël Courant <nore@mesecons.net>
|
|
|
|
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 "translation.h"
|
|
#include "log.h"
|
|
#include "util/string.h"
|
|
|
|
static Translations main_translations;
|
|
Translations *g_translations = &main_translations;
|
|
|
|
Translations::~Translations()
|
|
{
|
|
clear();
|
|
}
|
|
|
|
void Translations::clear()
|
|
{
|
|
m_translations.clear();
|
|
}
|
|
|
|
const std::wstring &Translations::getTranslation(
|
|
const std::wstring &textdomain, const std::wstring &s)
|
|
{
|
|
std::wstring key = textdomain + L"|" + s;
|
|
try {
|
|
return m_translations.at(key);
|
|
} catch (const std::out_of_range &) {
|
|
verbosestream << "Translations: can't find translation for string \""
|
|
<< wide_to_utf8(s) << "\" in textdomain \""
|
|
<< wide_to_utf8(textdomain) << "\"" << std::endl;
|
|
// Silence that warning in the future
|
|
m_translations[key] = s;
|
|
return s;
|
|
}
|
|
}
|
|
|
|
void Translations::loadTranslation(const std::string &data)
|
|
{
|
|
std::istringstream is(data);
|
|
std::wstring textdomain;
|
|
std::string line;
|
|
|
|
while (is.good()) {
|
|
std::getline(is, line);
|
|
// Trim last character if file was using a \r\n line ending
|
|
if (line.length () > 0 && line[line.length() - 1] == '\r')
|
|
line.resize(line.length() - 1);
|
|
|
|
if (str_starts_with(line, "# textdomain:")) {
|
|
textdomain = utf8_to_wide(trim(str_split(line, ':')[1]));
|
|
}
|
|
if (line.empty() || line[0] == '#')
|
|
continue;
|
|
|
|
std::wstring wline = utf8_to_wide(line);
|
|
if (wline.empty())
|
|
continue;
|
|
|
|
// Read line
|
|
// '=' marks the key-value pair, but may be escaped by an '@'.
|
|
// '\n' may also be escaped by '@'.
|
|
// All other escapes are preserved.
|
|
|
|
size_t i = 0;
|
|
std::wostringstream word1, word2;
|
|
while (i < wline.length() && wline[i] != L'=') {
|
|
if (wline[i] == L'@') {
|
|
if (i + 1 < wline.length()) {
|
|
if (wline[i + 1] == L'=') {
|
|
word1.put(L'=');
|
|
} else if (wline[i + 1] == L'n') {
|
|
word1.put(L'\n');
|
|
} else {
|
|
word1.put(L'@');
|
|
word1.put(wline[i + 1]);
|
|
}
|
|
i += 2;
|
|
} else {
|
|
// End of line, go to the next one.
|
|
word1.put(L'\n');
|
|
if (!is.good()) {
|
|
break;
|
|
}
|
|
i = 0;
|
|
std::getline(is, line);
|
|
wline = utf8_to_wide(line);
|
|
}
|
|
} else {
|
|
word1.put(wline[i]);
|
|
i++;
|
|
}
|
|
}
|
|
|
|
if (i == wline.length()) {
|
|
errorstream << "Malformed translation line \"" << line << "\""
|
|
<< std::endl;
|
|
continue;
|
|
}
|
|
i++;
|
|
|
|
while (i < wline.length()) {
|
|
if (wline[i] == L'@') {
|
|
if (i + 1 < wline.length()) {
|
|
if (wline[i + 1] == L'=') {
|
|
word2.put(L'=');
|
|
} else if (wline[i + 1] == L'n') {
|
|
word2.put(L'\n');
|
|
} else {
|
|
word2.put(L'@');
|
|
word2.put(wline[i + 1]);
|
|
}
|
|
i += 2;
|
|
} else {
|
|
// End of line, go to the next one.
|
|
word2.put(L'\n');
|
|
if (!is.good()) {
|
|
break;
|
|
}
|
|
i = 0;
|
|
std::getline(is, line);
|
|
wline = utf8_to_wide(line);
|
|
}
|
|
} else {
|
|
word2.put(wline[i]);
|
|
i++;
|
|
}
|
|
}
|
|
|
|
std::wstring oword1 = word1.str(), oword2 = word2.str();
|
|
if (oword2.empty()) {
|
|
oword2 = oword1;
|
|
errorstream << "Ignoring empty translation for \""
|
|
<< wide_to_utf8(oword1) << "\"" << std::endl;
|
|
}
|
|
|
|
std::wstring translation_index = textdomain + L"|";
|
|
translation_index.append(oword1);
|
|
m_translations[translation_index] = oword2;
|
|
}
|
|
}
|