X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=libringbuffer%2Ffrontend_types.h;h=1d47b275b6fabd3cdc2c5351771662b4989378f7;hb=b124e2ec1b9064cdfb82dfa14a5d67ff2e7146c6;hp=bccd5f85bcd8d1ecaea6964af1b802ced3139074;hpb=0d4aa2df26584c00cdb504ff2b3d4a5fdd8f5f08;p=lttng-ust.git diff --git a/libringbuffer/frontend_types.h b/libringbuffer/frontend_types.h index bccd5f85..1d47b275 100644 --- a/libringbuffer/frontend_types.h +++ b/libringbuffer/frontend_types.h @@ -21,10 +21,8 @@ #include #include -#include "lttng/core.h" - -#include #include +#include #include "backend_types.h" #include "shm_internal.h" #include "vatomic.h" @@ -36,6 +34,7 @@ enum switch_mode { SWITCH_ACTIVE, SWITCH_FLUSH }; /* channel: collection of per-cpu ring buffers. */ +#define RB_CHANNEL_PADDING 64 struct channel { int record_disabled; unsigned long commit_count_mask; /* @@ -55,20 +54,26 @@ struct channel { * be last member. */ struct channel_backend backend; /* Associated backend */ + char padding[RB_CHANNEL_PADDING]; } __attribute__((aligned(CAA_CACHE_LINE_SIZE))); /* Per-subbuffer commit counters used on the hot path */ +#define RB_COMMIT_COUNT_HOT_PADDING 16 struct commit_counters_hot { union v_atomic cc; /* Commit counter */ union v_atomic seq; /* Consecutive commits */ + char padding[RB_COMMIT_COUNT_HOT_PADDING]; } __attribute__((aligned(CAA_CACHE_LINE_SIZE))); /* Per-subbuffer commit counters used only on cold paths */ +#define RB_COMMIT_COUNT_COLD_PADDING 24 struct commit_counters_cold { union v_atomic cc_sb; /* Incremented _once_ at sb switch */ + char padding[RB_COMMIT_COUNT_COLD_PADDING]; } __attribute__((aligned(CAA_CACHE_LINE_SIZE))); /* ring buffer state */ +#define RB_RING_BUFFER_PADDING 64 struct lttng_ust_lib_ring_buffer { /* First 32 bytes cache-hot cacheline */ union v_atomic offset; /* Current offset in the buffer */ @@ -106,11 +111,12 @@ struct lttng_ust_lib_ring_buffer { unsigned long get_subbuf_consumed; /* Read-side consumed */ unsigned long prod_snapshot; /* Producer count snapshot */ unsigned long cons_snapshot; /* Consumer count snapshot */ - int get_subbuf:1; /* Sub-buffer being held by reader */ - int switch_timer_enabled:1; /* Protected by ring_buffer_nohz_lock */ - int read_timer_enabled:1; /* Protected by ring_buffer_nohz_lock */ + unsigned int get_subbuf:1, /* Sub-buffer being held by reader */ + switch_timer_enabled:1, /* Protected by ring_buffer_nohz_lock */ + read_timer_enabled:1; /* Protected by ring_buffer_nohz_lock */ /* shmp pointer to self */ DECLARE_SHMP(struct lttng_ust_lib_ring_buffer, self); + char padding[RB_RING_BUFFER_PADDING]; } __attribute__((aligned(CAA_CACHE_LINE_SIZE))); static inline