Green-Sky/crdt_tests
1
0
Fork 0
mirror of https://github.com/Green-Sky/crdt_tests.git synced 2024-12-22 15:53:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

forgot to clear buffer

Browse Source
This commit is contained in:
Green Sky 2022-12-20 19:15:32 +01:00
parent ed72b27808
commit 05fd0940ea
No known key found for this signature in database
1 changed files with 45 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
vim_research/test2.cpp
View File

@ -515,39 +515,55 @@ void toxThread(SharedContext* ctx) {
{ // pump from buffer to staging { // pump from buffer to staging
const size_t max_commands = 1; const size_t max_commands = 1;
size_t number_of_commands_done = 0; size_t number_of_commands_done = 0;
std::lock_guard lg_staging{ctx->staging_mutex}; std::vector<Agent> empty_buffers;
for (auto& [agent, buffer] : ctx->buffer) { {
if (agent == agent_local) { std::lock_guard lg_staging{ctx->staging_mutex};
// skip ? self for (auto& [agent, buffer] : ctx->buffer) {
continue; if (agent == agent_local) {
} // skip ? self
if (number_of_commands_done >= max_commands) { continue;
break; }
}
// determain the seq we are looking for in buffer
uint64_t seq {0};
if (ctx->staging_frontier.count(agent)) {
seq = ctx->staging_frontier.at(agent) + 1;
}
if (!buffer.count(seq)) { // not in buffer, skip
continue;
}
// this can lead to dead locks, if other code does this wrong
std::lock_guard lg{ctx->command_lists_mutex};
for (; buffer.count(seq); seq++) {
ctx->command_lists[agent][seq] = buffer.at(seq);
number_of_commands_done++;
if (number_of_commands_done >= max_commands) { if (number_of_commands_done >= max_commands) {
break; break;
} }
}
ctx->staging_frontier[agent] = seq; // determain the seq we are looking for in buffer
ctx->should_gossip_remote.emplace(agent); uint64_t seq {0};
if (ctx->staging_frontier.count(agent)) {
seq = ctx->staging_frontier.at(agent) + 1;
}
if (!buffer.count(seq)) { // not in buffer, skip
continue;
}
std::vector<uint64_t> seq_to_remove;
{ // this can lead to dead locks, if other code does this wrong
std::lock_guard lg{ctx->command_lists_mutex};
for (; buffer.count(seq); seq++) {
ctx->command_lists[agent][seq] = buffer.at(seq);
seq_to_remove.push_back(seq);
number_of_commands_done++;
if (number_of_commands_done >= max_commands) {
break;
}
}
ctx->staging_frontier[agent] = seq;
}
ctx->should_gossip_remote.emplace(agent);
for (const auto key : seq_to_remove) {
buffer.erase(key);
}
if (buffer.empty()) {
empty_buffers.push_back(agent);
}
}
} // scope for staging lock
for (const auto& agent : empty_buffers) {
ctx->buffer.erase(agent);
} }
} }