mirror of
https://github.com/Green-Sky/crdt_tests.git
synced 2024-12-22 23:53:24 +01:00
minor bug fixing, now only need requests
This commit is contained in:
parent
05fd0940ea
commit
d845baf804
@ -534,6 +534,7 @@ void toxThread(SharedContext* ctx) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (!buffer.count(seq)) { // not in buffer, skip
|
if (!buffer.count(seq)) { // not in buffer, skip
|
||||||
|
std::cout << "!!! buffer not empty but not next seq\n";
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -969,8 +970,16 @@ int main(void) {
|
|||||||
seq = ctx.command_frontier[ctx.agent] + 1;
|
seq = ctx.command_frontier[ctx.agent] + 1;
|
||||||
}
|
}
|
||||||
const size_t max_ops {5}; // limit ops per command so we can fit them into packets
|
const size_t max_ops {5}; // limit ops per command so we can fit them into packets
|
||||||
for (size_t i = 0; i < ops.size(); i+=max_ops, seq++) {
|
size_t check_op_count {0};
|
||||||
std::vector<Doc::Op> tmp_ops {ops.cbegin()+i, ops.cbegin()+i+1};
|
for (size_t i = 0; i < ops.size(); seq++) {
|
||||||
|
// TODO: check
|
||||||
|
//size_t chunk_size = std::min(max_ops, ops.size()-i);
|
||||||
|
//std::vector<Doc::Op> tmp_ops {ops.cbegin()+i, ops.cbegin()+i+chunk_size};
|
||||||
|
std::vector<Doc::Op> tmp_ops;
|
||||||
|
for (auto it = ops.cbegin()+i; it != ops.cend() && tmp_ops.size() <= max_ops; it++) {
|
||||||
|
tmp_ops.push_back(*it);
|
||||||
|
}
|
||||||
|
|
||||||
assert(!tmp_ops.empty());
|
assert(!tmp_ops.empty());
|
||||||
|
|
||||||
local_command_list.emplace(seq, Command{
|
local_command_list.emplace(seq, Command{
|
||||||
@ -979,7 +988,11 @@ int main(void) {
|
|||||||
tmp_ops
|
tmp_ops
|
||||||
});
|
});
|
||||||
ctx.command_frontier[ctx.agent] = seq;
|
ctx.command_frontier[ctx.agent] = seq;
|
||||||
|
|
||||||
|
i += tmp_ops.size();
|
||||||
|
check_op_count += tmp_ops.size();
|
||||||
}
|
}
|
||||||
|
assert(check_op_count == ops.size());
|
||||||
}
|
}
|
||||||
ctx.should_gossip_local.store(true);
|
ctx.should_gossip_local.store(true);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user