浏览代码

tracing: Add disable_on_free option

Add a trace option to disable tracing on free. When this option is
set, a write into the free_buffer file will not only shrink the
ring buffer down to zero, but it will also disable tracing.

Cc: Vaibhav Nagarnaik <vnagarnaik@google.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Steven Rostedt 14 年之前
父节点
当前提交
cf30cf67d6
共有 2 个文件被更改,包括 5 次插入2 次删除
  1. 4 2
      kernel/trace/trace.c
  2. 1 0
      kernel/trace/trace.h

+ 4 - 2
kernel/trace/trace.c

@@ -425,6 +425,7 @@ static const char *trace_options[] = {
 	"graph-time",
 	"graph-time",
 	"record-cmd",
 	"record-cmd",
 	"overwrite",
 	"overwrite",
+	"disable_on_free",
 	NULL
 	NULL
 };
 };
 
 
@@ -3518,8 +3519,9 @@ tracing_free_buffer_write(struct file *filp, const char __user *ubuf,
 static int
 static int
 tracing_free_buffer_release(struct inode *inode, struct file *filp)
 tracing_free_buffer_release(struct inode *inode, struct file *filp)
 {
 {
-	/* disable tracing */
-	tracing_off();
+	/* disable tracing ? */
+	if (trace_flags & TRACE_ITER_STOP_ON_FREE)
+		tracing_off();
 	/* resize the ring buffer to 0 */
 	/* resize the ring buffer to 0 */
 	tracing_resize_ring_buffer(0);
 	tracing_resize_ring_buffer(0);
 
 

+ 1 - 0
kernel/trace/trace.h

@@ -609,6 +609,7 @@ enum trace_iterator_flags {
 	TRACE_ITER_GRAPH_TIME		= 0x80000,
 	TRACE_ITER_GRAPH_TIME		= 0x80000,
 	TRACE_ITER_RECORD_CMD		= 0x100000,
 	TRACE_ITER_RECORD_CMD		= 0x100000,
 	TRACE_ITER_OVERWRITE		= 0x200000,
 	TRACE_ITER_OVERWRITE		= 0x200000,
+	TRACE_ITER_STOP_ON_FREE		= 0x400000,
 };
 };
 
 
 /*
 /*