andreacavalli/rocksdb
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix memory leaks in PinnedUsageTest

Browse Source 
Summary: See title

Test Plan: Run valgrind ./cache_test

Reviewers: igor

Reviewed By: igor

Subscribers: anthony, dhruba

Differential Revision: https://reviews.facebook.net/D40419
This commit is contained in:
Aaron Feldman 2015-06-19 09:43:08 -07:00
parent bf03f59c11
commit 18cc5018b7
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
util/cache_test.cc
View File

@ -9,6 +9,7 @@
#include "rocksdb/cache.h" #include "rocksdb/cache.h"
#include <forward_list>
#include <vector> #include <vector>
#include <string> #include <string>
#include <iostream> #include <iostream>
@ -150,6 +151,8 @@ TEST_F(CacheTest, PinnedUsageTest) {
size_t pinned_usage = 0; size_t pinned_usage = 0;
const char* value = "abcdef"; const char* value = "abcdef";
std::forward_list<Cache::Handle*> unreleased_handles;
// Add entries. Unpin some of them after insertion. Then, pin some of them // Add entries. Unpin some of them after insertion. Then, pin some of them
// again. Check GetPinnedUsage(). // again. Check GetPinnedUsage().
for (int i = 1; i < 100; ++i) { for (int i = 1; i < 100; ++i) {
@ -162,9 +165,11 @@ TEST_F(CacheTest, PinnedUsageTest) {
cache->Release(handle); cache->Release(handle);
pinned_usage -= kv_size; pinned_usage -= kv_size;
ASSERT_EQ(pinned_usage, cache->GetPinnedUsage()); ASSERT_EQ(pinned_usage, cache->GetPinnedUsage());
} else {
unreleased_handles.push_front(handle);
} }
if (i % 3 == 0) { if (i % 3 == 0) {
cache->Lookup(key); unreleased_handles.push_front(cache->Lookup(key));
// If i % 2 == 0, then the entry was unpinned before Lookup, so pinned // If i % 2 == 0, then the entry was unpinned before Lookup, so pinned
// usage increased // usage increased
if (i % 2 == 0) { if (i % 2 == 0) {
@ -181,6 +186,11 @@ TEST_F(CacheTest, PinnedUsageTest) {
cache->Insert(key, (void*)value, key.size() + 5, dumbDeleter)); cache->Insert(key, (void*)value, key.size() + 5, dumbDeleter));
} }
ASSERT_EQ(pinned_usage, cache->GetPinnedUsage()); ASSERT_EQ(pinned_usage, cache->GetPinnedUsage());
// release handles for pinned entries to prevent memory leaks
for (auto handle : unreleased_handles) {
cache->Release(handle);
}
} }
TEST_F(CacheTest, HitAndMiss) { TEST_F(CacheTest, HitAndMiss) {