Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[SDK] Fix memory leak in TlsRandomNumberGenerator() constructor #2661

Merged
merged 2 commits into from
Jul 19, 2024
Merged

[SDK] Fix memory leak in TlsRandomNumberGenerator() constructor #2661

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6b44492
Fix memory leak in TlsRandomNumberGenerator() constructor #2660
hongweipeng May 7, 2024
1f404a3
Merge branch 'main' into fix-random-memory-leak
marcalff Jul 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion sdk/src/common/random.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#include "src/common/random.h"
#include "src/common/platform/fork.h"

#include <atomic>
#include <cstring>
#include <random>

Expand All @@ -26,12 +27,17 @@ class TlsRandomNumberGenerator
TlsRandomNumberGenerator() noexcept
{
Seed();
platform::AtFork(nullptr, nullptr, OnFork);
if (!flag.test_and_set())
hongweipeng marked this conversation as resolved.
Show resolved Hide resolved
{
platform::AtFork(nullptr, nullptr, OnFork);
}
}

static FastRandomNumberGenerator &engine() noexcept { return engine_; }

private:
static std::atomic_flag flag;

static thread_local FastRandomNumberGenerator engine_;

static void OnFork() noexcept { Seed(); }
Expand All @@ -44,6 +50,7 @@ class TlsRandomNumberGenerator
}
};

std::atomic_flag TlsRandomNumberGenerator::flag;
thread_local FastRandomNumberGenerator TlsRandomNumberGenerator::engine_{};
} // namespace

Expand Down
27 changes: 27 additions & 0 deletions sdk/test/common/random_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@
#include "src/common/random.h"

#include <algorithm>
#include <atomic>
#include <iterator>
#include <thread>
#include <vector>

#include <gtest/gtest.h>
using opentelemetry::sdk::common::Random;
Expand Down Expand Up @@ -34,3 +37,27 @@ TEST(RandomTest, GenerateRandomBuffer)
std::equal(std::begin(buf1_vector), std::end(buf1_vector), std::begin(buf2_vector)));
}
}

void doSomethingOnce(std::atomic_uint *count)
{
static std::atomic_flag flag;
if (!flag.test_and_set())
{
(*count)++;
}
}

TEST(RandomTest, AtomicFlagMultiThreadTest)
{
std::vector<std::thread> threads;
std::atomic_uint count(0);
for (int i = 0; i < 10; ++i)
{
threads.push_back(std::thread(doSomethingOnce, &count));
}
for (auto &t : threads)
{
t.join();
}
EXPECT_EQ(1, count.load());
}