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

Commit 37a482c8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "use 64-bit counters in handlers for long-running ops" into tm-dev

parents 1948cb2d 05764879

media/libstagefright/foundation/ALooperRoster.cpp

+3 −1
Original line number Original line Diff line number Diff line
@@ -19,6 +19,8 @@ 
#include <utils/Log.h>

#include <utils/Log.h>

#include <utils/String8.h>

#include <utils/String8.h>





#include <inttypes.h>



#include "ALooperRoster.h"

#include "ALooperRoster.h"





#include "ADebug.h"

#include "ADebug.h"
@@ -142,7 +144,7 @@ void ALooperRoster::dump(int fd, const Vector<String16>& args) { 
            sp<AHandler> handler = info.mHandler.promote();

            sp<AHandler> handler = info.mHandler.promote();

            if (handler != NULL) {

            if (handler != NULL) {

                handler->mVerboseStats = verboseStats;

                handler->mVerboseStats = verboseStats;

                s.appendFormat(": %u messages processed", handler->mMessageCounter);

                s.appendFormat(": %" PRIu64 " messages processed", handler->mMessageCounter);

                if (verboseStats) {

                if (verboseStats) {

                    for (size_t j = 0; j < handler->mMessages.size(); j++) {

                    for (size_t j = 0; j < handler->mMessages.size(); j++) {

                        char fourcc[15];

                        char fourcc[15];

media/libstagefright/foundation/include/media/stagefright/foundation/AHandler.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -66,7 +66,7 @@ private: 
    }

    }





    bool mVerboseStats;

    bool mVerboseStats;

    uint32_t mMessageCounter;

    uint64_t mMessageCounter;

    KeyedVector<uint32_t, uint32_t> mMessages;

    KeyedVector<uint32_t, uint32_t> mMessages;





    void deliverMessage(const sp<AMessage> &msg);

    void deliverMessage(const sp<AMessage> &msg);