added first draft for keepalive and discovery

1 files changed, 18 insertions, 9 deletions

diff --git a/src/kernel/dnbd3.h b/src/kernel/dnbd3.h
index 7ad6b2f..57f26f6 100644
--- a/src/kernel/dnbd3.h
+++ b/src/kernel/dnbd3.h
@@ -33,22 +33,27 @@
 
 #define NUMBER_CONNECTIONS 4
 
-typedef struct dnbd3_server_t {
+typedef struct dnbd3_server {
 	dnbd3_host_t host;
 	uint64_t rtts[4];		// Last four round trip time measurements in microsecond
 	uint16_t protocol_version;	// dnbd3 protocol version of this server
 	uint8_t failures;			// How many times the server was unreachable
-} dnbd3_server_t;
+} dnbd3_server;
 
 
 typedef struct dnbd3_sock {
 	struct socket *sock;
 	struct mutex lock;
 	struct request *pending;
-	struct dnbd3_server_t *server;
+	struct dnbd3_server *server;
+	uint32_t heartbeat_count;
+	uint8_t panic, discover, panic_count;
+//	struct dnbd3_device *container_of;
+	struct work_struct keepalive;
+	struct timer_list keepalive_timer;
 } dnbd3_sock;
 
-typedef struct dnbd3_device_t {
+typedef struct dnbd3_device {
 	int minor;
 	struct blk_mq_tag_set tag_set;
 	struct list_head list;
@@ -59,28 +64,32 @@ typedef struct dnbd3_device_t {
 	// sysfs
 	struct kobject kobj;
 
+	struct mutex device_lock;
+
 	// network
 	dnbd3_sock socks[NUMBER_CONNECTIONS];
 	char *imgname;
 //	struct socket *sock;
 //	struct mutex socket_lock;
 //	struct request *pending;
-	dnbd3_server_t initial_server;
+	dnbd3_server initial_server;
 //	dnbd3_server_t cur_server, initial_server;
 //	uint64_t cur_rtt;
 //	serialized_buffer_t payload_buffer;
-	dnbd3_server_t alt_servers[NUMBER_SERVERS]; // array of alt servers
+	dnbd3_server alt_servers[NUMBER_SERVERS]; // array of alt servers
 	int new_servers_num;	// number of new alt servers that are waiting to be copied to above array
 	dnbd3_server_entry_t new_servers[NUMBER_SERVERS]; // pending new alt servers
 //	uint8_t discover, panic, disconnecting, update_available, panic_count;
 	uint8_t update_available;
 	uint8_t use_server_provided_alts;
 	uint16_t rid;
-	uint32_t heartbeat_count;
+//	uint32_t heartbeat_count;
 	uint64_t reported_size;
 	// server switch
 //	struct socket *better_sock;
 
+	struct work_struct discovery; // if in irq and need to send request
+	struct timer_list discovery_timer;
 
 	// process
 //	struct task_struct * thread_send;
@@ -93,11 +102,11 @@ typedef struct dnbd3_device_t {
 //	struct list_head request_queue_send;
 //	struct list_head request_queue_receive;
 
-} dnbd3_device_t;
+} dnbd3_device;
 
 
 typedef struct dnbd3_cmd {
-	struct dnbd3_device_t *dnbd3;
+	struct dnbd3_device *dnbd3;
 	struct mutex lock;
 	int index;
 	int cookie;