Commit d8137120 authored by neverlord's avatar neverlord

merge

parents 1607fc4a f2735dea
This diff is collapsed.
benchmark {
akka {
loglevel = ERROR
actor.provider = "akka.remote.RemoteActorRefProvider"
remote {
untrusted-mode = on
remote-daemon-ack-timeout = 300s
netty {
connection-timeout = 1800s
}
}
}
}
pongServer { pongServer {
akka { akka {
loglevel = ERROR loglevel = ERROR
...@@ -9,8 +22,11 @@ pongServer { ...@@ -9,8 +22,11 @@ pongServer {
remote-daemon-ack-timeout = 300s remote-daemon-ack-timeout = 300s
netty { netty {
backoff-timeout = 0ms backoff-timeout = 0ms
connection-timeout = 300s connection-timeout = 1800s
hostname = "mobi10" read-timeout = 1800s
write-timeout = 10s
all-timeout = 1800s
#hostname = "mobi10"
port = 2244 port = 2244
} }
} }
......
...@@ -296,13 +296,18 @@ void client_mode(Iterator first, Iterator last) { ...@@ -296,13 +296,18 @@ void client_mode(Iterator first, Iterator last) {
for (size_t j = 0; j < remotes.size(); ++j) { for (size_t j = 0; j < remotes.size(); ++j) {
if (i != j) { if (i != j) {
auto& r = remotes[j]; auto& r = remotes[j];
send(remote_actors[i], send(remote_actors[i], atom("add_pong"), r.first, r.second);
atom("add_pong"), r.first, r.second); }
receive ( }
}
{ // collect {ok} messages
size_t i = 0;
size_t end = remote_actors.size() * (remote_actors.size() - 1);
receive_for(i, end) (
on(atom("ok")) >> []() { on(atom("ok")) >> []() {
}, },
on(atom("error"), arg_match) >> [&](const string& str) { on(atom("error"), arg_match) >> [&](string const& str) {
cout << "error on node " << i << ": " << str << endl; cout << "error: " << str << endl;
for (auto& x : remote_actors) { for (auto& x : remote_actors) {
send(x, atom("purge")); send(x, atom("purge"));
} }
...@@ -323,17 +328,16 @@ void client_mode(Iterator first, Iterator last) { ...@@ -323,17 +328,16 @@ void client_mode(Iterator first, Iterator last) {
} }
); );
} }
}
}
// kickoff // kickoff
//cout << "setup done" << endl; //cout << "setup done" << endl;
//cout << "kickoff, init value = " << init_value << endl; //cout << "kickoff, init value = " << init_value << endl;
for (auto& r : remote_actors) { for (auto& r : remote_actors) {
send(r, atom("kickoff"), init_value); send(r, atom("kickoff"), init_value);
} }
{ // collect {done} messages
size_t i = 0; size_t i = 0;
size_t num_pings = remote_actors.size() * (remote_actors.size() - 1); size_t end = remote_actors.size() * (remote_actors.size() - 1);
receive_for(i, num_pings) ( receive_for(i, end) (
on(atom("done")) >> []() { on(atom("done")) >> []() {
//cout << "...done..." << endl; //cout << "...done..." << endl;
}, },
...@@ -342,6 +346,7 @@ void client_mode(Iterator first, Iterator last) { ...@@ -342,6 +346,7 @@ void client_mode(Iterator first, Iterator last) {
throw std::logic_error(""); throw std::logic_error("");
} }
); );
}
await_all_others_done(); await_all_others_done();
} }
......
benchmarks/ActorCreation.scala benchmarks/ActorCreation.scala
benchmarks/Distributed.scala benchmarks/Distributed.scala
benchmarks/DistributedRemoteActors.scala
benchmarks/MailboxPerformance.scala benchmarks/MailboxPerformance.scala
benchmarks/Matching.scala benchmarks/Matching.scala
benchmarks/MixedCase.scala benchmarks/MixedCase.scala
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment