From 3dcda423a8c3bfeacdb11cf164a717ce7ca78572 Mon Sep 17 00:00:00 2001
From: Frederic Robra
Date: Tue, 13 Aug 2019 15:13:04 +0200
Subject: changed strategy to connect to diffrent sockets

---
 src/kernel/sysfs.c | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

(limited to 'src/kernel/sysfs.c')

diff --git a/src/kernel/sysfs.c b/src/kernel/sysfs.c
index 1588dfb..490ffbd 100644
--- a/src/kernel/sysfs.c
+++ b/src/kernel/sysfs.c
@@ -46,18 +46,18 @@ ssize_t show_connected_servers(char *buf, struct dnbd3_device *dev)
 		if (dev->socks[i].sock) {
 			if (dev->socks[i].server->host.type == HOST_IP4) {
 				ret = MIN(snprintf(buf, size, "%pI4,%d,%llu,%d\n",
-									dev->socks[i].server->host.addr,
-				                   (int)ntohs(dev->socks[i].server->host.port),
-				                   (unsigned long long)((dev->socks[i].server->rtts[0] + dev->socks[i].server->rtts[1] + dev->socks[i].server->rtts[2] + dev->socks[i].server->rtts[3]) / 4),
-				                   (int)dev->socks[i].server->failures)
+						dev->socks[i].server->host.addr,
+				                (int)ntohs(dev->socks[i].server->host.port),
+						dev->socks[i].server->avg_rtt,
+						(int)dev->socks[i].server->failures)
 				          , size);
 
 			} else {
 				ret = MIN(snprintf(buf, size, "%pI6,%d,%llu,%d\n",
-									dev->socks[i].server->host.addr,
-				                   (int)ntohs(dev->socks[i].server->host.port),
-				                   (unsigned long long)((dev->socks[i].server->rtts[0] + dev->socks[i].server->rtts[1] + dev->socks[i].server->rtts[2] + dev->socks[i].server->rtts[3]) / 4),
-				                   (int)dev->socks[i].server->failures)
+						dev->socks[i].server->host.addr,
+						(int)ntohs(dev->socks[i].server->host.port),
+						dev->socks[i].server->avg_rtt,
+						(int)dev->socks[i].server->failures)
 				          , size);
 
 			}
@@ -81,9 +81,10 @@ ssize_t show_connected_servers(char *buf, struct dnbd3_device *dev)
 ssize_t show_alt_server_num(char *buf, struct dnbd3_device *dev)
 {
 	int i, num = 0;
-	for (i = 0; i < NUMBER_SERVERS; ++i)
-	{
-		if (dev->alt_servers[i].host.type) ++num;
+	for (i = 0; i < NUMBER_SERVERS; i++) {
+		if (dev->alt_servers[i].host.type) {
+			num++;
+		}
 	}
 	return MIN(snprintf(buf, PAGE_SIZE, "%d\n", num), PAGE_SIZE);
 }
@@ -91,28 +92,27 @@ ssize_t show_alt_server_num(char *buf, struct dnbd3_device *dev)
 ssize_t show_alt_servers(char *buf, struct dnbd3_device *dev)
 {
 	int i, size = PAGE_SIZE, ret;
-	for (i = 0; i < NUMBER_SERVERS; ++i)
-	{
-		if (dev->alt_servers[i].host.type == HOST_IP4)
+	for (i = 0; i < NUMBER_SERVERS; ++i) {
+		if (dev->alt_servers[i].host.type == HOST_IP4) {
 			ret = MIN(snprintf(buf, size, "%pI4,%d,%llu,%d\n",
 			                   dev->alt_servers[i].host.addr,
 			                   (int)ntohs(dev->alt_servers[i].host.port),
-			                   (unsigned long long)((dev->alt_servers[i].rtts[0] + dev->alt_servers[i].rtts[1] + dev->alt_servers[i].rtts[2] + dev->alt_servers[i].rtts[3]) / 4),
+					   dev->alt_servers[i].avg_rtt,
 			                   (int)dev->alt_servers[i].failures)
 			          , size);
-		else if (dev->alt_servers[i].host.type == HOST_IP6)
+		} else if (dev->alt_servers[i].host.type == HOST_IP6) {
 			ret = MIN(snprintf(buf, size, "%pI6,%d,%llu,%d\n",
 			                   dev->alt_servers[i].host.addr,
 			                   (int)ntohs(dev->alt_servers[i].host.port),
-			                   (unsigned long long)((dev->alt_servers[i].rtts[0] + dev->alt_servers[i].rtts[1] + dev->alt_servers[i].rtts[2] + dev->alt_servers[i].rtts[3]) / 4),
+					   dev->alt_servers[i].avg_rtt,
 			                   (int)dev->alt_servers[i].failures)
 			          , size);
-		else
+		} else {
 			continue;
+		}
 		size -= ret;
 		buf += ret;
-		if (size <= 0)
-		{
+		if (size <= 0) {
 			size = 0;
 			break;
 		}
-- 
cgit v1.2.3-55-g7522