zipf/pareto/gauss: hash cleanup

[fio.git] / lib / ffz.h

diff --git a/lib/ffz.h b/lib/ffz.h
index e17a2e9c0a1e7cd60f3e99b8989ecc61bebed806..e2c1b8e94a39731fd2dbcfe6bebd8a19c69dd830 100644 (file)
--- a/lib/ffz.h
+++ b/lib/ffz.h
@@ -1,10 +1,16 @@
 #ifndef FIO_FFZ_H
 #define FIO_FFZ_H
 
-static inline int __ffs(int word)
+#include <inttypes.h>
+
+static inline int ffs64(uint64_t word)
 {
        int r = 0;
 
+       if ((word & 0xffffffff) == 0) {
+               r += 32;
+               word >>= 32;
+       }
        if (!(word & 0xffff)) {
                word >>= 16;
                r += 16;
@@ -29,9 +35,20 @@ static inline int __ffs(int word)
        return r;
 }
 
-static inline int ffz(unsigned int bitmask)
+#ifndef ARCH_HAVE_FFZ
+
+static inline int ffz(unsigned long bitmask)
+{
+       return ffs64(~bitmask);
+}
+
+#else
+#define ffz(bitmask)   arch_ffz(bitmask)
+#endif
+
+static inline int ffz64(uint64_t bitmask)
 {
-       return __ffs(~bitmask);
+       return ffs64(~bitmask);
 }
 
 #endif