aboutsummaryrefslogtreecommitdiff
path: root/src/util/sha1.h
diff options
context:
space:
mode:
authorsfan5 <sfan5@live.de>2022-04-30 16:04:19 +0200
committersfan5 <sfan5@live.de>2022-05-14 18:33:42 +0200
commit1e7b5d6fdb09e08b024fe5461c12efee92032936 (patch)
treee3aa350cec142b4cb75cc58805f053d253fa6cdb /src/util/sha1.h
parenta55982e7f01c83d5289b8018754963299b9e9484 (diff)
downloadminetest-1e7b5d6fdb09e08b024fe5461c12efee92032936.tar.gz
minetest-1e7b5d6fdb09e08b024fe5461c12efee92032936.tar.bz2
minetest-1e7b5d6fdb09e08b024fe5461c12efee92032936.zip
Fix synchronization issue at thread start
If a newly started thread immediately exits then m_running would immediately be set to false again and the caller would be stuck waiting for m_running to become true forever. Since a mutex for synchronizing startup already exists we can simply move the while loop into it. see also: #5134 which introduced m_start_finished_mutex
Diffstat (limited to 'src/util/sha1.h')
0 files changed, 0 insertions, 0 deletions
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-11 02:50:45 +0000
s 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 <fstream> #include "content/content.h" #include "content/subgames.h" #include "content/mods.h" #include "filesys.h" #include "settings.h" enum ContentType { ECT_UNKNOWN, ECT_MOD, ECT_MODPACK, ECT_GAME, ECT_TXP }; ContentType getContentType(const ContentSpec &spec) { std::ifstream modpack_is((spec.path + DIR_DELIM + "modpack.txt").c_str()); if (modpack_is.good()) { modpack_is.close(); return ECT_MODPACK; } std::ifstream modpack2_is((spec.path + DIR_DELIM + "modpack.conf").c_str()); if (modpack2_is.good()) { modpack2_is.close(); return ECT_MODPACK; } std::ifstream init_is((spec.path + DIR_DELIM + "init.lua").c_str()); if (init_is.good()) { init_is.close(); return ECT_MOD; } std::ifstream game_is((spec.path + DIR_DELIM + "game.conf").c_str()); if (game_is.good()) { game_is.close(); return ECT_GAME; } std::ifstream txp_is((spec.path + DIR_DELIM + "texture_pack.conf").c_str()); if (txp_is.good()) { txp_is.close(); return ECT_TXP; } return ECT_UNKNOWN; } void parseContentInfo(ContentSpec &spec) { std::string conf_path; switch (getContentType(spec)) { case ECT_MOD: spec.type = "mod"; conf_path = spec.path + DIR_DELIM + "mod.conf"; break; case ECT_MODPACK: spec.type = "modpack"; conf_path = spec.path + DIR_DELIM + "modpack.conf"; break; case ECT_GAME: spec.type = "game"; conf_path = spec.path + DIR_DELIM + "game.conf"; break; case ECT_TXP: spec.type = "txp"; conf_path = spec.path + DIR_DELIM + "texture_pack.conf"; break; default: spec.type = "unknown"; break; } Settings conf; if (!conf_path.empty() && conf.readConfigFile(conf_path.c_str())) { if (conf.exists("name")) spec.name = conf.get("name"); if (conf.exists("description")) spec.desc = conf.get("description"); if (conf.exists("author")) spec.author = conf.get("author"); if (conf.exists("release")) spec.release = conf.getS32("release"); } if (spec.desc.empty()) { std::ifstream is((spec.path + DIR_DELIM + "description.txt").c_str()); spec.desc = std::string((std::istreambuf_iterator<char>(is)), std::istreambuf_iterator<char>()); } }