TheCloud/dwarfs
1
0
Fork 0
mirror of https://github.com/mhx/dwarfs.git synced 2025-09-11 05:23:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

refactor(fstypes): replace maps with sorted_array_map

Browse Source
This commit is contained in:
Marcus Holland-Moritz 2025-03-15 11:40:16 +01:00
parent 1703bd17b5
commit 93ebef9c6d
1 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/fstypes.cpp
View File

@ -19,25 +19,25 @@
* along with dwarfs. If not, see <https://www.gnu.org/licenses/>. * along with dwarfs. If not, see <https://www.gnu.org/licenses/>.
*/ */
#include <map>
#include <sstream> #include <sstream>
#include <string> #include <string>
#include <string_view> #include <string_view>
#include <folly/Conv.h>
#include <fmt/format.h> #include <fmt/format.h>
#include <dwarfs/compression.h> #include <dwarfs/compression.h>
#include <dwarfs/fstypes.h> #include <dwarfs/fstypes.h>
#include <dwarfs/sorted_array_map.h>
namespace dwarfs { namespace dwarfs {
namespace { namespace {
using namespace std::string_view_literals;
// clang-format off // clang-format off
const std::map<section_type, std::string_view> sections{ constexpr sorted_array_map sections{
#define SECTION_TYPE_(x) {section_type::x, #x} #define SECTION_TYPE_(x) std::pair{section_type::x, #x ## sv}
SECTION_TYPE_(BLOCK), SECTION_TYPE_(BLOCK),
SECTION_TYPE_(METADATA_V2_SCHEMA), SECTION_TYPE_(METADATA_V2_SCHEMA),
SECTION_TYPE_(METADATA_V2), SECTION_TYPE_(METADATA_V2),
@ -46,8 +46,8 @@ const std::map<section_type, std::string_view> sections{
#undef SECTION_TYPE_ #undef SECTION_TYPE_
}; };
const std::map<compression_type, std::string_view> compressions { constexpr sorted_array_map compressions {
#define DWARFS_COMPRESSION_TYPE_(name, _) {compression_type::name, #name} #define DWARFS_COMPRESSION_TYPE_(name, _) std::pair{compression_type::name, #name ## sv}
#define DWARFS_COMMA_ , #define DWARFS_COMMA_ ,
DWARFS_COMPRESSION_TYPE_LIST(DWARFS_COMPRESSION_TYPE_, DWARFS_COMMA_) DWARFS_COMPRESSION_TYPE_LIST(DWARFS_COMPRESSION_TYPE_, DWARFS_COMMA_)
#undef DWARFS_COMPRESSION_TYPE_ #undef DWARFS_COMPRESSION_TYPE_
@ -55,22 +55,21 @@ const std::map<compression_type, std::string_view> compressions {
}; };
// clang-format on // clang-format on
template <typename HT> std::string get_default(auto const& map, auto key) {
std::string get_default(const HT& ht, const typename HT::key_type& key) { if (auto value = map.get(key)) {
if (auto it = ht.find(key); it != ht.end()) { return std::string{*value};
return folly::to<std::string>(it->second);
} }
return fmt::format("unknown ({})", static_cast<int>(key));
return folly::to<std::string>("unknown (", key, ")");
} }
} // namespace } // namespace
bool is_known_compression_type(compression_type type) { bool is_known_compression_type(compression_type type) {
return compressions.count(type) > 0; return compressions.contains(type);
} }
bool is_known_section_type(section_type type) { bool is_known_section_type(section_type type) {
return sections.count(type) > 0; return sections.contains(type);
} }
std::string get_compression_name(compression_type type) { std::string get_compression_name(compression_type type) {
@ -83,7 +82,7 @@ std::string get_section_name(section_type type) {
void section_header::dump(std::ostream& os) const { void section_header::dump(std::ostream& os) const {
os << "[V1] type=" << get_default(sections, type) << ", compression=" os << "[V1] type=" << get_default(sections, type) << ", compression="
<< get_default(compressions, static_cast<compression_type>(compression)) << get_compression_name(static_cast<compression_type>(compression))
<< ", length=" << length; << ", length=" << length;
} }
@ -98,7 +97,7 @@ void section_header_v2::dump(std::ostream& os) const {
<< "] num=" << number << "] num=" << number
<< ", type=" << get_default(sections, static_cast<section_type>(type)) << ", type=" << get_default(sections, static_cast<section_type>(type))
<< ", compression=" << ", compression="
<< get_default(compressions, static_cast<compression_type>(compression)) << get_compression_name(static_cast<compression_type>(compression))
<< ", length=" << length << ", length=" << length
<< ", checksum=" << fmt::format("{:#018x}", xxh3_64); << ", checksum=" << fmt::format("{:#018x}", xxh3_64);
} }