Hash :
4b33633a
Author :
Date :
2022-08-26T16:16:50
Capture/Replay: Delete binary data in FinishReplay via callback Delete callback fixes b/179188489 as delete[] will get called from the same module where allocation happens. When decompress/delete callbacks not provided, new[] and delete[] are called from the fixture. AFAICT, gBinaryData == nullptr every time, even with a single test and --gtest_repeat=N, so we never delete the uncompressed data. When running multiple tests locally, I see RES usage grow significantly on Linux which this CL fixes. I don't think this matters for bot runs as we run tests one by one there. Bug: b/179188489 Change-Id: Iee3bccb9d6d72c315c4358b70ec9c3c0ac963258 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3858185 Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Cody Northrop <cnorthrop@google.com> Commit-Queue: Roman Lavrov <romanl@google.com>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178
//
// Copyright 2020 The ANGLE Project Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
//
// frame_capture_test_utils:
// Helper functions for capture and replay of traces.
//
#ifndef UTIL_CAPTURE_FRAME_CAPTURE_TEST_UTILS_H_
#define UTIL_CAPTURE_FRAME_CAPTURE_TEST_UTILS_H_
#include <iostream>
#include <memory>
#include <sstream>
#include <type_traits>
#include <vector>
#include "common/angleutils.h"
#include "common/debug.h"
#include "common/system_utils.h"
#define USE_SYSTEM_ZLIB
#include "compression_utils_portable.h"
#define ANGLE_MACRO_STRINGIZE_AUX(a) #a
#define ANGLE_MACRO_STRINGIZE(a) ANGLE_MACRO_STRINGIZE_AUX(a)
#define ANGLE_MACRO_CONCAT_AUX(a, b) a##b
#define ANGLE_MACRO_CONCAT(a, b) ANGLE_MACRO_CONCAT_AUX(a, b)
namespace angle
{
inline uint8_t *DecompressBinaryData(const std::vector<uint8_t> &compressedData)
{
uint32_t uncompressedSize =
zlib_internal::GetGzipUncompressedSize(compressedData.data(), compressedData.size());
std::unique_ptr<uint8_t[]> uncompressedData(new uint8_t[uncompressedSize]);
uLong destLen = uncompressedSize;
int zResult =
zlib_internal::GzipUncompressHelper(uncompressedData.get(), &destLen, compressedData.data(),
static_cast<uLong>(compressedData.size()));
if (zResult != Z_OK)
{
std::cerr << "Failure to decompressed binary data: " << zResult << "\n";
return nullptr;
}
return uncompressedData.release();
}
inline void DeleteBinaryData(uint8_t *uncompressedData)
{
delete[] uncompressedData;
}
using DecompressCallback = uint8_t *(*)(const std::vector<uint8_t> &);
using DeleteCallback = void (*)(uint8_t *);
using ValidateSerializedStateCallback = void (*)(const char *, const char *, uint32_t);
using SetBinaryDataDecompressCallbackFunc = void (*)(DecompressCallback, DeleteCallback);
using SetBinaryDataDirFunc = void (*)(const char *);
using SetupReplayFunc = void (*)();
using ReplayFrameFunc = void (*)(uint32_t);
using ResetReplayFunc = void (*)();
using FinishReplayFunc = void (*)();
using GetSerializedContextStateFunc = const char *(*)(uint32_t);
using SetValidateSerializedStateCallbackFunc = void (*)(ValidateSerializedStateCallback);
class TraceLibrary
{
public:
TraceLibrary(const char *traceNameIn)
{
std::stringstream traceNameStr;
#if !defined(ANGLE_PLATFORM_WINDOWS)
traceNameStr << "lib";
#endif // !defined(ANGLE_PLATFORM_WINDOWS)
traceNameStr << traceNameIn;
#if defined(ANGLE_PLATFORM_ANDROID) && defined(COMPONENT_BUILD)
// Added to shared library names in Android component builds in
// https://chromium.googlesource.com/chromium/src/+/9bacc8c4868cc802f69e1e858eea6757217a508f/build/toolchain/toolchain.gni#56
traceNameStr << ".cr";
#endif // defined(ANGLE_PLATFORM_ANDROID) && defined(COMPONENT_BUILD)
std::string traceName = traceNameStr.str();
mTraceLibrary.reset(OpenSharedLibrary(traceName.c_str(), SearchType::ModuleDir));
}
bool valid() const
{
return (mTraceLibrary != nullptr) && (mTraceLibrary->getNative() != nullptr);
}
void setBinaryDataDir(const char *dataDir)
{
callFunc<SetBinaryDataDirFunc>("SetBinaryDataDir", dataDir);
}
void setBinaryDataDecompressCallback(DecompressCallback decompressCallback,
DeleteCallback deleteCallback)
{
callFunc<SetBinaryDataDecompressCallbackFunc>("SetBinaryDataDecompressCallback",
decompressCallback, deleteCallback);
}
void replayFrame(uint32_t frameIndex) { callFunc<ReplayFrameFunc>("ReplayFrame", frameIndex); }
void setupReplay() { callFunc<SetupReplayFunc>("SetupReplay"); }
void resetReplay() { callFunc<ResetReplayFunc>("ResetReplay"); }
void finishReplay() { callFunc<FinishReplayFunc>("FinishReplay"); }
const char *getSerializedContextState(uint32_t frameIndex)
{
return callFunc<GetSerializedContextStateFunc>("GetSerializedContextState", frameIndex);
}
void setValidateSerializedStateCallback(ValidateSerializedStateCallback callback)
{
return callFunc<SetValidateSerializedStateCallbackFunc>(
"SetValidateSerializedStateCallback", callback);
}
private:
template <typename FuncT, typename... ArgsT>
typename std::invoke_result<FuncT, ArgsT...>::type callFunc(const char *funcName, ArgsT... args)
{
void *untypedFunc = mTraceLibrary->getSymbol(funcName);
if (!untypedFunc)
{
fprintf(stderr, "Error loading function: %s\n", funcName);
ASSERT(untypedFunc);
}
auto typedFunc = reinterpret_cast<FuncT>(untypedFunc);
return typedFunc(args...);
}
std::unique_ptr<Library> mTraceLibrary;
};
static constexpr size_t kTraceInfoMaxNameLen = 128;
struct TraceInfo
{
char name[kTraceInfoMaxNameLen];
bool initialized = false;
uint32_t contextClientMajorVersion;
uint32_t contextClientMinorVersion;
uint32_t frameStart;
uint32_t frameEnd;
uint32_t drawSurfaceWidth;
uint32_t drawSurfaceHeight;
uint32_t drawSurfaceColorSpace;
uint32_t displayPlatformType;
uint32_t displayDeviceType;
int configRedBits;
int configBlueBits;
int configGreenBits;
int configAlphaBits;
int configDepthBits;
int configStencilBits;
bool isBinaryDataCompressed;
bool areClientArraysEnabled;
bool isBindGeneratesResourcesEnabled;
bool isWebGLCompatibilityEnabled;
bool isRobustResourceInitEnabled;
};
bool LoadTraceNamesFromJSON(const std::string jsonFilePath, std::vector<std::string> *namesOut);
bool LoadTraceInfoFromJSON(const std::string &traceName,
const std::string &traceJsonPath,
TraceInfo *traceInfoOut);
} // namespace angle
#endif // UTIL_CAPTURE_FRAME_CAPTURE_TEST_UTILS_H_