Skip to content

Clean XpuptiActivityApi::singleton() and virtual keyword usage #1313

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

Open
moksiuc wants to merge 9 commits into
base: main
Choose a base branch
from
Open

Clean XpuptiActivityApi::singleton() and virtual keyword usage #1313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c1eb9a0
Clean XpuptiActivityApi::singleton() usage
moksiuc Mar 18, 2026
aed8c94
unformat
moksiuc Mar 18, 2026
0f6cfb3
Revert "unformat"
moksiuc Mar 20, 2026
99a9eaa
Merge branch 'refs/heads/main' into moksiuci_6674_api_singleton
moksiuc Mar 20, 2026
dc1aa08
Remove unnecessery virtual keywords
moksiuc Mar 20, 2026
2750b2e
Reapply "unformat"
moksiuc Mar 20, 2026
c22f0cd
Revert "unformat"
moksiuc Apr 16, 2026
ed3f884
Merge branch 'refs/heads/main' into moksiuci_6674_api_singleton
moksiuc Apr 16, 2026
069a41e
Reapply "unformat"
moksiuc Apr 16, 2026
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
4 changes: 2 additions & 2 deletions libkineto/src/plugin/xpupti/XpuptiActivityApi.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ XpuptiActivityApi& XpuptiActivityApi::singleton() {

void XpuptiActivityApi::pushCorrelationID(int id, CorrelationFlowType type) {
#ifdef HAS_XPUPTI
if (!singleton().externalCorrelationEnabled_) {
if (!externalCorrelationEnabled_) {
return;
}
switch (type) {
Expand All @@ -39,7 +39,7 @@ void XpuptiActivityApi::pushCorrelationID(int id, CorrelationFlowType type) {

void XpuptiActivityApi::popCorrelationID(CorrelationFlowType type) {
#ifdef HAS_XPUPTI
if (!singleton().externalCorrelationEnabled_) {
if (!externalCorrelationEnabled_) {
return;
}
switch (type) {
Expand Down
12 changes: 6 additions & 6 deletions libkineto/src/plugin/xpupti/XpuptiActivityApi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,22 +28,22 @@ class XpuptiActivityApi {
XpuptiActivityApi(const XpuptiActivityApi&) = delete;
XpuptiActivityApi& operator=(const XpuptiActivityApi&) = delete;

virtual ~XpuptiActivityApi() {}
~XpuptiActivityApi() = default;

static XpuptiActivityApi& singleton();

static void pushCorrelationID(int id, CorrelationFlowType type);
static void popCorrelationID(CorrelationFlowType type);
void pushCorrelationID(int id, CorrelationFlowType type);
void popCorrelationID(CorrelationFlowType type);

void enableXpuptiActivities(const std::set<ActivityType>& selected_activities);
void disablePtiActivities(const std::set<ActivityType>& selected_activities);
void clearActivities();
void flushActivities();

virtual std::unique_ptr<XpuptiActivityBufferMap> activityBuffers();
std::unique_ptr<XpuptiActivityBufferMap> activityBuffers();

virtual const std::pair<int, int> processActivities(XpuptiActivityBufferMap&,
std::function<void(const pti_view_record_base*)> handler);
const std::pair<int, int> processActivities(XpuptiActivityBufferMap&,
std::function<void(const pti_view_record_base*)> handler);

private:
XpuptiActivityBufferMap allocatedGpuTraceBuffers_;
Expand Down