IO-threads Cleanup: Change request queue into a struct list_head

This patch changes the per-thread request queue from a custom circular
linked list, into the standard list.h list which is easier to
understand and has a cleaner interface.

Signed-off-by: Anand V. Avati <avati@amp.gluster.com>

1 files changed, 8 insertions, 5 deletions

diff --git a/xlators/performance/io-threads/src/io-threads.h b/xlators/performance/io-threads/src/io-threads.h
index 7606d0625d5..73a76fa8fe2 100644
--- a/xlators/performance/io-threads/src/io-threads.h
+++ b/xlators/performance/io-threads/src/io-threads.h
@@ -32,13 +32,14 @@
 #include "dict.h"
 #include "xlator.h"
 #include "common-utils.h"
+#include "list.h"
 
 #define min(a,b) ((a)<(b)?(a):(b))
 #define max(a,b) ((a)>(b)?(a):(b))
 
 struct iot_conf;
 struct iot_worker;
-struct iot_queue;
+struct iot_request;
 struct iot_local;
 struct iot_file;
 
@@ -47,14 +48,16 @@ struct iot_local {
   size_t frame_size;
 };
 
-struct iot_queue {
-  struct iot_queue *next, *prev;
+struct iot_request {
+  struct list_head list;        /* Attaches this request to the list of
+                                   requests.
+                                   */
   call_stub_t *stub;
 };
 
 struct iot_worker {
   struct iot_worker *next, *prev;
-  struct iot_queue queue;
+  struct list_head rqlist;      /* List of requests assigned to me. */
   struct iot_conf *conf;
   int64_t q,dq;
   pthread_cond_t dq_cond;
@@ -85,6 +88,6 @@ typedef struct iot_file iot_file_t;
 typedef struct iot_conf iot_conf_t;
 typedef struct iot_local iot_local_t;
 typedef struct iot_worker iot_worker_t;
-typedef struct iot_queue iot_queue_t;
+typedef struct iot_request iot_request_t;
 
 #endif /* __IOT_H */