Change iolog overlap assert to a debug dump

[fio.git] / init.c

diff --git a/init.c b/init.c
index 381bb654a6c1ca5cf6e833862f670b3743c23708..8dc57845ee24605ea316e6252ca8f5684365d74c 100644 (file)
--- a/init.c
+++ b/init.c
@@ -255,7 +255,7 @@ static int setup_thread_area(void)
                shm_id = shmget(0, size, IPC_CREAT | 0600);
                if (shm_id != -1)
                        break;
-               if (errno != EINVAL) {
+               if (errno != EINVAL && errno != ENOMEM) {
                        perror("shmget");
                        break;
                }
@@ -402,11 +402,18 @@ static int fixup_options(struct thread_data *td)
        }
 
        /*
-        * only really works for sequential io for now, and with 1 file
+        * only really works with 1 file
         */
-       if (o->zone_size && td_random(td) && o->open_files == 1)
+       if (o->zone_size && o->open_files == 1)
                o->zone_size = 0;
 
+       /*
+        * If zone_range isn't specified, backward compatibility dictates it
+        * should be made equal to zone_size.
+        */
+       if (o->zone_size && !o->zone_range)
+               o->zone_range = o->zone_size;
+
        /*
         * Reads can do overwrites, we always need to pre-create the file
         */