mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-10-04 06:11:02 +00:00
raistlin7447
33af0651b7
A user preset is read from its own file and flattened against the system preset it inherits. It cannot inherit another file of the same pass, because the presets being read only join the collection once they have all been read, so the files are independent of each other. load_presets splits the way the vendor cache load already does: resolve_user_preset reads and flattens one file and touches nothing shared, and commit_user_preset installs it, counts its errors, and does the file work a load can trigger (removing an unreadable preset, writing back a filament preset that named no compatible printer). Both callers now share resolve_then_commit, which holds the two-phase shape, works through the items in batches so what is held at once does not grow with how many there are, and gives each piece of a batch one CNumericLocalesSetter rather than one per file. It throws rather than commit a batch that a canceled task group of the caller left unresolved. A setter nested in another on the same thread does nothing while the locale is still "C", so one setter per piece of a batch covers every file in it, and each batch runs isolated, so a thread waiting on it picks up none of the caller's other work. A filament preset whose derived compatible printer cannot be written back still loads, with the failure counted. Loading 328 user presets goes from 105 to 34 ms on a 16-core desktop.
70 lines
1.8 KiB
C++
70 lines
1.8 KiB
C++
#include <catch2/catch_all.hpp>
|
|
|
|
#include <clocale>
|
|
|
|
#include "libslic3r/LocalesUtils.hpp"
|
|
|
|
using namespace Slic3r;
|
|
|
|
namespace {
|
|
|
|
// Switches this thread's numeric locale to one whose decimal separator is a comma,
|
|
// when the system has one installed.
|
|
struct CommaNumericLocale
|
|
{
|
|
#ifdef _WIN32
|
|
bool apply()
|
|
{
|
|
for (const char* name : { "de-DE", "German_Germany.1252" })
|
|
if (std::setlocale(LC_NUMERIC, name) != nullptr)
|
|
return true;
|
|
return false;
|
|
}
|
|
#else
|
|
locale_t locale { (locale_t) 0 };
|
|
bool apply()
|
|
{
|
|
for (const char* name : { "de_DE.UTF-8", "de_DE.utf8", "de_DE" })
|
|
if ((locale = newlocale(LC_NUMERIC_MASK, name, (locale_t) 0)) != (locale_t) 0) {
|
|
uselocale(locale);
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
// Freed once the setters around apply() have put the thread's own locale back.
|
|
~CommaNumericLocale()
|
|
{
|
|
if (locale != (locale_t) 0)
|
|
freelocale(locale);
|
|
}
|
|
#endif
|
|
};
|
|
|
|
} // namespace
|
|
|
|
TEST_CASE("a setter nested in another leaves the C locale in place for the outer one", "[LocalesUtils]")
|
|
{
|
|
CNumericLocalesSetter outer;
|
|
{
|
|
CNumericLocalesSetter inner;
|
|
CHECK(is_decimal_separator_point());
|
|
}
|
|
CHECK(is_decimal_separator_point());
|
|
}
|
|
|
|
TEST_CASE("a setter nested in another sets C again when the locale changed between them", "[LocalesUtils]")
|
|
{
|
|
CommaNumericLocale comma;
|
|
{
|
|
CNumericLocalesSetter outer;
|
|
if (! comma.apply())
|
|
SKIP("no locale with a comma decimal separator is installed");
|
|
REQUIRE_FALSE(is_decimal_separator_point());
|
|
{
|
|
CNumericLocalesSetter inner;
|
|
CHECK(is_decimal_separator_point());
|
|
}
|
|
CHECK_FALSE(is_decimal_separator_point());
|
|
}
|
|
}
|