wbtiger
/
foundationdb
mirror of https://github.com/apple/foundationdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Simulation test now working

This commit is contained in:
Markus Pilman 2020-08-11 15:34:59 -06:00
parent acb151864b
commit a88d2f72e4
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fdbrpc/sim2.actor.cpp
View File

@ -1785,7 +1785,7 @@ class UDPSimSocket : public IUDPSocket, ReferenceCounted<UDPSimSocket> {
ACTOR static Future<Void> send(UDPSimSocket* self, Reference<UDPSimSocket> peerSocket, uint8_t const* begin,
uint8_t const* end) {
state Packet packet(std::make_shared<std::vector<uint8_t>>());
packet->resize(begin - end);
packet->resize(end - begin);
std::copy(begin, end, packet->begin());
wait( delay( .002 * deterministicRandom()->random01() ) );
peerSocket->recvBuffer.emplace_back(self->_localAddress, std::move(packet));
@ -1812,6 +1812,7 @@ public:
UDPSimSocket(NetworkAddress const& localAddress, Optional<NetworkAddress> const& peerAddress)
: id(deterministicRandom()->randomUniqueID()), process(g_simulator.getCurrentProcess()), peerAddress(peerAddress),
actors(false), _localAddress(localAddress) {
g_sim2.addressMap.emplace(_localAddress, process);
process->boundUDPSockets.emplace(localAddress, this);
}
~UDPSimSocket() {
@ -1821,7 +1822,10 @@ public:
}
actors.clear(true);
}
void close() override { process->boundUDPSockets.erase(_localAddress); }
void close() override {
process->boundUDPSockets.erase(_localAddress);
g_sim2.addressMap.erase(_localAddress);
}
UID getDebugID() const override { return id; }
void addref() override { ReferenceCounted<UDPSimSocket>::addref(); }
void delref() override { ReferenceCounted<UDPSimSocket>::delref(); }
@ -1897,9 +1901,11 @@ public:
return receiveFrom(this, begin, end, sender);
}
void bind(NetworkAddress const& addr) override {
g_sim2.addressMap.erase(_localAddress);
process->boundUDPSockets.erase(_localAddress);
process->boundUDPSockets.emplace(addr, Reference<UDPSimSocket>::addRef(this));
_localAddress = addr;
g_sim2.addressMap.emplace(_localAddress, process);
}
NetworkAddress localAddress() const override {

7
fdbserver/workloads/UDPWorkload.actor.cpp
View File

@ -157,7 +157,7 @@ struct UDPWorkload : TestWorkload {
}
when(NetworkAddress p = waitNext(self->toAck.getFuture())) {
peer = p;
packetString = BinaryWriter::toValue(ping(), IncludeVersion());
packetString = BinaryWriter::toValue(pong(), IncludeVersion());
self->acked[peer] += 1;
}
}
@ -206,7 +206,7 @@ struct UDPWorkload : TestWorkload {
actors.add(clientReceiver(self, socket.get(), socket.onChange()));
}
sendString = BinaryWriter::toValue(ping(), IncludeVersion());
int res = wait(socket.get()->sendTo(sendString.begin(), sendString.end(), peer));
int res = wait(socket.get()->send(sendString.begin(), sendString.end()));
ASSERT(res == sendString.size());
self->sent[peer] += 1;
}
@ -249,9 +249,6 @@ struct UDPWorkload : TestWorkload {
for (const auto& p : acked) {
totalAcked += p.second;
}
for (const auto& p : acked) {
totalAcked += p.second;
}
for (const auto& p : successes) {
totalSuccess += p.second;
}