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

Commit c78e3bb3 authored by Chen Chen's avatar Chen Chen
Browse files

BluetoothMetrics: Fix LRU eviction callback bug 

Test: atest bluetooth_test_common
Bug: 156504089
Tag: #stability
Change-Id: I594070a0dc1c33bd8f971bb8a7752fd317872a55
Merged-In: I594070a0dc1c33bd8f971bb8a7752fd317872a55
(cherry picked from commit 184414edd1a0851892865241d9287ca0d808b54e)
parent 197ed6d4

system/common/lru.h

+3 −1
Original line number Diff line number Diff line
@@ -119,8 +119,10 @@ class LruCache { 
    // remove tail

    if (lru_map_.size() == capacity_) {

      lru_map_.erase(node_list_.back().first);

      K key_evicted = node_list_.back().first;

      V value_evicted = node_list_.back().second;

      node_list_.pop_back();

      lru_eviction_callback_(node_list_.back().first, node_list_.back().second);

      lru_eviction_callback_(key_evicted, value_evicted);

      value_popped = true;

    }

    // insert to dummy next;

system/common/lru_unittest.cc

+5 −4
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ TEST(BluetoothLruCacheTest, LruCacheMainTest1) { 
  int* value = new int(0);

  int dummy = 0;

  int* pointer = &dummy;

  auto callback = [pointer](int a, int b) { (*pointer) = 1; };

  auto callback = [pointer](int a, int b) { (*pointer) = a * b; };

  LruCache<int, int> cache(3, "testing", callback);  // capacity = 3;

  cache.Put(1, 10);

  EXPECT_EQ(cache.Size(), 1);
@@ -51,8 +51,8 @@ TEST(BluetoothLruCacheTest, LruCacheMainTest1) { 
  EXPECT_EQ(cache.Size(), 3);



  cache.Put(4, 40);

  EXPECT_EQ(dummy, 1);

  // 2, 3, 4 should be in cache, 1 should not

  EXPECT_EQ(dummy, 10);

  // 2, 3, 4 should be in cache, 1 is evicted

  EXPECT_FALSE(cache.Get(1, value));

  EXPECT_TRUE(cache.Get(4, value));

  EXPECT_EQ(*value, 40);
@@ -63,7 +63,8 @@ TEST(BluetoothLruCacheTest, LruCacheMainTest1) { 


  cache.Put(5, 50);

  EXPECT_EQ(cache.Size(), 3);

  // 2, 3, 5 should be in cache

  EXPECT_EQ(dummy, 160);

  // 2, 3, 5 should be in cache, 4 is evicted



  EXPECT_TRUE(cache.Remove(3));

  cache.Put(6, 60);