Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 63cabbe3 authored by Nataniel Borges's avatar Nataniel Borges
Browse files

Introduce a .winscope extension for all winscope files 

This extension will be used to better integrate winscope traces and ABT,
allowing trace files to be opened directly from ABT or buganizer

Bug: 192663722
Bug: 162813517
Test: (for winscope) build winscope, record traces, download traces, check if traces have the .winscope extension. (for flicker) run atest Flickertests. (for abt) on new extension, check if .winscope files show as "open in winscope" on buganizer

Change-Id: I969a42e272fec2f6e6e27173e9475e6142faefa6
parent be8ce7f1

services/surfaceflinger/SurfaceInterceptor.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -48,7 +48,7 @@ using SurfaceChange = surfaceflinger::SurfaceChange; 
using Increment = surfaceflinger::Increment;

using Increment = surfaceflinger::Increment;

using DisplayChange = surfaceflinger::DisplayChange;

using DisplayChange = surfaceflinger::DisplayChange;





constexpr auto DEFAULT_FILENAME = "/data/misc/wmtrace/transaction_trace.pb";

constexpr auto DEFAULT_FILENAME = "/data/misc/wmtrace/transaction_trace.winscope";





class SurfaceInterceptor : public IBinder::DeathRecipient {

class SurfaceInterceptor : public IBinder::DeathRecipient {

public:

public:

services/surfaceflinger/SurfaceTracing.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -77,7 +77,7 @@ public: 
private:

private:

    class Runner;

    class Runner;

    static constexpr auto DEFAULT_BUFFER_SIZE = 5_MB;

    static constexpr auto DEFAULT_BUFFER_SIZE = 5_MB;

    static constexpr auto DEFAULT_FILE_NAME = "/data/misc/wmtrace/layers_trace.pb";

    static constexpr auto DEFAULT_FILE_NAME = "/data/misc/wmtrace/layers_trace.winscope";





    SurfaceFlinger& mFlinger;

    SurfaceFlinger& mFlinger;

    mutable std::mutex mTraceLock;

    mutable std::mutex mTraceLock;

services/surfaceflinger/tests/SurfaceInterceptor_test.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -61,7 +61,7 @@ constexpr auto UNIQUE_TEST_FG_SURFACE_NAME = "FG Interceptor Test Surface#0"; 
constexpr auto LAYER_NAME = "Layer Create and Delete Test";

constexpr auto LAYER_NAME = "Layer Create and Delete Test";

constexpr auto UNIQUE_LAYER_NAME = "Layer Create and Delete Test#0";

constexpr auto UNIQUE_LAYER_NAME = "Layer Create and Delete Test#0";





constexpr auto DEFAULT_FILENAME = "/data/misc/wmtrace/transaction_trace.pb";

constexpr auto DEFAULT_FILENAME = "/data/misc/wmtrace/transaction_trace.winscope";





// Fill an RGBA_8888 formatted surface with a single color.

// Fill an RGBA_8888 formatted surface with a single color.

static void fillSurfaceRGBA8(const sp<SurfaceControl>& sc, uint8_t r, uint8_t g, uint8_t b) {

static void fillSurfaceRGBA8(const sp<SurfaceControl>& sc, uint8_t r, uint8_t g, uint8_t b) {