diff options
author | Xin Li <delphij@google.com> | 2019-02-12 09:53:40 -0800 |
---|---|---|
committer | Xin Li <delphij@google.com> | 2019-02-12 09:53:40 -0800 |
commit | 3b56f52d699841c0e57d84f351f6425a80fb94ce (patch) | |
tree | c9289f46e5ae2c10c10d62fdc8602fff57d19c7f | |
parent | 85a962e5f488485dc630b361f5fc84a8db1dc2d5 (diff) | |
parent | a4514a36b5878886b2b825f9de55f38b45cffe43 (diff) | |
download | native-3b56f52d699841c0e57d84f351f6425a80fb94ce.tar.gz |
DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master
Bug: 124234733
Change-Id: Iff213d95a3da69f58cd95afd129323ad7613c8e4
-rw-r--r-- | services/surfaceflinger/SurfaceFlinger.cpp | 10 | ||||
-rw-r--r-- | services/surfaceflinger/SurfaceTracing.cpp | 46 | ||||
-rw-r--r-- | services/surfaceflinger/SurfaceTracing.h | 9 |
3 files changed, 48 insertions, 17 deletions
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp index 286a133e15..4ec1e7f166 100644 --- a/services/surfaceflinger/SurfaceFlinger.cpp +++ b/services/surfaceflinger/SurfaceFlinger.cpp @@ -4427,6 +4427,12 @@ void SurfaceFlinger::dumpAllLocked(const Vector<String16>& args, size_t& index, result.append("\n"); /* + * Tracing state + */ + mTracing.dump(result); + result.append("\n"); + + /* * HWC layer minidump */ for (size_t d = 0; d < mDisplays.size(); d++) { @@ -4755,12 +4761,12 @@ status_t SurfaceFlinger::onTransact( case 1025: { // Set layer tracing n = data.readInt32(); if (n) { - ALOGV("LayerTracing enabled"); + ALOGD("LayerTracing enabled"); mTracing.enable(); doTracing("tracing.enable"); reply->writeInt32(NO_ERROR); } else { - ALOGV("LayerTracing disabled"); + ALOGD("LayerTracing disabled"); status_t err = mTracing.disable(); reply->writeInt32(err); } diff --git a/services/surfaceflinger/SurfaceTracing.cpp b/services/surfaceflinger/SurfaceTracing.cpp index f8c466ea19..67dcd06187 100644 --- a/services/surfaceflinger/SurfaceTracing.cpp +++ b/services/surfaceflinger/SurfaceTracing.cpp @@ -27,52 +27,67 @@ namespace android { void SurfaceTracing::enable() { + ATRACE_CALL(); + std::lock_guard<std::mutex> protoGuard(mTraceMutex); + if (mEnabled) { return; } - ATRACE_CALL(); mEnabled = true; - std::lock_guard<std::mutex> protoGuard(mTraceMutex); - mTrace.set_magic_number(uint64_t(LayersTraceFileProto_MagicNumber_MAGIC_NUMBER_H) << 32 | - LayersTraceFileProto_MagicNumber_MAGIC_NUMBER_L); + mTrace = std::make_unique<LayersTraceFileProto>(); + mTrace->set_magic_number(uint64_t(LayersTraceFileProto_MagicNumber_MAGIC_NUMBER_H) << 32 | + LayersTraceFileProto_MagicNumber_MAGIC_NUMBER_L); } status_t SurfaceTracing::disable() { + ATRACE_CALL(); + std::lock_guard<std::mutex> protoGuard(mTraceMutex); + if (!mEnabled) { return NO_ERROR; } - ATRACE_CALL(); - std::lock_guard<std::mutex> protoGuard(mTraceMutex); mEnabled = false; status_t err(writeProtoFileLocked()); ALOGE_IF(err == PERMISSION_DENIED, "Could not save the proto file! Permission denied"); ALOGE_IF(err == NOT_ENOUGH_DATA, "Could not save the proto file! There are missing fields"); - mTrace.Clear(); + mTrace.reset(); return err; } -bool SurfaceTracing::isEnabled() { +bool SurfaceTracing::isEnabled() const { + std::lock_guard<std::mutex> protoGuard(mTraceMutex); return mEnabled; } void SurfaceTracing::traceLayers(const char* where, LayersProto layers) { std::lock_guard<std::mutex> protoGuard(mTraceMutex); - - LayersTraceProto* entry = mTrace.add_entry(); + if (!mEnabled) { + return; + } + LayersTraceProto* entry = mTrace->add_entry(); entry->set_elapsed_realtime_nanos(elapsedRealtimeNano()); entry->set_where(where); entry->mutable_layers()->Swap(&layers); + + constexpr int maxBufferedEntryCount = 3600; + if (mTrace->entry_size() >= maxBufferedEntryCount) { + // TODO: flush buffered entries without disabling tracing + ALOGE("too many buffered frames; force disable tracing"); + mEnabled = false; + writeProtoFileLocked(); + mTrace.reset(); + } } status_t SurfaceTracing::writeProtoFileLocked() { ATRACE_CALL(); - if (!mTrace.IsInitialized()) { + if (!mTrace->IsInitialized()) { return NOT_ENOUGH_DATA; } std::string output; - if (!mTrace.SerializeToString(&output)) { + if (!mTrace->SerializeToString(&output)) { return PERMISSION_DENIED; } if (!android::base::WriteStringToFile(output, mOutputFileName, true)) { @@ -82,4 +97,11 @@ status_t SurfaceTracing::writeProtoFileLocked() { return NO_ERROR; } +void SurfaceTracing::dump(String8& result) const { + std::lock_guard<std::mutex> protoGuard(mTraceMutex); + + result.appendFormat("Tracing state: %s\n", mEnabled ? "enabled" : "disabled"); + result.appendFormat(" number of entries: %d\n", mTrace ? mTrace->entry_size() : 0); +} + } // namespace android diff --git a/services/surfaceflinger/SurfaceTracing.h b/services/surfaceflinger/SurfaceTracing.h index 590ab9680f..fd8cb82a9b 100644 --- a/services/surfaceflinger/SurfaceTracing.h +++ b/services/surfaceflinger/SurfaceTracing.h @@ -18,7 +18,9 @@ #include <layerproto/LayerProtoHeader.h> #include <utils/Errors.h> +#include <utils/String8.h> +#include <memory> #include <mutex> using namespace android::surfaceflinger; @@ -32,9 +34,10 @@ class SurfaceTracing { public: void enable(); status_t disable(); - bool isEnabled(); + bool isEnabled() const; void traceLayers(const char* where, LayersProto); + void dump(String8& result) const; private: static constexpr auto DEFAULT_FILENAME = "/data/misc/wmtrace/layers_trace.pb"; @@ -43,8 +46,8 @@ private: bool mEnabled = false; std::string mOutputFileName = DEFAULT_FILENAME; - std::mutex mTraceMutex; - LayersTraceFileProto mTrace; + mutable std::mutex mTraceMutex; + std::unique_ptr<LayersTraceFileProto> mTrace; }; } // namespace android |