Merge branches 'tracing/function-graph-tracer' and 'tracing/ring-buffer' into tracing/core

This commit is contained in:
Ingo Molnar 2008-12-12 07:40:08 +01:00
commit f3134de606
1 changed files with 6 additions and 4 deletions

View File

@ -28,17 +28,19 @@ struct ring_buffer_event {
* size = 8 bytes * size = 8 bytes
* *
* @RINGBUF_TYPE_TIME_STAMP: Sync time stamp with external clock * @RINGBUF_TYPE_TIME_STAMP: Sync time stamp with external clock
* array[0] = tv_nsec * array[0] = tv_nsec
* array[1] = tv_sec * array[1..2] = tv_sec
* size = 16 bytes * size = 16 bytes
* *
* @RINGBUF_TYPE_DATA: Data record * @RINGBUF_TYPE_DATA: Data record
* If len is zero: * If len is zero:
* array[0] holds the actual length * array[0] holds the actual length
* array[1..(length+3)/4-1] holds data * array[1..(length+3)/4] holds data
* size = 4 + 4 + length (bytes)
* else * else
* length = len << 2 * length = len << 2
* array[0..(length+3)/4] holds data * array[0..(length+3)/4-1] holds data
* size = 4 + length (bytes)
*/ */
enum ring_buffer_type { enum ring_buffer_type {
RINGBUF_TYPE_PADDING, RINGBUF_TYPE_PADDING,