Skip to content

Commit 535b003

Browse files
committed
Merge branch 'rc2.2.0' into rc2.2
2 parents 140080d + 7b20d31 commit 535b003

File tree

6 files changed

+28
-2
lines changed

6 files changed

+28
-2
lines changed

IntelPresentMon/CommonUtilities/log/ChannelFlusher.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@ namespace pmon::util::log
2525
}
2626
ChannelFlusher::~ChannelFlusher()
2727
{
28-
exitEvent_.Set();
28+
pmquell(exitEvent_.Set());
2929
}
3030
}

IntelPresentMon/CommonUtilities/log/ChannelFlusher.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,12 @@ namespace pmon::util::log
1313
public:
1414
ChannelFlusher(std::weak_ptr<IEntrySink> pChan);
1515
~ChannelFlusher();
16+
17+
ChannelFlusher(const ChannelFlusher&) = delete;
18+
ChannelFlusher & operator=(const ChannelFlusher&) = delete;
19+
ChannelFlusher(ChannelFlusher&&) = delete;
20+
ChannelFlusher & operator=(ChannelFlusher&&) = delete;
21+
1622
private:
1723
std::weak_ptr<IEntrySink> pChan_;
1824
mt::Thread worker_;

IntelPresentMon/PresentMonService/Service.cpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,13 @@ void Service::SignalClientSessionOpened()
6565
SetEvent(clientSessionEvent_);
6666
}
6767

68+
Service::~Service()
69+
{
70+
if (clientSessionEvent_) {
71+
CloseHandle(clientSessionEvent_);
72+
}
73+
}
74+
6875
ConcreteService::ConcreteService(const TCHAR* serviceName) : mServiceName(serviceName)
6976
{
7077
mEventLogHandle = RegisterEventSource(NULL, mServiceName.c_str());

IntelPresentMon/PresentMonService/Service.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class Service
2323
virtual HANDLE GetResetPowerTelemetryHandle() = 0;
2424
HANDLE GetClientSessionHandle();
2525
void SignalClientSessionOpened();
26-
virtual ~Service() = default;
26+
virtual ~Service();
2727
private:
2828
std::optional<int> errCode_;
2929
HANDLE clientSessionEvent_;

PresentData/PresentMonTraceConsumer.cpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,13 @@ PMTraceConsumer::PMTraceConsumer()
111111
hEventsReadyEvent = CreateEventW(nullptr, FALSE, FALSE, nullptr);
112112
}
113113

114+
PMTraceConsumer::~PMTraceConsumer()
115+
{
116+
if (hEventsReadyEvent && hEventsReadyEvent != INVALID_HANDLE_VALUE) {
117+
CloseHandle(hEventsReadyEvent);
118+
}
119+
}
120+
114121
void PMTraceConsumer::HandleD3D9Event(EVENT_RECORD* pEventRecord)
115122
{
116123
auto const& hdr = pEventRecord->EventHeader;

PresentData/PresentMonTraceConsumer.hpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -434,6 +434,12 @@ struct PMTraceConsumer
434434
// Functions for decoding ETW and analysing process and present events.
435435

436436
PMTraceConsumer();
437+
~PMTraceConsumer();
438+
439+
PMTraceConsumer(const PMTraceConsumer&) = delete;
440+
PMTraceConsumer& operator=(const PMTraceConsumer&) = delete;
441+
PMTraceConsumer(PMTraceConsumer&&) = delete;
442+
PMTraceConsumer& operator=(PMTraceConsumer&&) = delete;
437443

438444
void HandleDxgkBlt(EVENT_HEADER const& hdr, uint64_t hwnd, bool redirectedPresent);
439445
void HandleDxgkFlip(EVENT_HEADER const& hdr, int32_t flipInterval, bool isMMIOFlip, bool isMPOFlip);

0 commit comments

Comments
 (0)