Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 281221
b: refs/heads/master
c: 0dcbcbb
h: refs/heads/master
i:
  281219: 635319a
v: v3
  • Loading branch information
Mathieu Desnoyers authored and Greg Kroah-Hartman committed Dec 1, 2011
1 parent 9997438 commit 5f1f96e
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 91c0a213f10aa6637f680848e474fb107dd41ecf
refs/heads/master: 0dcbcbb49e3e8636e2f9d8cbcbeea827c5c951d9
4 changes: 2 additions & 2 deletions trunk/drivers/staging/lttng/lib/ringbuffer/backend_types.h
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ struct lib_ring_buffer_backend {
struct channel *chan; /* Associated channel */
int cpu; /* This buffer's cpu. -1 if global. */
union v_atomic records_read; /* Number of records read */
unsigned int allocated:1; /* Bool: is buffer allocated ? */
uint allocated:1; /* is buffer allocated ? */
};

struct channel_backend {
Expand All @@ -65,7 +65,7 @@ struct channel_backend {
* for writer.
*/
unsigned int buf_size_order; /* Order of buffer size */
int extra_reader_sb:1; /* Bool: has extra reader subbuffer */
uint extra_reader_sb:1; /* has extra reader subbuffer ? */
struct lib_ring_buffer *buf; /* Channel per-cpu buffers */

unsigned long num_subbuf; /* Number of sub-buffers for writer */
Expand Down
14 changes: 7 additions & 7 deletions trunk/drivers/staging/lttng/lib/ringbuffer/frontend_types.h
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ struct channel {
struct notifier_block cpu_hp_notifier; /* CPU hotplug notifier */
struct notifier_block tick_nohz_notifier; /* CPU nohz notifier */
struct notifier_block hp_iter_notifier; /* hotplug iterator notifier */
int cpu_hp_enable:1; /* Enable CPU hotplug notif. */
int hp_iter_enable:1; /* Enable hp iter notif. */
uint cpu_hp_enable:1; /* Enable CPU hotplug notif. */
uint hp_iter_enable:1; /* Enable hp iter notif. */
wait_queue_head_t read_wait; /* reader wait queue */
wait_queue_head_t hp_wait; /* CPU hotplug wait queue */
int finalized; /* Has channel been finalized */
Expand Down Expand Up @@ -94,8 +94,8 @@ struct lib_ring_buffer_iter {
ITER_NEXT_RECORD,
ITER_PUT_SUBBUF,
} state;
int allocated:1;
int read_open:1; /* Opened for reading ? */
uint allocated:1;
uint read_open:1; /* Opened for reading ? */
};

/* ring buffer state */
Expand Down Expand Up @@ -138,9 +138,9 @@ struct 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 */
uint get_subbuf:1; /* Sub-buffer being held by reader */
uint switch_timer_enabled:1; /* Protected by ring_buffer_nohz_lock */
uint read_timer_enabled:1; /* Protected by ring_buffer_nohz_lock */
};

static inline
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
struct switch_offsets {
unsigned long begin, end, old;
size_t pre_header_padding, size;
unsigned int switch_new_start:1, switch_new_end:1, switch_old_start:1,
uint switch_new_start:1, switch_new_end:1, switch_old_start:1,
switch_old_end:1;
};

Expand Down
10 changes: 5 additions & 5 deletions trunk/drivers/staging/lttng/ltt-events.h
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ struct lttng_enum_entry {
struct lttng_integer_type {
unsigned int size; /* in bits */
unsigned short alignment; /* in bits */
unsigned int signedness:1;
unsigned int reverse_byte_order:1;
uint signedness:1;
uint reverse_byte_order:1;
unsigned int base; /* 2, 8, 10, 16, for pretty print */
enum lttng_string_encodings encoding;
};
Expand Down Expand Up @@ -191,7 +191,7 @@ struct ltt_event {
} ftrace;
} u;
struct list_head list; /* Event list */
int metadata_dumped:1;
uint metadata_dumped:1;
};

struct ltt_channel_ops {
Expand Down Expand Up @@ -251,7 +251,7 @@ struct ltt_channel {
struct ltt_event *sc_compat_unknown;
struct ltt_event *sc_exit; /* for syscall exit */
int header_type; /* 0: unset, 1: compact, 2: large */
int metadata_dumped:1;
uint metadata_dumped:1;
};

struct ltt_session {
Expand All @@ -264,7 +264,7 @@ struct ltt_session {
struct list_head list; /* Session list */
unsigned int free_chan_id; /* Next chan ID to allocate */
uuid_le uuid; /* Trace session unique ID */
int metadata_dumped:1;
uint metadata_dumped:1;
};

struct ltt_session *ltt_session_create(void);
Expand Down

0 comments on commit 5f1f96e

Please sign in to comment.