diff options
Diffstat (limited to 'cmds')
| -rw-r--r-- | cmds/incidentd/src/WorkDirectory.cpp | 2 | ||||
| -rw-r--r-- | cmds/statsd/src/atoms.proto | 39 | ||||
| -rw-r--r-- | cmds/statsd/src/main.cpp | 2 |
3 files changed, 4 insertions, 39 deletions
diff --git a/cmds/incidentd/src/WorkDirectory.cpp b/cmds/incidentd/src/WorkDirectory.cpp index e826061a6a4b..7e7c6421e23f 100644 --- a/cmds/incidentd/src/WorkDirectory.cpp +++ b/cmds/incidentd/src/WorkDirectory.cpp @@ -664,7 +664,7 @@ int64_t WorkDirectory::make_timestamp_ns_locked() { nanosleep(&spec, nullptr); } clock_gettime(CLOCK_REALTIME, &spec); - timestampNs = (spec.tv_sec) * 1000 + spec.tv_nsec; + timestampNs = int64_t(spec.tv_sec) * 1000 + spec.tv_nsec; } while (file_exists_locked(timestampNs)); return timestampNs; } diff --git a/cmds/statsd/src/atoms.proto b/cmds/statsd/src/atoms.proto index 8a8df38c65b2..32d90b70c34e 100644 --- a/cmds/statsd/src/atoms.proto +++ b/cmds/statsd/src/atoms.proto @@ -324,8 +324,6 @@ message Atom { AppCompatibilityChangeReported app_compatibility_change_reported = 228 [(allow_from_any_uid) = true]; - PerfettoUploaded perfetto_uploaded = - 229 [(log_from_module) = "perfetto"]; } // Pulled events will start at field 10000. @@ -5929,7 +5927,8 @@ message BubbleUIChanged { optional bool is_ongoing = 10; // Whether the bubble is produced by an app running in foreground. - optional bool is_foreground = 11; + // This is deprecated and the value should be ignored. + optional bool is_foreground = 11 [deprecated = true]; } /** @@ -6859,37 +6858,3 @@ message AppCompatibilityChangeReported { optional Source source = 4; } - -/** - * Logged from - * external/perfetto/src/perfetto_cmd/perfetto_cmd.cc - */ -message PerfettoUploaded { - enum Event { - PERFETTO_UNDEFINED = 0; - PERFETTO_TRACE_BEGIN = 1; - PERFETTO_BACKGROUND_TRACE_BEGIN = 2; - PERFETTO_ON_CONNECT = 3; - PERFETTO_ON_TRACING_DISABLED = 4; - PERFETTO_UPLOAD_DROPBOX_BEGIN = 5; - PERFETTO_UPLOAD_DROPBOX_SUCCESS = 6; - PERFETTO_UPLOAD_DROPBOX_FAILURE = 7; - PERFETTO_UPLOAD_INCIDENT_BEGIN = 8; - PERFETTO_UPLOAD_INCIDENT_SUCCESS = 9; - PERFETTO_UPLOAD_INCIDENT_FAILURE = 10; - PERFETTO_FINALIZE_TRACE_AND_EXIT = 11; - PERFETTO_TRIGGER_BEGIN = 12; - PERFETTO_TRIGGER_SUCCESS = 13; - PERFETTO_TRIGGER_FAILURE = 14; - PERFETTO_HIT_GUARDRAILS = 15; - PERFETTO_ON_TIMEOUT = 16; - PERFETTO_NOT_UPLOADING_EMPTY_TRACE = 17; - } - - // Which stage of the pipeline we are reporting from. - optional Event event = 1; - - // UUID matching the one set inside the SystemInfo trace packet. - optional int64 trace_uuid_lsb = 2; - optional int64 trace_uuid_msb = 3; -} diff --git a/cmds/statsd/src/main.cpp b/cmds/statsd/src/main.cpp index e04e7071052d..7d446a9a1ed6 100644 --- a/cmds/statsd/src/main.cpp +++ b/cmds/statsd/src/main.cpp @@ -80,7 +80,7 @@ int main(int /*argc*/, char** /*argv*/) { ps->giveThreadPoolName(); IPCThreadState::self()->disableBackgroundScheduling(true); - ::android::hardware::configureRpcThreadpool(1 /*threads*/, false /*willJoin*/); + ::android::hardware::configureRpcThreadpool(4 /*threads*/, false /*willJoin*/); std::shared_ptr<LogEventQueue> eventQueue = std::make_shared<LogEventQueue>(2000 /*buffer limit. Buffer is NOT pre-allocated*/); |