commit 035dc2822cf93f7ead83ac349db49f9ad0c4f13a
author Hector Dearman <hjd@google.com> Mon Dec 17 15:00:40 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Dec 17 15:00:40 2018 +0000
tree 1c86dfb3a20aa641fd1fc07eb6c89e183b4440ef
parent 76717a36d3128515aefdb26c135fe951a2e85e48
parent 18edac5450ad687ad8ff168238e098610b5a5f9f

Merge "ftrace: Bump default buffer size in UI and command line"

src/perfetto_cmd/config.cc

diff --git a/src/perfetto_cmd/config.cc b/src/perfetto_cmd/config.cc
index d786818..3566ef1 100644
--- a/src/perfetto_cmd/config.cc
+++ b/src/perfetto_cmd/config.cc
@@ -129,6 +129,8 @@
   for (const auto& app : atrace_apps)
     ds_config->mutable_ftrace_config()->add_atrace_apps(app);
 
+  ds_config->mutable_ftrace_config()->set_buffer_size_kb(2 * 1024);
+
   auto* ps_config = config->add_data_sources()->mutable_config();
   ps_config->set_name("linux.process_stats");
   ps_config->set_target_buffer(0);

ui/src/common/state.ts

diff --git a/ui/src/common/state.ts b/ui/src/common/state.ts
index 36d6b3b..6ea3687 100644
--- a/ui/src/common/state.ts
+++ b/ui/src/common/state.ts
@@ -177,7 +177,7 @@
     atraceApps: [],
     atraceCategories: [],
     ftraceDrainPeriodMs: null,
-    ftraceBufferSizeKb: null,
+    ftraceBufferSizeKb: 2 * 1024,
 
     processMetadata: false,
     scanAllProcessesOnStart: false,

ui/src/frontend/record_page.ts

diff --git a/ui/src/frontend/record_page.ts b/ui/src/frontend/record_page.ts
index 6abc4bc..4cf99ed 100644
--- a/ui/src/frontend/record_page.ts
+++ b/ui/src/frontend/record_page.ts
@@ -39,6 +39,8 @@
 const CONFIG_PROTO_URL =
     `https://android.googlesource.com/platform/external/perfetto/+/master/protos/perfetto/config/perfetto_config.proto`;
 
+const DEFAULT_FTRACE_BUFFER_KB = 2 * 1024;
+
 const FTRACE_EVENTS = [
   'binder/binder_lock',
   'binder/binder_locked',
@@ -373,7 +375,7 @@
       atraceApps: [],
       atraceCategories: ['sched', 'freq', 'idle'],
       ftraceDrainPeriodMs: null,
-      ftraceBufferSizeKb: null,
+      ftraceBufferSizeKb: DEFAULT_FTRACE_BUFFER_KB,
 
       sysStats: false,
       meminfoPeriodMs: null,
@@ -411,7 +413,7 @@
       atraceApps: [],
       atraceCategories: ['am', 'dalvik'],
       ftraceDrainPeriodMs: null,
-      ftraceBufferSizeKb: null,
+      ftraceBufferSizeKb: DEFAULT_FTRACE_BUFFER_KB,
 
       sysStats: true,
       meminfoPeriodMs: 50,
@@ -448,7 +450,7 @@
       atraceApps: [],
       atraceCategories: [],
       ftraceDrainPeriodMs: null,
-      ftraceBufferSizeKb: null,
+      ftraceBufferSizeKb: DEFAULT_FTRACE_BUFFER_KB,
 
       sysStats: false,
       meminfoPeriodMs: null,
@@ -848,6 +850,7 @@
               onchange: onChange<number|null>('ftraceBufferSizeKb'),
               presets: [
                 {label: '1mb', value: 1 * 1024},
+                {label: '2mb', value: 2 * 1024},
                 {label: '4mb', value: 4 * 1024},
                 {label: '8mb', value: 8 * 1024},
               ]