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

Commit 85bc2f2d authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix LruCache, allow std:string caching" am: 14777142 am: 614857c7 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2627034



Change-Id: I77397bc5467bd33b2b52492169f47199c0bad582
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7dadbf5a 614857c7

libutils/LruCache_test.cpp

+7 −4
Original line number Diff line number Diff line
@@ -29,6 +29,8 @@ typedef const char* StringValue; 
struct ComplexKey {

    int k;



    explicit ComplexKey() : k(0) { instanceCount += 1; }



    explicit ComplexKey(int k) : k(k) {

        instanceCount += 1;

    }
@@ -57,6 +59,8 @@ ssize_t ComplexKey::instanceCount = 0; 
struct ComplexValue {

    int v;



    explicit ComplexValue() : v(0) { instanceCount += 1; }



    explicit ComplexValue(int v) : v(v) {

        instanceCount += 1;

    }
@@ -83,9 +87,8 @@ struct KeyWithPointer { 


struct KeyFailsOnCopy : public ComplexKey {

    public:

    KeyFailsOnCopy(const KeyFailsOnCopy& key) : ComplexKey(key) {

        ADD_FAILURE();

    }

      KeyFailsOnCopy() : ComplexKey() {}

      KeyFailsOnCopy(const KeyFailsOnCopy& key) : ComplexKey(key) { ADD_FAILURE(); }

      KeyFailsOnCopy(int key) : ComplexKey(key) {}

};

libutils/include/utils/LruCache.h

+6 −6
Original line number Diff line number Diff line
@@ -161,12 +161,12 @@ public: 
// Implementation is here, because it's fully templated

template <typename TKey, typename TValue>

LruCache<TKey, TValue>::LruCache(uint32_t maxCapacity)

    : mSet(new LruCacheSet())

    , mListener(nullptr)

    , mOldest(nullptr)

    , mYoungest(nullptr)

    , mMaxCapacity(maxCapacity)

    , mNullValue(0) {

    : mSet(new LruCacheSet()),

      mListener(nullptr),

      mOldest(nullptr),

      mYoungest(nullptr),

      mMaxCapacity(maxCapacity),

      mNullValue{} {

    mSet->max_load_factor(1.0);

};