Skip to content

Commit 4e20751

Browse files
planetchiliplanetchili
committed
Merge branch 'exp/vport'
2 parents 7f31790 + af5ba42 commit 4e20751

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+381
-202
lines changed

‎IntelPresentMon/Common.props‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<ExternalWarningLevel>TurnOffAllWarnings</ExternalWarningLevel>
1414
<DisableAnalyzeExternal>true</DisableAnalyzeExternal>
1515
<PreprocessorDefinitions>CEREAL_THREAD_SAFE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
16+
<AdditionalIncludeDirectories>..;../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
1617
</ClCompile>
1718
</ItemDefinitionGroup>
1819
<ItemGroup />

‎IntelPresentMon/CommonUtilities/CommonUtilities.vcxproj‎

Lines changed: 35 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -202,59 +202,75 @@
202202
</ImportGroup>
203203
<ImportGroup Label="Shared">
204204
</ImportGroup>
205+
<PropertyGroup>
206+
<CustomVcpkgProps Condition="'$(CustomVcpkgProps)' == ''">
207+
..\..\vcpkg.props
208+
</CustomVcpkgProps>
209+
<CustomCommonProps Condition="'$(CustomCommonProps)' == ''">
210+
..\Common.props
211+
</CustomCommonProps>
212+
<CustomRuntimeControlProps Condition="'$(CustomRuntimeControlProps)' == ''">
213+
..\RuntimeControl.props
214+
</CustomRuntimeControlProps>
215+
</PropertyGroup>
205216
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
206217
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
207-
<Import Project="..\..\vcpkg.props" />
208-
<Import Project="..\RuntimeControl.props" />
209-
<Import Project="..\Common.props" />
218+
<Import Project="$(CustomVcpkgProps)" />
219+
<Import Project="$(CustomRuntimeControlProps)" />
220+
<Import Project="$(CustomCommonProps)" />
210221
</ImportGroup>
211222
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
212223
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
213-
<Import Project="..\..\vcpkg.props" />
214-
<Import Project="..\RuntimeControl.props" />
215-
<Import Project="..\Common.props" />
224+
<Import Project="$(CustomVcpkgProps)" />
225+
<Import Project="$(CustomRuntimeControlProps)" />
226+
<Import Project="$(CustomCommonProps)" />
216227
</ImportGroup>
217228
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
218229
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
219-
<Import Project="..\..\vcpkg.props" />
220-
<Import Project="..\RuntimeControl.props" />
221-
<Import Project="..\Common.props" />
230+
<Import Project="$(CustomVcpkgProps)" />
231+
<Import Project="$(CustomRuntimeControlProps)" />
232+
<Import Project="$(CustomCommonProps)" />
222233
</ImportGroup>
223234
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
224235
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
225-
<Import Project="..\..\vcpkg.props" />
226-
<Import Project="..\RuntimeControl.props" />
227-
<Import Project="..\Common.props" />
236+
<Import Project="$(CustomVcpkgProps)" />
237+
<Import Project="$(CustomRuntimeControlProps)" />
238+
<Import Project="$(CustomCommonProps)" />
228239
</ImportGroup>
229240
<PropertyGroup Label="UserMacros" />
230241
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
231242
<OutDir>$(SolutionDir)build\lib\$(ProjectName)-$(Platform)-$(Configuration)\</OutDir>
232243
<IntDir>$(SolutionDir)build\obj\$(ProjectName)-$(Platform)-$(Configuration)\</IntDir>
244+
<TargetName>IPM$(ProjectName)</TargetName>
233245
</PropertyGroup>
234246
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
235247
<OutDir>$(SolutionDir)build\lib\$(ProjectName)-$(Platform)-$(Configuration)\</OutDir>
236248
<IntDir>$(SolutionDir)build\obj\$(ProjectName)-$(Platform)-$(Configuration)\</IntDir>
249+
<TargetName>IPM$(ProjectName)</TargetName>
237250
</PropertyGroup>
238251
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
239252
<CustomBuildBeforeTargets>
240253
</CustomBuildBeforeTargets>
241254
<OutDir>$(SolutionDir)build\lib\$(ProjectName)-$(Platform)-$(Configuration)\</OutDir>
255+
<TargetName>IPM$(ProjectName)</TargetName>
242256
</PropertyGroup>
243257
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
244258
<CustomBuildBeforeTargets>
245259
</CustomBuildBeforeTargets>
246260
<OutDir>$(SolutionDir)build\lib\$(ProjectName)-$(Platform)-$(Configuration)\</OutDir>
261+
<TargetName>IPM$(ProjectName)</TargetName>
247262
</PropertyGroup>
248263
<PropertyGroup Label="Vcpkg" />
249264
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
250265
<ClCompile>
251266
<WarningLevel>Level3</WarningLevel>
252267
<SDLCheck>true</SDLCheck>
253-
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
268+
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;$(vcPreDefs);%(PreprocessorDefinitions)</PreprocessorDefinitions>
254269
<ConformanceMode>true</ConformanceMode>
255270
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
256271
<LanguageStandard>stdcpplatest</LanguageStandard>
257272
<ExceptionHandling>Async</ExceptionHandling>
273+
<AdditionalIncludeDirectories>../..;$(vcSiblingIncludeDirectory);$(vcInstalledIncludeDirectory);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
258274
</ClCompile>
259275
<Link>
260276
<SubSystem>
@@ -268,11 +284,12 @@
268284
<FunctionLevelLinking>true</FunctionLevelLinking>
269285
<IntrinsicFunctions>true</IntrinsicFunctions>
270286
<SDLCheck>true</SDLCheck>
271-
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
287+
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;$(vcPreDefs);%(PreprocessorDefinitions)</PreprocessorDefinitions>
272288
<ConformanceMode>true</ConformanceMode>
273289
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
274290
<LanguageStandard>stdcpplatest</LanguageStandard>
275291
<ExceptionHandling>Async</ExceptionHandling>
292+
<AdditionalIncludeDirectories>../..;$(vcSiblingIncludeDirectory);$(vcInstalledIncludeDirectory);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
276293
</ClCompile>
277294
<Link>
278295
<SubSystem>
@@ -286,11 +303,12 @@
286303
<ClCompile>
287304
<WarningLevel>Level3</WarningLevel>
288305
<SDLCheck>true</SDLCheck>
289-
<PreprocessorDefinitions>_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
306+
<PreprocessorDefinitions>_DEBUG;_LIB;$(vcPreDefs);%(PreprocessorDefinitions)</PreprocessorDefinitions>
290307
<ConformanceMode>true</ConformanceMode>
291308
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
292309
<LanguageStandard>stdcpplatest</LanguageStandard>
293310
<ExceptionHandling>Async</ExceptionHandling>
311+
<AdditionalIncludeDirectories>../..;$(vcSiblingIncludeDirectory);$(vcInstalledIncludeDirectory);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
294312
</ClCompile>
295313
<Link>
296314
<SubSystem>
@@ -318,11 +336,12 @@
318336
<FunctionLevelLinking>true</FunctionLevelLinking>
319337
<IntrinsicFunctions>true</IntrinsicFunctions>
320338
<SDLCheck>true</SDLCheck>
321-
<PreprocessorDefinitions>NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
339+
<PreprocessorDefinitions>NDEBUG;_LIB;$(vcPreDefs);%(PreprocessorDefinitions)</PreprocessorDefinitions>
322340
<ConformanceMode>true</ConformanceMode>
323341
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
324342
<LanguageStandard>stdcpplatest</LanguageStandard>
325343
<ExceptionHandling>Async</ExceptionHandling>
344+
<AdditionalIncludeDirectories>../..;$(vcSiblingIncludeDirectory);$(vcInstalledIncludeDirectory);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
326345
</ClCompile>
327346
<Link>
328347
<SubSystem>

