diff options
Diffstat (limited to 'src/kernel/net.c')
| -rw-r--r-- | src/kernel/net.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/kernel/net.c b/src/kernel/net.c index 8f71b5a..0cedb4c 100644 --- a/src/kernel/net.c +++ b/src/kernel/net.c @@ -204,9 +204,9 @@ static int dnbd3_compare_servers(const void *lhs, const void *rhs) { struct dnbd3_server *lhs_server = *((struct dnbd3_server **) lhs); struct dnbd3_server *rhs_server = *((struct dnbd3_server **) rhs); - l = lhs_server->host.type != 0 ? lhs_server->avg_rtt + l = lhs_server->host.type != 0 ? lhs_server->rating : RTT_UNREACHABLE * 2; - r = rhs_server->host.type != 0 ? rhs_server->avg_rtt + r = rhs_server->host.type != 0 ? rhs_server->rating : RTT_UNREACHABLE * 2; return l - r; } @@ -317,9 +317,9 @@ static int dnbd3_adjust_connections(struct dnbd3_device *dev) { j = 1; for (i = 1; i < dev->number_connections; i++) { if (servers[j]->host.type != 0 && - servers[j]->avg_rtt < RTT_UNKNOWN) { - if (RTT_FACTOR(plan[i - 1]->avg_rtt) > - servers[j]->avg_rtt) { + servers[j]->rating < RTT_UNKNOWN) { + if (RTT_FACTOR(plan[i - 1]->rating) > + servers[j]->rating) { plan[i] = servers[j]; j++; } else { @@ -341,7 +341,7 @@ static int dnbd3_adjust_connections(struct dnbd3_device *dev) { for (i = 0; i < dev->number_connections; i++) { debug_server(dev, plan[i], "server %d with avg rtt %llu:", - i, plan[i]->avg_rtt); + i, plan[i]->rating); mutex_lock(&dev->socks[i].tx_lock); } @@ -497,10 +497,10 @@ static int dnbd3_meassure_rtt(struct dnbd3_device *dev, error: sock.server->rtts[dev->discovery_count % 4] = rtt; - sock.server->avg_rtt = dnbd3_average_rtt(sock.server); + sock.server->rating = dnbd3_rating(sock.server); debug_sock(&sock, "meassured rrt: %llu; avg_rtt: %llu", rtt, - sock.server->avg_rtt); + sock.server->rating); if (result <= 0) { server->failures++; } |