#include <sched.h>
#include <unistd.h>
+#include <lttng/ust-arch.h>
#include <lttng/urcu/pointer.h>
#include <urcu/arch.h>
#include <urcu/uatomic.h>
#else
static
-void lttng_ust_lfht_iter_debug_set_ht(struct lttng_ust_lfht *ht, struct lttng_ust_lfht_iter *iter)
+void lttng_ust_lfht_iter_debug_set_ht(struct lttng_ust_lfht *ht __attribute__((unused)),
+ struct lttng_ust_lfht_iter *iter __attribute__((unused)))
{
}
* Returns 0 if no bit is set, else returns the position of the most
* significant bit (from 1 to 32 on 32-bit, from 1 to 64 on 64-bit).
*/
-#if defined(__i386) || defined(__x86_64)
+#if defined(LTTNG_UST_ARCH_X86)
static inline
unsigned int fls_u32(uint32_t x)
{
#define HAS_FLS_U32
#endif
-#if defined(__x86_64)
+#if defined(LTTNG_UST_ARCH_AMD64)
static inline
unsigned int fls_u64(uint64_t x)
{
#endif
#ifndef HAS_FLS_U64
-static __attribute__((unused))
+static
+unsigned int fls_u64(uint64_t x)
+ __attribute__((unused));
+static
unsigned int fls_u64(uint64_t x)
{
unsigned int r = 64;
#endif
#ifndef HAS_FLS_U32
-static __attribute__((unused))
+static
+unsigned int fls_u32(uint32_t x)
+ __attribute__((unused));
+static
unsigned int fls_u32(uint32_t x)
{
unsigned int r = 32;
iter->next = next;
}
-void lttng_ust_lfht_next_duplicate(struct lttng_ust_lfht *ht, lttng_ust_lfht_match_fct match,
+void lttng_ust_lfht_next_duplicate(struct lttng_ust_lfht *ht __attribute__((unused)),
+ lttng_ust_lfht_match_fct match,
const void *key, struct lttng_ust_lfht_iter *iter)
{
struct lttng_ust_lfht_node *node, *next;
iter->next = next;
}
-void lttng_ust_lfht_next(struct lttng_ust_lfht *ht, struct lttng_ust_lfht_iter *iter)
+void lttng_ust_lfht_next(struct lttng_ust_lfht *ht __attribute__((unused)),
+ struct lttng_ust_lfht_iter *iter)
{
struct lttng_ust_lfht_node *node, *next;