‎IntelPresentMon/CommonUtilities/CommonUtilities.vcxproj.filters‎

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,27 @@
252252
<ClInclude Include="win\Process.h">
253253
<Filter>Header Files</Filter>
254254
</ClInclude>
255+
<ClInclude Include="win\com\Comdef.h">
256+
<Filter>Header Files</Filter>
257+
</ClInclude>
258+
<ClInclude Include="win\com\ComManager.h">
259+
<Filter>Header Files</Filter>
260+
</ClInclude>
261+
<ClInclude Include="win\com\ComPtr.h">
262+
<Filter>Header Files</Filter>
263+
</ClInclude>
264+
<ClInclude Include="win\com\ProcessSpawnSink.h">
265+
<Filter>Header Files</Filter>
266+
</ClInclude>
267+
<ClInclude Include="win\com\WbemConnection.h">
268+
<Filter>Header Files</Filter>
269+
</ClInclude>
270+
<ClInclude Include="win\com\WbemListener.h">
271+
<Filter>Header Files</Filter>
272+
</ClInclude>
273+
<ClInclude Include="win\com\WbemSink.h">
274+
<Filter>Header Files</Filter>
275+
</ClInclude>
255276
</ItemGroup>
256277
<ItemGroup>
257278
<ClCompile Include="cli\CliFramework.cpp">
@@ -395,7 +416,19 @@
395416
<ClCompile Include="win\ProcessMapBuilder.cpp">
396417
<Filter>Source Files</Filter>
397418
</ClCompile>
398-
<ClCompile Include="Math.cpp">
419+
<ClCompile Include="win\com\ComManager.cpp">
420+
<Filter>Source Files</Filter>
421+
</ClCompile>
422+
<ClCompile Include="win\com\ProcessSpawnSink.cpp">
423+
<Filter>Source Files</Filter>
424+
</ClCompile>
425+
<ClCompile Include="win\com\WbemConnection.cpp">
426+
<Filter>Source Files</Filter>
427+
</ClCompile>
428+
<ClCompile Include="win\com\WbemListener.cpp">
429+
<Filter>Source Files</Filter>
430+
</ClCompile>
431+
<ClCompile Include="win\com\WbemSink.cpp">
399432
<Filter>Source Files</Filter>
400433
</ClCompile>
401434
</ItemGroup>

