Skip to content

use unordered_map instead of map for lookasides #5631

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ab9rf merged 1 commit into from
Nov 16, 2025
+36 −10
Merged

use unordered_map instead of map for lookasides #5631

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 36 additions & 10 deletions library/include/DataDefs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@ distribution.
#include <string>
#include <type_traits>
#include <utility>
#include <unordered_map>
#include <vector>
#include <functional>

#include "BitArray.h"
#include "Export.h"
Expand Down Expand Up @@ -136,8 +138,8 @@ namespace DFHack

class DFHACK_EXPORT compound_identity : public constructed_identity {
static std::list<const compound_identity*>* list;
static std::map<const compound_identity*, const compound_identity*>* parent_map;
static std::map<const compound_identity*, std::vector<const compound_identity*>>* children_map;
static std::unordered_map<const compound_identity*, const compound_identity*>* parent_map;
static std::unordered_map<const compound_identity*, std::vector<const compound_identity*>>* children_map;
static std::vector<const compound_identity*>* top_scope;

const char *dfhack_name;
Expand Down Expand Up @@ -204,7 +206,7 @@ namespace DFHack
class DFHACK_EXPORT enum_identity : public compound_identity {
public:
struct ComplexData {
std::map<int64_t, size_t> value_index_map;
std::unordered_map<int64_t, size_t> value_index_map;
std::vector<int64_t> index_value_map;
ComplexData(std::initializer_list<int64_t> values);
size_t size() const {
Expand Down Expand Up @@ -289,8 +291,8 @@ namespace DFHack
};

class DFHACK_EXPORT struct_identity : public compound_identity {
static std::map<const struct_identity*, const struct_identity*>* parent_map;
static std::map<const struct_identity*, std::vector<const struct_identity*>>* children_map;
static std::unordered_map<const struct_identity*, const struct_identity*>* parent_map;
static std::unordered_map<const struct_identity*, std::vector<const struct_identity*>>* children_map;

const struct_field_info *fields;

Expand Down Expand Up @@ -355,6 +357,30 @@ namespace DFHack
virtual void build_metatable(lua_State *state) const;
};

namespace
{
template<typename ... Bases>
struct overload : Bases ...
{
using is_transparent = void;
using Bases::operator() ...;
};

struct char_pointer_hash
{
auto operator()(const char* ptr) const noexcept
{
return std::hash<std::string_view>{}(ptr);
}
};

using transparent_string_hash = overload<
std::hash<std::string>,
std::hash<std::string_view>,
char_pointer_hash
>;
}

#ifdef _MSC_VER
using virtual_ptr = void*;
#else
Expand All @@ -367,13 +393,13 @@ namespace DFHack
class DFHACK_EXPORT virtual_identity : public struct_identity {
public:
using interpose_t = VMethodInterposeLinkBase*;
using interpose_list_t = std::map<int, interpose_t>;
using interpose_list_t = std::unordered_map<int, interpose_t>;

private:
static std::map<const std::string, const virtual_identity*, std::less<>> *name_lookup;
static std::map<void*, const virtual_identity*>* known;
static std::map<const virtual_identity*, void*>* vtable_ptr_map;
static std::map<const virtual_identity*, interpose_list_t>* interpose_list_map;
static std::unordered_map<std::string, const virtual_identity*, transparent_string_hash, std::equal_to<>> *name_lookup;
static std::unordered_map<void*, const virtual_identity*>* known;
static std::unordered_map<const virtual_identity*, void*>* vtable_ptr_map;
static std::unordered_map<const virtual_identity*, interpose_list_t>* interpose_list_map;

const char *original_name;

Expand Down