admin/simdjson-simdjson
1
0
Fork 0
mirror of https://github.com/simdjson/simdjson synced 2026-06-08 17:27:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use static variables to enforce initialization order. (#1773) (#1777)

Browse Source 
Fixes https://github.com/simdjson/simdjson/issues/1771

Co-authored-by: Hao Chen <chenhao.yalier@gmail.com>
This commit is contained in:
Daniel Lemire
2022-01-03 15:54:57 -05:00
committed by GitHub
parent 3a93e45dd1
commit c6f9c93c33
26 changed files with 300 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/json2json.cpp
+1 -1
View File
@@ -22,7 +22,7 @@ int main(int argc, const char *argv[]) {
std::string progUsage = "json2json version ";
progUsage += SIMDJSON_STRINGIFY(SIMDJSON_VERSION);
progUsage += " (";
progUsage += simdjson::active_implementation->name();
progUsage += simdjson::get_active_implementation()->name();
progUsage += ")\n";
progUsage += "Reads json in, out the result of the parsing.\n";
progUsage += argv[0];
tools/minify.cpp
+4 -4
View File
@@ -31,7 +31,7 @@ int main(int argc, const char *argv[]) {
std::stringstream ss;
ss << "Parser implementation (by default, detects the most advanced implementation supported on the host machine)." << std::endl;
ss << "Available parser implementations:" << std::endl;
for (auto impl : simdjson::available_implementations) {
for (auto impl : simdjson::get_available_implementations()) {
if(impl->supported_by_runtime_system()) {
ss << "-a " << std::left << std::setw(9) << impl->name() << " - Use the " << impl->description() << " parser implementation." << std::endl;
}
@@ -55,7 +55,7 @@ int main(int argc, const char *argv[]) {
return EXIT_FAILURE;
}
if(result.count("arch")) {
const simdjson::implementation *impl = simdjson::available_implementations[result["arch"].as<std::string>().c_str()];
const simdjson::implementation *impl = simdjson::get_available_implementations()[result["arch"].as<std::string>().c_str()];
if(!impl) {
usage("Unsupported implementation.");
return EXIT_FAILURE;
@@ -64,7 +64,7 @@ int main(int argc, const char *argv[]) {
usage("The selected implementation does not match your current CPU.");
return EXIT_FAILURE;
}
simdjson::active_implementation = impl;
simdjson::get_active_implementation() = impl;
}
std::string filename = result["file"].as<std::string>();
@@ -77,7 +77,7 @@ int main(int argc, const char *argv[]) {
}
simdjson::padded_string copy(p.length()); // does not need to be padded after all!
size_t copy_len;
error = simdjson::active_implementation->minify((const uint8_t*)p.data(), p.length(), (uint8_t*)copy.data(), copy_len);
error = simdjson::get_active_implementation()->minify((const uint8_t*)p.data(), p.length(), (uint8_t*)copy.data(), copy_len);
if (error) { std::cerr << error << std::endl; return EXIT_FAILURE; }
printf("%s", copy.data());
return EXIT_SUCCESS;