X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Futil.h;h=8a6dc4da2174a1c747db67dfed9347b8afa01cea;hb=eb34f70aa8288124da89838c7a71f2a49fb8def5;hp=3292a32eb9878890efd45d43845699d536f304c8;hpb=85cc44d618877b8dbedf56fd8f5454a948a636a3;p=wimlib

diff --git a/src/util.h b/src/util.h
index 3292a32e..8a6dc4da 100644
--- a/src/util.h
+++ b/src/util.h
@@ -10,26 +10,34 @@
 
 #ifdef __GNUC__
 #	define WIMLIBAPI __attribute__((visibility("default")))
-#	define NOINLINE __attribute__((noinline))
 #	define ALWAYS_INLINE inline __attribute__((always_inline))
+#	define PACKED __attribute__((packed))
 #	define FORMAT(type, format_str, args_start) \
 			__attribute__((format(type, format_str, args_start)))
 #	if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)
 #		define COLD     __attribute__((cold))
-#		define HOT      __attribute__((hot))
 #	else
 #		define COLD
-#		define HOT
 #	endif
 #else
 #	define WIMLIBAPI
-#	define NOINLINE
 #	define ALWAYS_INLINE inline
 #	define FORMAT(type, format_str, args_start)
 #	define COLD
-#	define HOT
+#	define PACKED
 #endif /* __GNUC__ */
 
+
+#if 0
+#ifdef WITH_FUSE
+#define atomic_inc(ptr) \
+	__sync_fetch_and_add(ptr, 1)
+
+#define atomic_dec(ptr) \
+	__sync_sub_and_fetch(ptr, 1)
+#endif
+#endif
+
 #ifndef _NTFS_TYPES_H
 typedef uint8_t  u8;
 typedef uint16_t u16;
@@ -65,6 +73,12 @@ typedef unsigned uint;
 	(type *)( (char *)__mptr - offsetof(type,member) );})
 #endif
 
+#define DIV_ROUND_UP(numerator, denominator) \
+	(((numerator) + (denominator) - 1) / (denominator))
+
+#define MODULO_NONZERO(numerator, denominator) \
+	(((numerator) % (denominator)) ? ((numerator) % (denominator)) : (denominator))
+
 #define ARRAY_LEN(array) (sizeof(array) / sizeof((array)[0]))
 
 #define ZERO_ARRAY(array) memset(array, 0, sizeof(array))
@@ -164,13 +178,25 @@ extern void print_string(const void *string, size_t len);
 
 extern int get_num_path_components(const char *path);
 
-extern ssize_t full_write(int fd, const void *buf, size_t n);
-
 static inline void print_byte_field(const u8 field[], size_t len)
 {
 	while (len--)
 		printf("%02hhx", *field++);
 }
 
+static inline u32 bsr32(u32 n)
+{
+#if defined(__x86__) || defined(__x86_64__)
+	asm("bsrl %0, %0;"
+			: "=r"(n)
+			: "0" (n));
+	return n;
+#else
+	u32 pow = 0;
+	while ((n >>= 1) != 0)
+		pow++;
+	return pow;
+#endif
+}
 
 #endif /* _WIMLIB_UTIL_H */