History

ring-buffer: move calculation of event length

The event length is calculated and passed in to rb_reserve_next_event in two different locations. Having rb_reserve_next_event do the calculations directly makes only one location to do the change and causes the calculation to be inlined by gcc. Before: text data bss dec hex filename 16538 24 12 16574 40be kernel/trace/ring_buffer.o After: text data bss dec hex filename 16490 24 12 16526 408e kernel/trace/ring_buffer.o [ Impact: smaller more efficient code ]

Steven Rostedt committed 17 years ago

Commit be957c41 parent 1cd8d731 file · +9 −5Browse files

Unified · Split

kernel/trace/ring_buffer.c+9−5
@@ -367,6 +367,9 @@ static inline int test_time_stamp(u64 delta) · 366 unmodified lines
367367
368368 #define BUF_PAGE_SIZE (PAGE_SIZE - BUF_PAGE_HDR_SIZE)
369369
370+/* Max payload is BUF_PAGE_SIZE - header (8bytes) */
371+#define BUF_MAX_DATA_SIZE (BUF_PAGE_SIZE - (sizeof(u32) * 2))
372+
370373 int ring_buffer_print_page_header(struct trace_seq *s)
371374 {
372375 struct buffer_data_page field;
@@ -1396,6 +1399,7 @@ rb_reserve_next_event(struct ring_buffer_per_cpu *cpu_buffer, · 1023 unmodified lines
13961399 int commit = 0;
13971400 int nr_loops = 0;
13981401
1402+ length = rb_calculate_event_length(length);
13991403 again:
14001404 /*
14011405 * We allow for interrupts to reenter here and do a trace.
@@ -1552,8 +1556,7 @@ ring_buffer_lock_reserve(struct ring_buffer *buffer, unsigned long length) · 150 unmodified lines
15521556 if (atomic_read(&cpu_buffer->record_disabled))
15531557 goto out;
15541558
1555− length = rb_calculate_event_length(length);
1556− if (length > BUF_PAGE_SIZE)
1559+ if (length > BUF_MAX_DATA_SIZE)
15571560 goto out;
15581561
15591562 event = rb_reserve_next_event(cpu_buffer, length);
@@ -1758,7 +1761,6 @@ int ring_buffer_write(struct ring_buffer *buffer, · 198 unmodified lines
17581761 {
17591762 struct ring_buffer_per_cpu *cpu_buffer;
17601763 struct ring_buffer_event *event;
1761− unsigned long event_length;
17621764 void *body;
17631765 int ret = -EBUSY;
17641766 int cpu, resched;
@@ -1781,8 +1783,10 @@ int ring_buffer_write(struct ring_buffer *buffer, · 16 unmodified lines
17811783 if (atomic_read(&cpu_buffer->record_disabled))
17821784 goto out;
17831785
1784− event_length = rb_calculate_event_length(length);
1785− event = rb_reserve_next_event(cpu_buffer, event_length);
1786+ if (length > BUF_MAX_DATA_SIZE)
1787+ goto out;
1788+
1789+ event = rb_reserve_next_event(cpu_buffer, length);
17861790 if (!event)
17871791 goto out;
17881792

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t