Refactor vfs2

src/lib/byte.h

@@ -115,6 +115,18 @@ DQLITE_INLINE uint32_t ByteGetBe32(const uint8_t *buf)
 	return w | x | y | z;
 }
 
+DQLITE_INLINE uint32_t ByteGetLe32(const uint8_t *buf)
+{
+	uint32_t w = buf[0];
+	uint32_t x = buf[1];
+	uint32_t y = buf[2];
+	uint32_t z = buf[3];
+	z <<= 24;
+	y <<= 16;
+	x <<= 8;
+	return w | x | y | z;
+}
+
 DQLITE_INLINE void BytePutBe32(uint32_t v, uint8_t *buf)
 {
 	buf[0] = (uint8_t)(v >> 24);

src/lib/sm.c

@@ -42,7 +42,7 @@ void sm_move(struct sm *m, int next_state)
 {
 	int prev = sm_state(m);
 
-	tracef("SM_MOVE %d => %d", prev, next_state);
+	tracef("SM_MOVE %s => %s", m->conf[prev].name, m->conf[next_state].name);
 
 	PRE(sm_is_locked(m));
 	PRE(m->conf[sm_state(m)].allowed & BITS(next_state));

src/lib/sm.h

@@ -6,7 +6,7 @@
 
 #define BITS(state) (1ULL << (state))
 
-#define CHECK(cond) if (!sm_check((cond), __FILE__, __LINE__, #cond)) return false
+#define CHECK(cond) sm_check((cond), __FILE__, __LINE__, #cond)
 
 enum {
 	SM_PREV_NONE = -1,

src/utils.h

@@ -2,6 +2,7 @@
 #define DQLITE_UTILS_H_
 
 #include <assert.h>
+#include <stdbool.h>
 #include <stdint.h>
 
 /* Various utility functions and macros */
@@ -21,4 +22,8 @@
 #define POST(cond) assert((cond))
 #define ERGO(a, b) (!(a) || (b))
 
+static inline bool is_po2(unsigned long n) {
+	return n > 0 && (n & (n - 1)) == 0;
+}
+
 #endif /* DQLITE_UTILS_H_ */