Fix broken requeue of io_us

[fio.git] / lib / lfsr.c

diff --git a/lib/lfsr.c b/lib/lfsr.c
index 4c15c6256f9a1d41ab95a1bfdb0d8e59fb92796a..927b2a10cdeeefc4441a9b7aa720677b6939a9be 100644 (file)
--- a/lib/lfsr.c
+++ b/lib/lfsr.c
@@ -87,7 +87,6 @@ static inline void __lfsr_next(struct fio_lfsr *fl, unsigned int spin)
         * this switch.
         */
        switch (spin) {
-               case 16: __LFSR_NEXT(fl, fl->last_val);
                case 15: __LFSR_NEXT(fl, fl->last_val);
                case 14: __LFSR_NEXT(fl, fl->last_val);
                case 13: __LFSR_NEXT(fl, fl->last_val);
@@ -112,26 +111,31 @@ static inline void __lfsr_next(struct fio_lfsr *fl, unsigned int spin)
  * lfsr_next does the following:
  *
  * a. Return if the number of max values has been exceeded.
- * b. Check if the next iteration(s) produce a cycle (due to spin) and add "1"
- *    where necessary.
- * c. Calculate the next value and return.
+ * b. Check if we have a spin value that produces a repeating subsequence.
+ *    This is previously calculated in `prepare_spin` and cycle_length should
+ *    be > 0. If we do have such a spin:
+ *
+ *    i. Decrement the calculated cycle.
+ *    ii. If it reaches zero, add "+1" to the spin and reset the cycle_length
+ *        (we have it cached in the struct fio_lfsr)
+ *
+ *    In either case, continue with the calculation of the next value.
+ * c. Check if the calculated value exceeds the desirable range. In this case,
+ *    go back to b, else return.
  */
 int lfsr_next(struct fio_lfsr *fl, uint64_t *off, uint64_t last)
 {
-       int repeat;
-       unsigned int spin;
-
        if (fl->num_vals++ > fl->max_val)
                return 1;
 
-       repeat = fl->num_vals % fl->cycle_length;
-       if (repeat == 0)
-               spin = fl->spin + 1;
-       else
-               spin = fl->spin;
-
        do {
-               __lfsr_next(fl, spin);
+               if (fl->cycle_length && !--fl->cycle_length) {
+                       __lfsr_next(fl, fl->spin + 1);
+                       fl->cycle_length = fl->cached_cycle_length;
+                       goto check;
+               }
+               __lfsr_next(fl, fl->spin);
+check: ;
        } while (fl->last_val > fl->max_val);
 
        *off = fl->last_val;
@@ -153,8 +157,13 @@ static uint8_t *find_lfsr(uint64_t size)
 {
        int i;
 
+       /*
+        * For an LFSR, there is always a prohibited state (all ones).
+        * Thus, if we need to find the proper LFSR for our size, we must take that
+        * into account.
+        */
        for (i = 3; i < 64; i++)
-               if ((1UL << i) > size) /* TODO: Explain why. */
+               if ((1UL << i) > size)
                        return taps[i];
 
        return NULL;
@@ -189,7 +198,7 @@ int prepare_spin(struct fio_lfsr *fl, unsigned int spin)
 
        x = max / (spin + 1);
        y = max % (spin + 1);
-       fl->cycle_length = max; /* This is the expected cycle */
+       fl->cycle_length = 0;   /* No cycle occurs, other than the expected */
        fl->spin = spin;
 
        for (i = 1; i <= spin; i++) {
@@ -198,6 +207,13 @@ int prepare_spin(struct fio_lfsr *fl, unsigned int spin)
                        break;
                }
        }
+       fl->cached_cycle_length = fl->cycle_length;
+
+       /*
+        * Increment cycle length for the first time only since the stored value
+        * will not be printed otherwise.
+        */
+       fl->cycle_length++;
 
        return 0;
 }