Green-Sky/solanaceae_message_fragment_store
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rename comp to avoid accidental double usage of the name

Browse Source
This commit is contained in:
Green Sky 2024-07-20 11:53:54 +02:00
parent b2b435bd1c
commit 1f2aaf1ee9
No known key found for this signature in database
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/solanaceae/message_fragment_store/message_fragment_store.cpp
View File

@ -94,7 +94,7 @@ void MessageFragmentStore::handleMessage(const Message3Handle& m) {
} }
// TODO: use fid, seving full fuid for every message consumes alot of memory (and heap frag) // TODO: use fid, seving full fuid for every message consumes alot of memory (and heap frag)
if (!m.all_of<Message::Components::Obj>()) { if (!m.all_of<Message::Components::MFSObj>()) {
std::cout << "MFS: new msg missing Object\n"; std::cout << "MFS: new msg missing Object\n";
if (!m.registry()->ctx().contains<Message::Contexts::OpenFragments>()) { if (!m.registry()->ctx().contains<Message::Contexts::OpenFragments>()) {
m.registry()->ctx().emplace<Message::Contexts::OpenFragments>(); m.registry()->ctx().emplace<Message::Contexts::OpenFragments>();
@ -232,7 +232,7 @@ void MessageFragmentStore::handleMessage(const Message3Handle& m) {
return; return;
} }
m.emplace_or_replace<Message::Components::Obj>(fragment_id); m.emplace_or_replace<Message::Components::MFSObj>(fragment_id);
// in this case we know the fragment needs an update // in this case we know the fragment needs an update
for (const auto& it : _frag_save_queue) { for (const auto& it : _frag_save_queue) {
@ -245,7 +245,7 @@ void MessageFragmentStore::handleMessage(const Message3Handle& m) {
return; // done return; // done
} }
const auto msg_fh = _os.objectHandle(m.get<Message::Components::Obj>().o); const auto msg_fh = _os.objectHandle(m.get<Message::Components::MFSObj>().o);
if (!static_cast<bool>(msg_fh)) { if (!static_cast<bool>(msg_fh)) {
std::cerr << "MFS error: fid in message is invalid\n"; std::cerr << "MFS error: fid in message is invalid\n";
return; // TODO: properly handle this case return; // TODO: properly handle this case
@ -336,7 +336,7 @@ void MessageFragmentStore::loadFragment(Message3Registry& reg, ObjectHandle fh)
} }
} }
new_real_msg.emplace_or_replace<Message::Components::Obj>(fh); new_real_msg.emplace_or_replace<Message::Components::MFSObj>(fh);
// dup check (hacky, specific to protocols) // dup check (hacky, specific to protocols)
Message3 dup_msg {entt::null}; Message3 dup_msg {entt::null};
@ -401,7 +401,7 @@ bool MessageFragmentStore::syncFragToStorage(ObjectHandle fh, Message3Registry&
for (auto it = msg_view.rbegin(), it_end = msg_view.rend(); it != it_end; it++) { for (auto it = msg_view.rbegin(), it_end = msg_view.rend(); it != it_end; it++) {
const Message3 m = *it; const Message3 m = *it;
if (!reg.all_of<Message::Components::Obj, Message::Components::ContactFrom, Message::Components::ContactTo>(m)) { if (!reg.all_of<Message::Components::MFSObj, Message::Components::ContactFrom, Message::Components::ContactTo>(m)) {
continue; continue;
} }
@ -411,7 +411,7 @@ bool MessageFragmentStore::syncFragToStorage(ObjectHandle fh, Message3Registry&
continue; continue;
} }
if (_frag_save_queue.front().id != reg.get<Message::Components::Obj>(m).o) { if (_frag_save_queue.front().id != reg.get<Message::Components::MFSObj>(m).o) {
continue; // not ours continue; // not ours
} }

4
src/solanaceae/message_fragment_store/message_fragment_store.hpp
View File

@ -24,7 +24,7 @@ namespace Message::Components {
// unused, consumes too much memory (highly compressable) // unused, consumes too much memory (highly compressable)
//using FUID = FragComp::ID; //using FUID = FragComp::ID;
struct Obj { struct MFSObj {
// message fragment's object // message fragment's object
Object o {entt::null}; Object o {entt::null};
}; };
@ -37,7 +37,7 @@ namespace Message::Components {
// every tick we check all cursers for this tag and continue // every tick we check all cursers for this tag and continue
// and remove once no fragment could be loaded anymore // and remove once no fragment could be loaded anymore
// (internal) // (internal)
struct TagCurserUnsatisfied {}; struct MFSCurserUnsatisfiedTag {};
} // Message::Components } // Message::Components