‎IntelPresentMon/CommonUtilities/Exception.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
#include "Exception.h"
2-
#include "../CommonUtilities/win/Utilities.h"
2+
#include "win/Utilities.h"
33
#include <sstream>
44
#include "log/GlobalPolicy.h"
55
#include "log/StackTrace.h"
6-
#include "../PresentMonAPI2/PresentMonAPI.h"
76
#include <format>
87

98

‎IntelPresentMon/CommonUtilities/Exception.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#include <exception>
44
#include <memory>
55
#include <optional>
6-
#include "../PresentMonAPI2/PresentMonAPI.h"
6+
#include <IntelPresentMon/PresentMonAPI2/PresentMonAPI.h>
77

88
namespace pmon::util
99
{

‎IntelPresentMon/CommonUtilities/log/Channel.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#include "IDriver.h"
44
#include "IChannelObject.h"
55
#include "Entry.h"
6-
#include <concurrentqueue\blockingconcurrentqueue.h>
6+
#include <concurrentqueue/blockingconcurrentqueue.h>
77
#include <variant>
88
#include <semaphore>
99
#include "PanicLogger.h"

‎IntelPresentMon/CommonUtilities/log/DiagnosticDriver.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#pragma once
22
#include "IDriver.h"
33
#include "IChannel.h"
4-
#include "../../PresentMonAPI2/PresentMonDiagnostics.h"
4+
#include <IntelPresentMon/PresentMonAPI2/PresentMonDiagnostics.h>
55
#include "../win/Event.h"
66
#include <atomic>
77
#include <concurrentqueue/concurrentqueue.h>

‎IntelPresentMon/CommonUtilities/log/Log.cpp‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,4 +90,28 @@ namespace pmon::util::log
9090
pmquell(pChan->FlushEntryPointExit())
9191
}
9292
}
93+
94+
#ifdef PM_PORT_DEFINE_NULL_CHANNEL_GETTER_
95+
std::shared_ptr<IChannel> GetDefaultChannel() noexcept
96+
{
97+
return {};
98+
}
99+
#endif
100+
#ifdef PM_PORT_DEFINE_DBG_CHANNEL_GETTER_
101+
#include "MsvcDebugDriver.h"
102+
#include "TextFormatter.h"
103+
std::shared_ptr<IChannel> GetDefaultChannel() noexcept
104+
{
105+
static std::shared_ptr<IChannel> pChannel;
106+
if (!pChannel) {
107+
pChannel = std::make_shared<Channel>();
108+
// TODO: add error code resolvers (PM error code resolver is from wrapper, inject later?)
109+
// TODO: consider adding line tracking policy
110+
pChannel->AttachComponent(std::make_shared<MsvcDebugDriver>(
111+
std::make_shared<TextFormatter>()
112+
), "drv:dbg");
113+
}
114+
return pChannel;
115+
}
116+
#endif
93117
}

‎IntelPresentMon/CommonUtilities/pipe/Pipe.h‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,9 @@ namespace pmon::util::pipe
5858
// calculate size of body
5959
const auto payloadSize = uint32_t(writeBuf_.size() - sizeSize);
6060
// replace the placeholder with the actual body size
61-
auto bufSeq = writeBuf_.data();
62-
const auto iSize = const_cast<char*>(as::buffer_cast<const char*>(bufSeq));
61+
const auto pSizeInPlace = const_cast<char*>(&*as::buffers_begin(writeBuf_.data()));
6362
auto replacement = std::string_view{ reinterpret_cast<const char*>(&payloadSize), sizeof(payloadSize) };
64-
std::ranges::copy(replacement, iSize);
63+
std::ranges::copy(replacement, pSizeInPlace);
6564
// transmit the packet
6665
co_await Write_(timeoutMs);
6766
}

‎IntelPresentMon/CommonUtilities/ref/gen/GeneratedReflection.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
#include "../GeneratedReflectionHelpers.h"
1111

1212
// target includes
13-
#include "../../../../IntelPresentMon/ControlLib/igcl_api.h"
14-
#include "../../../../IntelPresentMon/ControlLib/ctlpvttemp_api.h"
13+
#include <IntelPresentMon/ControlLib/igcl_api.h>
14+
#include <IntelPresentMon/ControlLib/ctlpvttemp_api.h>
1515

1616
namespace pmon::util::ref::gen
1717
{

0 commit comments

Comments
 (0)