livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace FSUUIDHash with LL implementation for unordered containers

master
Ansariel 2025-06-09 21:55:10 +02:00
parent d14acbb2b0
commit 22afbf9991
7 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
indra/llcommon/lluuid.h
View File

@ -246,14 +246,4 @@ inline size_t hash_value(const LLUUID& id) noexcept
return (size_t)id.getDigest64();
}
// <FS:Ansariel> UUID hash calculation
struct FSUUIDHash
{
inline size_t operator() (const LLUUID& id) const
{
return *reinterpret_cast<const size_t*>(id.mData);
}
};
// </FS:Ansariel> UUID hash calculation
#endif // LL_LLUUID_H

4
indra/newview/NACLantispam.h
View File

@ -66,8 +66,8 @@ private:
bool mBlocked;
};
typedef std::unordered_map<LLUUID, NACLAntiSpamQueueEntry*, FSUUIDHash> spam_queue_entry_map_t;
typedef std::unordered_set<LLUUID, FSUUIDHash> collision_sound_set_t;
typedef std::unordered_map<LLUUID, NACLAntiSpamQueueEntry*> spam_queue_entry_map_t;
typedef std::unordered_set<LLUUID> collision_sound_set_t;
class NACLAntiSpamQueue
{

4
indra/newview/fsassetblacklist.h
View File

@ -35,9 +35,9 @@
#include "llsingleton.h"
#include "llassettype.h"
using blacklisted_uuid_container_t = std::unordered_set<LLUUID, FSUUIDHash>;
using blacklisted_uuid_container_t = std::unordered_set<LLUUID>;
using blacklist_type_map_t = std::map<LLAssetType::EType, blacklisted_uuid_container_t>;
using blacklist_data_t = std::unordered_map<LLUUID, LLSD, FSUUIDHash>;
using blacklist_data_t = std::unordered_map<LLUUID, LLSD>;
class FSAssetBlacklist : public LLSingleton<FSAssetBlacklist>
{

4
indra/newview/fsradar.h
View File

@ -63,7 +63,7 @@ class FSRadar
virtual ~FSRadar();
public:
typedef std::unordered_map<const LLUUID, std::shared_ptr<FSRadarEntry>, FSUUIDHash> entry_map_t;
typedef std::unordered_map<LLUUID, std::shared_ptr<FSRadarEntry>> entry_map_t;
entry_map_t getRadarList() { return mEntryList; }
void startTracking(const LLUUID& avatar_id);
@ -130,7 +130,7 @@ private:
bool lastIgnore;
};
typedef std::unordered_map<LLUUID, RadarFields, FSUUIDHash> radarfields_map_t;
typedef std::unordered_map<LLUUID, RadarFields> radarfields_map_t;
radarfields_map_t mLastRadarSweep;
entry_map_t mEntryList;

4
indra/newview/lggcontactsets.h
View File

@ -52,7 +52,7 @@ class LGGContactSets : public LLSingleton<LGGContactSets>
public:
typedef std::vector<std::string> string_vec_t;
typedef std::unordered_set<LLUUID, FSUUIDHash> uuid_set_t;
typedef std::unordered_set<LLUUID> uuid_set_t;
void loadFromDisk();
@ -157,7 +157,7 @@ private:
LLSD exportToLLSD();
void saveToDisk();
typedef std::unordered_map<LLUUID, std::string, FSUUIDHash> uuid_map_t;
typedef std::unordered_map<LLUUID, std::string> uuid_map_t;
typedef std::map<std::string, ContactSet*> contact_set_map_t;
contact_set_map_t mContactSets;

2
indra/newview/llpanelgroupgeneral.h
View File

@ -127,7 +127,7 @@ private:
S32 sortMembersList(S32,const LLScrollListItem*,const LLScrollListItem*);
LLGroupMgrGroupData::member_list_t::iterator mMemberProgress;
typedef std::unordered_map<LLUUID, boost::signals2::connection, FSUUIDHash> avatar_name_cache_connection_map_t;
typedef std::unordered_map<LLUUID, boost::signals2::connection> avatar_name_cache_connection_map_t;
avatar_name_cache_connection_map_t mAvatarNameCacheConnections;
bool mPendingMemberUpdate;

2
indra/newview/llperfstats.h
View File

@ -245,7 +245,7 @@ namespace LLPerfStats
static void updateMeanFrameTime(U64 tot_frame_time_raw);
// StatsArray is a uint64_t for each possible statistic type.
using StatsArray = std::array<uint64_t, static_cast<size_t>(LLPerfStats::StatType_t::STATS_COUNT)>;
using StatsMap = std::unordered_map<LLUUID, StatsArray, FSUUIDHash>; // <FS:Beq/>
using StatsMap = std::unordered_map<LLUUID, StatsArray>; // <FS:Beq/>
using StatsTypeMatrix = std::array<StatsMap, static_cast<size_t>(LLPerfStats::ObjType_t::OT_COUNT)>;
using StatsSummaryArray = std::array<StatsArray, static_cast<size_t>(LLPerfStats::ObjType_t::OT_COUNT)>;