From f49b63e11de50e72f85f8c6688da36d89bf17b87 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 16 Dec 2015 17:28:52 +0100
Subject: [SERVER] More fine grained locking for RPC; better error logging

---
 src/server/globals.h | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'src/server/globals.h')

diff --git a/src/server/globals.h b/src/server/globals.h
index 0bf34de..a06e0e0 100644
--- a/src/server/globals.h
+++ b/src/server/globals.h
@@ -118,13 +118,17 @@ struct _dnbd3_image
 
 struct _dnbd3_client
 {
+#define HOSTNAMELEN (48)
+	uint64_t bytesSent;    // Byte counter for this client. Use statsLock when accessing
+	dnbd3_image_t *image;
+	uint32_t tmpBytesSent; // Temporary byte counter that gets added to the global counter periodically. Use statsLock when accessing
 	int sock;
+	bool isServer;         // true if a server in proxy mode, false if real client
 	dnbd3_host_t host;
-	dnbd3_image_t *image;
-	uint64_t bytesSent;
-	pthread_spinlock_t lock;
+	char hostName[HOSTNAMELEN];
 	pthread_mutex_t sendMutex;
-	bool isServer;         // true if a server in proxy mode, false if real client
+	pthread_spinlock_t lock;
+	pthread_spinlock_t statsLock;
 };
 
 // #######################################################
-- 
cgit v1.2.3-55-g7522