godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #94984 from Faless/mp/fix_safer_cache_cleanup 

[MP] Partially revert cache cleanup, track paths as fallback
This commit is contained in:
Rémi Verschelde 2024-07-31 22:33:07 +02:00
parent 8460a72f94 90d5d26026
commit 019cf2b40c
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 33 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
modules/multiplayer/scene_cache_interface.cpp
View File

@ -54,11 +54,14 @@ void SceneCacheInterface::_remove_node_cache(ObjectID p_oid) {
if (nc->cache_id) { if (nc->cache_id) {
assigned_ids.erase(nc->cache_id); assigned_ids.erase(nc->cache_id);
} }
#if 0
// TODO: Find a way to cleanup recv_nodes without breaking visibility and RPCs interactions.
for (KeyValue<int, int> &E : nc->recv_ids) { for (KeyValue<int, int> &E : nc->recv_ids) {
PeerInfo *pinfo = peers_info.getptr(E.key); PeerInfo *pinfo = peers_info.getptr(E.key);
ERR_CONTINUE(!pinfo); ERR_CONTINUE(!pinfo);
pinfo->recv_nodes.erase(E.value); pinfo->recv_nodes.erase(E.value);
} }
#endif
for (KeyValue<int, bool> &E : nc->confirmed_peers) { for (KeyValue<int, bool> &E : nc->confirmed_peers) {
PeerInfo *pinfo = peers_info.getptr(E.key); PeerInfo *pinfo = peers_info.getptr(E.key);
ERR_CONTINUE(!pinfo); ERR_CONTINUE(!pinfo);
@ -73,9 +76,12 @@ void SceneCacheInterface::on_peer_change(int p_id, bool p_connected) {
} else { } else {
PeerInfo *pinfo = peers_info.getptr(p_id); PeerInfo *pinfo = peers_info.getptr(p_id);
ERR_FAIL_NULL(pinfo); // Bug. ERR_FAIL_NULL(pinfo); // Bug.
for (KeyValue<int, ObjectID> E : pinfo->recv_nodes) { for (KeyValue<int, RecvNode> E : pinfo->recv_nodes) {
NodeCache *nc = nodes_cache.getptr(E.value); NodeCache *nc = nodes_cache.getptr(E.value.oid);
ERR_CONTINUE(!nc); if (!nc) {
// Node might have already been deleted locally.
continue;
}
nc->recv_ids.erase(p_id); nc->recv_ids.erase(p_id);
} }
for (const ObjectID &oid : pinfo->sent_nodes) { for (const ObjectID &oid : pinfo->sent_nodes) {
@ -115,7 +121,7 @@ void SceneCacheInterface::process_simplify_path(int p_from, const uint8_t *p_pac
ERR_PRINT("The rpc node checksum failed. Make sure to have the same methods on both nodes. Node path: " + path); ERR_PRINT("The rpc node checksum failed. Make sure to have the same methods on both nodes. Node path: " + path);
} }
peers_info[p_from].recv_nodes.insert(id, node->get_instance_id()); peers_info[p_from].recv_nodes.insert(id, RecvNode(node->get_instance_id(), path));
NodeCache &cache = _track(node); NodeCache &cache = _track(node);
cache.recv_ids.insert(p_from, id); cache.recv_ids.insert(p_from, id);
@ -269,14 +275,21 @@ bool SceneCacheInterface::send_object_cache(Object *p_obj, int p_peer_id, int &r
} }
Object *SceneCacheInterface::get_cached_object(int p_from, uint32_t p_cache_id) { Object *SceneCacheInterface::get_cached_object(int p_from, uint32_t p_cache_id) {
Node *root_node = SceneTree::get_singleton()->get_root()->get_node(multiplayer->get_root_path());
ERR_FAIL_NULL_V(root_node, nullptr);
PeerInfo *pinfo = peers_info.getptr(p_from); PeerInfo *pinfo = peers_info.getptr(p_from);
ERR_FAIL_NULL_V(pinfo, nullptr); ERR_FAIL_NULL_V(pinfo, nullptr);
const ObjectID *oid = pinfo->recv_nodes.getptr(p_cache_id); RecvNode *recv_node = pinfo->recv_nodes.getptr(p_cache_id);
ERR_FAIL_NULL_V_MSG(oid, nullptr, vformat("ID %d not found in cache of peer %d.", p_cache_id, p_from)); ERR_FAIL_NULL_V_MSG(recv_node, nullptr, vformat("ID %d not found in cache of peer %d.", p_cache_id, p_from));
Node *node = Object::cast_to<Node>(ObjectDB::get_instance(*oid)); Node *node = Object::cast_to<Node>(ObjectDB::get_instance(recv_node->oid));
if (!node) {
// Fallback to path lookup.
Node *root_node = SceneTree::get_singleton()->get_root()->get_node(multiplayer->get_root_path());
ERR_FAIL_NULL_V(root_node, nullptr);
node = root_node->get_node(recv_node->path);
if (node) {
recv_node->oid = node->get_instance_id();
}
}
ERR_FAIL_NULL_V_MSG(node, nullptr, vformat("Failed to get cached node from peer %d with cache ID %d.", p_from, p_cache_id)); ERR_FAIL_NULL_V_MSG(node, nullptr, vformat("Failed to get cached node from peer %d with cache ID %d.", p_from, p_cache_id));
return node; return node;
} }

12
modules/multiplayer/scene_cache_interface.h
View File

@ -49,8 +49,18 @@ private:
HashMap<int, bool> confirmed_peers; // peer id, confirmed HashMap<int, bool> confirmed_peers; // peer id, confirmed
}; };
struct RecvNode {
ObjectID oid;
NodePath path;
RecvNode(const ObjectID &p_oid, const NodePath &p_path) {
oid = p_oid;
path = p_path;
}
};
struct PeerInfo { struct PeerInfo {
HashMap<int, ObjectID> recv_nodes; // remote cache id, ObjectID HashMap<int, RecvNode> recv_nodes; // remote cache id, (ObjectID, NodePath)
HashSet<ObjectID> sent_nodes; HashSet<ObjectID> sent_nodes;
}; };