Add alignment to thread_options_pack for proper fp alignment

[fio.git] / engines / libaio.c

diff --git a/engines/libaio.c b/engines/libaio.c
index ca7bfdef58a35a58d29de89a33d7176eef3e4cf7..f7e2f8967c8900a1d5c6839dda1d746df5986b60 100644 (file)
--- a/engines/libaio.c
+++ b/engines/libaio.c
@@ -13,6 +13,8 @@
 
 #include "../fio.h"
 
+static int fio_libaio_commit(struct thread_data *td);
+
 struct libaio_data {
        io_context_t aio_ctx;
        struct io_event *aio_events;
@@ -163,10 +165,13 @@ static int fio_libaio_getevents(struct thread_data *td, unsigned int min,
                        r = io_getevents(ld->aio_ctx, actual_min,
                                max, ld->aio_events + events, lt);
                }
-               if (r >= 0)
+               if (r > 0)
                        events += r;
-               else if (r == -EAGAIN)
+               else if ((min && r == 0) || r == -EAGAIN) {
+                       fio_libaio_commit(td);
                        usleep(100);
+               } else if (r != -EINTR)
+                       break;
        } while (events < min);
 
        return r < 0 ? r : events;
@@ -255,9 +260,11 @@ static int fio_libaio_commit(struct thread_data *td)
                        ld->queued -= ret;
                        ring_inc(ld, &ld->tail, ret);
                        ret = 0;
+                       wait_start = 0;
                } else if (ret == -EINTR || !ret) {
                        if (!ret)
                                io_u_mark_submit(td, ret);
+                       wait_start = 0;
                        continue;
                } else if (ret == -EAGAIN) {
                        /*
@@ -274,16 +281,25 @@ static int fio_libaio_commit(struct thread_data *td)
                        }
                        if (!wait_start) {
                                fio_gettime(&tv, NULL);
-                               wait_start = 0;
+                               wait_start = 1;
                        } else if (mtime_since_now(&tv) > 30000) {
                                log_err("fio: aio appears to be stalled, giving up\n");
                                break;
                        }
                        usleep(1);
                        continue;
+               } else if (ret == -ENOMEM) {
+                       /*
+                        * If we get -ENOMEM, reap events if we can. If
+                        * we cannot, treat it as a fatal event since there's
+                        * nothing we can do about it.
+                        */
+                       if (ld->queued)
+                               ret = 0;
+                       break;
                } else
                        break;
-       } while (ld->head != ld->tail);
+       } while (ld->queued);
 
        return ret;
 }