Changeset 9282

Timestamp:

04/18/12 09:22:25 (14 months ago)

Author:

sdsnyde

Message:

AIO waiting list bugs fixed. Async read/write interface fully functional, tested with up to 16 threads and 150 open files

Location:

branches/asyncio/src/client/usrint

Files:

• aiocommon.c (modified) (3 diffs)
• aiocommon.h (modified) (1 diff)

branches/asyncio/src/client/usrint/aiocommon.c

@@ -123 +123 @@
           pthread_mutex_lock(&waiting_list_mutex);
           qlist_add_tail(&(list[i]->link), aio_waiting_list);
+          list[i]->a_cb->__error_code = EINPROGRESS;
           gossip_debug(GOSSIP_USRINT_DEBUG, "%d AIO requests now waiting\n", 
                        qlist_count(aio_waiting_list));
@@ -240 +241 @@
    struct qlist_head *next_io;
    struct pvfs_aiocb *io_cb;
-   PVFS_sys_op_id ret_op_ids[PVFS_AIO_MAX_PROGRESS_OPS];
+   PVFS_sys_op_id ret_op_ids[PVFS_AIO_MAX_RUNNING];
    PVFS_sys_op_id temp_running_ops[PVFS_AIO_MAX_RUNNING] = {0};
-   int err_code_array[PVFS_AIO_MAX_PROGRESS_OPS] = {0};
-   struct pvfs_aiocb *aiocb_array[PVFS_AIO_MAX_PROGRESS_OPS] = {NULL};
+   int err_code_array[PVFS_AIO_MAX_RUNNING] = {0};
+   struct pvfs_aiocb *aiocb_array[PVFS_AIO_MAX_RUNNING] = {NULL};
 
    gossip_debug(GOSSIP_USRINT_DEBUG, "AIO progress thread starting up\n");
@@ -361 +362 @@
 
          num_aiocbs_running--;
-         if (!num_aiocbs_running)
+         pthread_mutex_lock(&waiting_list_mutex);
+         if (!num_aiocbs_running && qlist_empty(aio_waiting_list))
          {
             gossip_debug(GOSSIP_USRINT_DEBUG, "No running requests, progress thread exiting\n");
             progress_running = PVFS_AIO_PROGRESS_IDLE;
+            pthread_mutex_unlock(&waiting_list_mutex);
             pthread_mutex_unlock(&progress_sync_mutex);
             pthread_exit(NULL);
          }
+         pthread_mutex_unlock(&waiting_list_mutex);
       }
       pthread_mutex_unlock(&progress_sync_mutex);

branches/asyncio/src/client/usrint/aiocommon.h

@@ -18 +18 @@
 #include "gossip.h"
 
-#define PVFS_AIO_MAX_RUNNING 5
+#define PVFS_AIO_MAX_RUNNING 10
 #define PVFS_AIO_LISTIO_MAX 10
-#define PVFS_AIO_MAX_PROGRESS_OPS 10
 
 #define PVFS_AIO_PROGRESS_IDLE 0