这是indexloc提供的服务，不要输入任何密码
Skip to content

fix: Profiling memory leaks #3055

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

Merged
merged 5 commits into from
May 24, 2023
Merged

fix: Profiling memory leaks #3055

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3d03701
Fix leaking of SentryProfilingState
indragiek May 24, 2023
bb72852
Fix crash when the queue label contains malformed string data
indragiek May 24, 2023
016a82d
Fix leak of ThreadMetadataCache
indragiek May 24, 2023
4b3e134
Format code
getsentry-bot May 24, 2023
da70c38
Update CHANGELOG.md
indragiek May 24, 2023
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
### Fixes

- Convert one of the two remaining usages of `sprintf` to `snprintf` (#2866)
- Fix memory leaks in the profiler (#3055)

## 8.7.2

Expand Down
9 changes: 6 additions & 3 deletions Sources/Sentry/SentryProfiler.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,9 +354,12 @@ - (void)appendBacktrace:(const Backtrace &)backtrace
}
if (queueAddress != nil && state.queueMetadata[queueAddress] == nil
&& backtrace.queueMetadata.label != nullptr) {
state.queueMetadata[queueAddress] = @ {
@"label" : [NSString stringWithUTF8String:backtrace.queueMetadata.label->c_str()]
};
NSString *const labelNSStr =
[NSString stringWithUTF8String:backtrace.queueMetadata.label->c_str()];
// -[NSString stringWithUTF8String:] can return `nil` for malformed string data
Copy link
Member Author

@indragiek indragiek May 24, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here's a repro of this happening:
CleanShot 2023-05-23 at 22 48 47@2x

if (labelNSStr != nil) {
state.queueMetadata[queueAddress] = @ { @"label" : labelNSStr };
}
}
# if defined(DEBUG)
const auto symbols
Expand Down
10 changes: 5 additions & 5 deletions Sources/Sentry/SentrySamplingProfiler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ namespace profiling {

void *
samplingThreadMain(mach_port_t port, clock_serv_t clock, mach_timespec_t delaySpec,
std::shared_ptr<ThreadMetadataCache> cache,
std::function<void(const Backtrace &)> callback, std::atomic_uint64_t &numSamples,
std::function<void()> onThreadStart)
const std::shared_ptr<ThreadMetadataCache> &cache,
const std::function<void(const Backtrace &)> &callback,
std::atomic_uint64_t &numSamples, std::function<void()> onThreadStart)
{
SENTRY_PROF_LOG_ERROR_RETURN(pthread_setname_np("io.sentry.SamplingProfiler"));
const int maxSize = 512;
Expand Down Expand Up @@ -107,8 +107,8 @@ namespace profiling {
}
isSampling_ = true;
numSamples_ = 0;
thread_ = std::thread(samplingThreadMain, port_, clock_, delaySpec_, cache_, callback_,
std::ref(numSamples_), onThreadStart);
thread_ = std::thread(samplingThreadMain, port_, clock_, delaySpec_, std::cref(cache_),
Copy link
Member

@armcknight armcknight May 24, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TIL std::ref and std::cref, nice! I was trying to do this with & which wouldn't compile 😭

std::cref(callback_), std::ref(numSamples_), onThreadStart);

int policy;
sched_param param;
Expand Down