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

Commit 535517d9 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6793014 from 07602cda to master

Change-Id: I038daea41d2ef3f075814e9ad19253ed2f6c5204
parents 82795fc3 07602cda
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -80,7 +80,6 @@ void GpuMemTracer::traceInitialCounters() {
    mGpuMem->traverseGpuMemTotals([](int64_t ts, uint32_t gpuId, uint32_t pid, uint64_t size) {
        GpuMemDataSource::Trace([&](GpuMemDataSource::TraceContext ctx) {
            auto packet = ctx.NewTracePacket();
            packet->set_timestamp_clock_id(perfetto::protos::pbzero::BUILTIN_CLOCK_MONOTONIC);
            packet->set_timestamp(ts);
            auto* event = packet->set_gpu_mem_total_event();
            event->set_gpu_id(gpuId);
+2 −5
Original line number Diff line number Diff line
@@ -71,17 +71,14 @@ void CallbackScheduler::schedule(std::function<void()> callback, std::chrono::mi

void CallbackScheduler::loop() {
    while (true) {
        std::unique_lock<std::mutex> lock(mMutex);
        std::lock_guard<std::mutex> lock(mMutex);
        if (mFinished) {
            // Destructor was called, so let the callback thread die.
            break;
        }
        while (!mQueue.empty() && mQueue.top().isExpired()) {
            DelayedCallback callback = mQueue.top();
            mQueue.top().run();
            mQueue.pop();
            lock.unlock();
            callback.run();
            lock.lock();
        }
        if (mQueue.empty()) {
            // Wait until a new callback is scheduled.