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

rocksdb: Fix scan-build bug 'Memory leak' in db/db_bench.cc

Browse Source 
Summary:
The bug is detected by scan-build.

In `void WriteSeqSeekSeq(ThreadState* thread)` memory is allocated in line 3118 `Slice key = AllocateKey();` but `Slice` is not responsible deleting `Slice::data()`.

Added `std::unique_ptr<const char[]>*` parameter to ` AllocateKey()`, so that it requires caller to not forget about Slice::data() management.

scan-build bug report: http://home.fburl.com/~sugak/latest6/report-6e9754.html#EndPath

Test Plan:
Make sure scan-build does not report 'Memory leak' in db/db_bench.cc and all tests are passing.
```lang=bash
% make analyze
% make check
```

Reviewers: lgalanis, igor, meyering, sdong

Reviewed By: meyering, sdong

Subscribers: dhruba, leveldb

Differential Revision: https://reviews.facebook.net/D33501
This commit is contained in:
Igor Sugak 2015-02-19 14:27:48 -08:00
parent 98870c7b9c
commit 73711f956c
1 changed files with 32 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
db/db_bench.cc
View File

@ -1369,8 +1369,9 @@ class Benchmark {
delete prefix_extractor_; delete prefix_extractor_;
} }
Slice AllocateKey() { Slice AllocateKey(std::unique_ptr<const char[]>* key_guard) {
return Slice(new char[key_size_], key_size_); key_guard->reset(new char[key_size_]);
return Slice(key_guard->get(), key_size_);
} }
// Generate key according to the given specification and random number. // Generate key according to the given specification and random number.
@ -2280,8 +2281,8 @@ class Benchmark {
Status s; Status s;
int64_t bytes = 0; int64_t bytes = 0;
Slice key = AllocateKey(); std::unique_ptr<const char[]> key_guard;
std::unique_ptr<const char[]> key_guard(key.data()); Slice key = AllocateKey(&key_guard);
int64_t stage = 0; int64_t stage = 0;
while (!duration.Done(entries_per_batch_)) { while (!duration.Done(entries_per_batch_)) {
if (duration.GetStage() != stage) { if (duration.GetStage() != stage) {
@ -2376,8 +2377,8 @@ class Benchmark {
int64_t found = 0; int64_t found = 0;
int64_t nonexist = 0; int64_t nonexist = 0;
ReadOptions options(FLAGS_verify_checksum, true); ReadOptions options(FLAGS_verify_checksum, true);
Slice key = AllocateKey(); std::unique_ptr<const char[]> key_guard;
std::unique_ptr<const char[]> key_guard(key.data()); Slice key = AllocateKey(&key_guard);
std::string value; std::string value;
DB* db = SelectDBWithCfh(thread)->db; DB* db = SelectDBWithCfh(thread)->db;
@ -2423,8 +2424,8 @@ class Benchmark {
int64_t read = 0; int64_t read = 0;
int64_t found = 0; int64_t found = 0;
ReadOptions options(FLAGS_verify_checksum, true); ReadOptions options(FLAGS_verify_checksum, true);
Slice key = AllocateKey(); std::unique_ptr<const char[]> key_guard;
std::unique_ptr<const char[]> key_guard(key.data()); Slice key = AllocateKey(&key_guard);
std::string value; std::string value;
Duration duration(FLAGS_duration, reads_); Duration duration(FLAGS_duration, reads_);
@ -2470,9 +2471,11 @@ class Benchmark {
int64_t found = 0; int64_t found = 0;
ReadOptions options(FLAGS_verify_checksum, true); ReadOptions options(FLAGS_verify_checksum, true);
std::vector<Slice> keys; std::vector<Slice> keys;
std::vector<std::unique_ptr<const char[]> > key_guards;
std::vector<std::string> values(entries_per_batch_); std::vector<std::string> values(entries_per_batch_);
while (static_cast<int64_t>(keys.size()) < entries_per_batch_) { while (static_cast<int64_t>(keys.size()) < entries_per_batch_) {
keys.push_back(AllocateKey()); key_guards.push_back(std::move(std::unique_ptr<const char[]>()));
keys.push_back(AllocateKey(&key_guards.back()));
} }
Duration duration(FLAGS_duration, reads_); Duration duration(FLAGS_duration, reads_);
@ -2497,9 +2500,6 @@ class Benchmark {
} }
thread->stats.FinishedOps(nullptr, db, entries_per_batch_); thread->stats.FinishedOps(nullptr, db, entries_per_batch_);
} }
for (auto& k : keys) {
delete k.data();
}
char msg[100]; char msg[100];
snprintf(msg, sizeof(msg), "(%" PRIu64 " of %" PRIu64 " found)", snprintf(msg, sizeof(msg), "(%" PRIu64 " of %" PRIu64 " found)",
@ -2543,8 +2543,8 @@ class Benchmark {
} }
uint64_t last_refresh = FLAGS_env->NowMicros(); uint64_t last_refresh = FLAGS_env->NowMicros();
Slice key = AllocateKey(); std::unique_ptr<const char[]> key_guard;
std::unique_ptr<const char[]> key_guard(key.data()); Slice key = AllocateKey(&key_guard);
Duration duration(FLAGS_duration, reads_); Duration duration(FLAGS_duration, reads_);
char value_buffer[256]; char value_buffer[256];
@ -2617,8 +2617,8 @@ class Benchmark {
WriteBatch batch; WriteBatch batch;
Duration duration(seq ? 0 : FLAGS_duration, num_); Duration duration(seq ? 0 : FLAGS_duration, num_);
int64_t i = 0; int64_t i = 0;
Slice key = AllocateKey(); std::unique_ptr<const char[]> key_guard;
std::unique_ptr<const char[]> key_guard(key.data()); Slice key = AllocateKey(&key_guard);
while (!duration.Done(entries_per_batch_)) { while (!duration.Done(entries_per_batch_)) {
DB* db = SelectDB(thread); DB* db = SelectDB(thread);
@ -2670,8 +2670,8 @@ class Benchmark {
// Don't merge stats from this thread with the readers. // Don't merge stats from this thread with the readers.
thread->stats.SetExcludeFromMerge(); thread->stats.SetExcludeFromMerge();
Slice key = AllocateKey(); std::unique_ptr<const char[]> key_guard;
std::unique_ptr<const char[]> key_guard(key.data()); Slice key = AllocateKey(&key_guard);
while (true) { while (true) {
DB* db = SelectDB(thread); DB* db = SelectDB(thread);
@ -2803,8 +2803,8 @@ class Benchmark {
int64_t puts_done = 0; int64_t puts_done = 0;
int64_t deletes_done = 0; int64_t deletes_done = 0;
Slice key = AllocateKey(); std::unique_ptr<const char[]> key_guard;
std::unique_ptr<const char[]> key_guard(key.data()); Slice key = AllocateKey(&key_guard);
// the number of iterations is the larger of read_ or write_ // the number of iterations is the larger of read_ or write_
for (int64_t i = 0; i < readwrites_; i++) { for (int64_t i = 0; i < readwrites_; i++) {
@ -2872,8 +2872,8 @@ class Benchmark {
int64_t writes_done = 0; int64_t writes_done = 0;
Duration duration(FLAGS_duration, readwrites_); Duration duration(FLAGS_duration, readwrites_);
Slice key = AllocateKey(); std::unique_ptr<const char[]> key_guard;
std::unique_ptr<const char[]> key_guard(key.data()); Slice key = AllocateKey(&key_guard);
// the number of iterations is the larger of read_ or write_ // the number of iterations is the larger of read_ or write_
while (!duration.Done(1)) { while (!duration.Done(1)) {
@ -2925,8 +2925,8 @@ class Benchmark {
int64_t found = 0; int64_t found = 0;
Duration duration(FLAGS_duration, readwrites_); Duration duration(FLAGS_duration, readwrites_);
Slice key = AllocateKey(); std::unique_ptr<const char[]> key_guard;
std::unique_ptr<const char[]> key_guard(key.data()); Slice key = AllocateKey(&key_guard);
// the number of iterations is the larger of read_ or write_ // the number of iterations is the larger of read_ or write_
while (!duration.Done(1)) { while (!duration.Done(1)) {
DB* db = SelectDB(thread); DB* db = SelectDB(thread);
@ -2963,8 +2963,8 @@ class Benchmark {
std::string value; std::string value;
int64_t found = 0; int64_t found = 0;
Slice key = AllocateKey(); std::unique_ptr<const char[]> key_guard;
std::unique_ptr<const char[]> key_guard(key.data()); Slice key = AllocateKey(&key_guard);
// The number of iterations is the larger of read_ or write_ // The number of iterations is the larger of read_ or write_
Duration duration(FLAGS_duration, readwrites_); Duration duration(FLAGS_duration, readwrites_);
while (!duration.Done(1)) { while (!duration.Done(1)) {
@ -3019,8 +3019,8 @@ class Benchmark {
void MergeRandom(ThreadState* thread) { void MergeRandom(ThreadState* thread) {
RandomGenerator gen; RandomGenerator gen;
Slice key = AllocateKey(); std::unique_ptr<const char[]> key_guard;
std::unique_ptr<const char[]> key_guard(key.data()); Slice key = AllocateKey(&key_guard);
// The number of iterations is the larger of read_ or write_ // The number of iterations is the larger of read_ or write_
Duration duration(FLAGS_duration, readwrites_); Duration duration(FLAGS_duration, readwrites_);
while (!duration.Done(1)) { while (!duration.Done(1)) {
@ -3058,8 +3058,8 @@ class Benchmark {
int64_t num_merges = 0; int64_t num_merges = 0;
size_t max_length = 0; size_t max_length = 0;
Slice key = AllocateKey(); std::unique_ptr<const char[]> key_guard;
std::unique_ptr<const char[]> key_guard(key.data()); Slice key = AllocateKey(&key_guard);
// the number of iterations is the larger of read_ or write_ // the number of iterations is the larger of read_ or write_
Duration duration(FLAGS_duration, readwrites_); Duration duration(FLAGS_duration, readwrites_);
while (!duration.Done(1)) { while (!duration.Done(1)) {
@ -3115,7 +3115,8 @@ class Benchmark {
std::unique_ptr<Iterator> iter( std::unique_ptr<Iterator> iter(
db->NewIterator(ReadOptions(FLAGS_verify_checksum, true))); db->NewIterator(ReadOptions(FLAGS_verify_checksum, true)));
Slice key = AllocateKey(); std::unique_ptr<const char[]> key_guard;
Slice key = AllocateKey(&key_guard);
for (int64_t i = 0; i < FLAGS_num; ++i) { for (int64_t i = 0; i < FLAGS_num; ++i) {
GenerateKeyFromInt(i, FLAGS_num, &key); GenerateKeyFromInt(i, FLAGS_num, &key);
iter->Seek(key); iter->Seek(key);