Skip to content

Commit 8240060

Browse files
frank-msodspfmarasco
frank-msodsp
and
fmarasco
authored
add module (#1336)
* add module * revert lib/include/public/version.hpp * revert Version.hpp * revert lib/include/public/version.hpp * revert Version.hpp * fixing sln file format --------- Co-authored-by: fmarasco <fmarasco+odspmdb@microsoft.com>
1 parent 11ffbe2 commit 8240060

File tree

14 files changed

+59
-2
lines changed

14 files changed

+59
-2
lines changed

‎CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -315,6 +315,7 @@ option(BUILD_PRIVACYGUARD "Build Privacy Guard" YES)
315315
option(BUILD_CDS "Build CDS - Common Diagnostic Stack" YES)
316316
option(BUILD_LIVEEVENTINSPECTOR "Build Live Event Inspector" YES)
317317
option(BUILD_SIGNALS "Build Signals" YES)
318+
option(BUILD_SANITIZER "Build Sanitizer" YES)
318319
option(LINK_STATIC_DEPENDS "Link dependencies for static build" YES)
319320

320321
# Enable Azure Monitor / Application Insights end-point support

‎Solutions/MSTelemetrySDK.sln‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liveeventinspector", "..\li
131131
EndProject
132132
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "signals", "..\lib\modules\signals\signals.vcxitems", "{D5E1C2E4-DF23-4D2E-85F8-DF737C6A9B9D}"
133133
EndProject
134+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sanitizer", "..\lib\modules\sanitizer\sanitizer.vcxitems", "{67F82868-5F53-4337-95F1-811557AE53E4}"
135+
EndProject
134136
Global
135137
GlobalSection(SharedMSBuildProjectFiles) = preSolution
136138
..\lib\modules\cds\cds.vcxitems*{0299c8ba-03b9-451e-8a52-8df1291173a5}*SharedItemsImports = 9
@@ -143,6 +145,7 @@ Global
143145
..\lib\modules\filter\filter.vcxitems*{1dc6b38a-b390-34ce-907f-4958807a3d42}*SharedItemsImports = 4
144146
..\lib\modules\liveeventinspector\liveeventinspector.vcxitems*{1dc6b38a-b390-34ce-907f-4958807a3d42}*SharedItemsImports = 4
145147
..\lib\modules\privacyguard\privacyguard.vcxitems*{1dc6b38a-b390-34ce-907f-4958807a3d42}*SharedItemsImports = 4
148+
..\lib\modules\sanitizer\sanitizer.vcxitems*{1dc6b38a-b390-34ce-907f-4958807a3d42}*SharedItemsImports = 4
146149
..\lib\modules\signals\signals.vcxitems*{1dc6b38a-b390-34ce-907f-4958807a3d42}*SharedItemsImports = 4
147150
..\lib\pal\desktop\desktop.vcxitems*{1dc6b38a-b390-34ce-907f-4958807a3d42}*SharedItemsImports = 4
148151
Clienttelemetry\Clienttelemetry.vcxitems*{1dc6b38a-b390-34ce-907f-4958807a3d42}*SharedItemsImports = 4
@@ -156,6 +159,7 @@ Global
156159
..\lib\modules\filter\filter.vcxitems*{216a8e97-21f7-4bef-9e52-7f772c177c32}*SharedItemsImports = 4
157160
..\lib\modules\liveeventinspector\liveeventinspector.vcxitems*{216a8e97-21f7-4bef-9e52-7f772c177c32}*SharedItemsImports = 4
158161
..\lib\modules\privacyguard\privacyguard.vcxitems*{216a8e97-21f7-4bef-9e52-7f772c177c32}*SharedItemsImports = 4
162+
..\lib\modules\sanitizer\sanitizer.vcxitems*{216a8e97-21f7-4bef-9e52-7f772c177c32}*SharedItemsImports = 4
159163
..\lib\modules\signals\signals.vcxitems*{216a8e97-21f7-4bef-9e52-7f772c177c32}*SharedItemsImports = 4
160164
..\lib\pal\desktop\desktop.vcxitems*{216a8e97-21f7-4bef-9e52-7f772c177c32}*SharedItemsImports = 4
161165
Clienttelemetry\Clienttelemetry.vcxitems*{216a8e97-21f7-4bef-9e52-7f772c177c32}*SharedItemsImports = 4
@@ -168,6 +172,7 @@ Global
168172
..\lib\modules\filter\filter.vcxitems*{434c594f-cde0-3690-ac0a-9ed854b74092}*SharedItemsImports = 4
169173
..\lib\modules\liveeventinspector\liveeventinspector.vcxitems*{434c594f-cde0-3690-ac0a-9ed854b74092}*SharedItemsImports = 4
170174
..\lib\modules\privacyguard\privacyguard.vcxitems*{434c594f-cde0-3690-ac0a-9ed854b74092}*SharedItemsImports = 4
175+
..\lib\modules\sanitizer\sanitizer.vcxitems*{434c594f-cde0-3690-ac0a-9ed854b74092}*SharedItemsImports = 4
171176
..\lib\pal\desktop\desktop.vcxitems*{434c594f-cde0-3690-ac0a-9ed854b74092}*SharedItemsImports = 4
172177
Clienttelemetry\Clienttelemetry.vcxitems*{434c594f-cde0-3690-ac0a-9ed854b74092}*SharedItemsImports = 4
173178
Clienttelemetry\Clienttelemetry.vcxitems*{45d41acc-2c3c-43d2-bc10-02aa73ffc7c7}*SharedItemsImports = 9
@@ -178,6 +183,7 @@ Global
178183
..\lib\modules\filter\filter.vcxitems*{49077dbf-e363-4d2d-8334-636569a771b6}*SharedItemsImports = 4
179184
..\lib\modules\liveeventinspector\liveeventinspector.vcxitems*{49077dbf-e363-4d2d-8334-636569a771b6}*SharedItemsImports = 4
180185
..\lib\modules\privacyguard\privacyguard.vcxitems*{49077dbf-e363-4d2d-8334-636569a771b6}*SharedItemsImports = 4
186+
..\lib\modules\sanitizer\sanitizer.vcxitems*{49077dbf-e363-4d2d-8334-636569a771b6}*SharedItemsImports = 4
181187
..\lib\modules\signals\signals.vcxitems*{49077dbf-e363-4d2d-8334-636569a771b6}*SharedItemsImports = 4
182188
..\lib\pal\universal\universal.vcxitems*{49077dbf-e363-4d2d-8334-636569a771b6}*SharedItemsImports = 4
183189
..\lib\shared\Shared.vcxitems*{49077dbf-e363-4d2d-8334-636569a771b6}*SharedItemsImports = 4
@@ -189,6 +195,7 @@ Global
189195
..\lib\modules\filter\filter.vcxitems*{57a81ed9-5603-471f-afee-9656da74178d}*SharedItemsImports = 4
190196
..\lib\modules\liveeventinspector\liveeventinspector.vcxitems*{57a81ed9-5603-471f-afee-9656da74178d}*SharedItemsImports = 4
191197
..\lib\modules\privacyguard\privacyguard.vcxitems*{57a81ed9-5603-471f-afee-9656da74178d}*SharedItemsImports = 4
198+
..\lib\modules\sanitizer\sanitizer.vcxitems*{57a81ed9-5603-471f-afee-9656da74178d}*SharedItemsImports = 4
192199
..\lib\modules\signals\signals.vcxitems*{57a81ed9-5603-471f-afee-9656da74178d}*SharedItemsImports = 4
193200
..\lib\pal\universal\universal.vcxitems*{57a81ed9-5603-471f-afee-9656da74178d}*SharedItemsImports = 4
194201
Clienttelemetry\Clienttelemetry.vcxitems*{57a81ed9-5603-471f-afee-9656da74178d}*SharedItemsImports = 4
@@ -201,13 +208,15 @@ Global
201208
..\lib\modules\filter\filter.vcxitems*{7a75748d-5d6b-48a5-83cb-f5f439133d59}*SharedItemsImports = 4
202209
..\lib\modules\liveeventinspector\liveeventinspector.vcxitems*{7a75748d-5d6b-48a5-83cb-f5f439133d59}*SharedItemsImports = 4
203210
..\lib\modules\privacyguard\privacyguard.vcxitems*{7a75748d-5d6b-48a5-83cb-f5f439133d59}*SharedItemsImports = 4
211+
..\lib\modules\sanitizer\sanitizer.vcxitems*{7a75748d-5d6b-48a5-83cb-f5f439133d59}*SharedItemsImports = 4
204212
..\lib\modules\signals\signals.vcxitems*{7a75748d-5d6b-48a5-83cb-f5f439133d59}*SharedItemsImports = 4
205213
..\lib\pal\universal\universal.vcxitems*{7a75748d-5d6b-48a5-83cb-f5f439133d59}*SharedItemsImports = 4
206214
Clienttelemetry\Clienttelemetry.vcxitems*{7a75748d-5d6b-48a5-83cb-f5f439133d59}*SharedItemsImports = 4
207215
..\lib\modules\signals\signals.vcxitems*{d5e1c2e4-df23-4d2e-85f8-df737c6a9b9d}*SharedItemsImports = 9
208216
..\lib\modules\filter\filter.vcxitems*{d74e42ec-c6ee-4944-b92a-eb711be002a9}*SharedItemsImports = 9
209217
..\lib\shared\Shared.vcxitems*{dc91621e-a203-42df-8e03-3a23dd0602b1}*SharedItemsImports = 4
210218
..\lib\modules\privacyguard\privacyguard.vcxitems*{e1f6ca48-3bbf-4378-8d1e-6bbf4869db5b}*SharedItemsImports = 9
219+
..\lib\modules\sanitizer\sanitizer.vcxitems*{e1f6ca48-3bbf-4378-8d1e-6bbf4869db5b}*SharedItemsImports = 9
211220
..\lib\shared\Shared.vcxitems*{ef859326-2a11-481c-ae8c-03d754f1c412}*SharedItemsImports = 9
212221
..\lib\modules\liveeventinspector\liveeventinspector.vcxitems*{f8bb42f6-9c93-423b-b0c6-23ef79dd959a}*SharedItemsImports = 9
213222
..\lib\decoder\decoder.vcxitems*{fe79fb3a-b3ef-38df-b7a4-11277db72b39}*SharedItemsImports = 4
@@ -217,6 +226,7 @@ Global
217226
..\lib\modules\filter\filter.vcxitems*{fe79fb3a-b3ef-38df-b7a4-11277db72b39}*SharedItemsImports = 4
218227
..\lib\modules\liveeventinspector\liveeventinspector.vcxitems*{fe79fb3a-b3ef-38df-b7a4-11277db72b39}*SharedItemsImports = 4
219228
..\lib\modules\privacyguard\privacyguard.vcxitems*{fe79fb3a-b3ef-38df-b7a4-11277db72b39}*SharedItemsImports = 4
229+
..\lib\modules\sanitizer\sanitizer.vcxitems*{fe79fb3a-b3ef-38df-b7a4-11277db72b39}*SharedItemsImports = 4
220230
..\lib\pal\desktop\desktop.vcxitems*{fe79fb3a-b3ef-38df-b7a4-11277db72b39}*SharedItemsImports = 4
221231
Clienttelemetry\Clienttelemetry.vcxitems*{fe79fb3a-b3ef-38df-b7a4-11277db72b39}*SharedItemsImports = 4
222232
EndGlobalSection

‎Solutions/win10-cs/win10-cs.vcxproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@
101101
<Import Project="..\..\lib\modules\azmon\azmon.vcxitems" Condition="exists('..\..\lib\modules\azmon\azmon.vcxitems')" Label="Shared" />
102102
<Import Project="..\..\lib\modules\cds\cds.vcxitems" Condition="exists('..\..\lib\modules\cds\cds.vcxitems')" Label="Shared" />
103103
<Import Project="..\..\lib\modules\signals\signals.vcxitems" Condition="exists('..\..\lib\modules\signals\signals.vcxitems')" Label="Shared" />
104+
<Import Project="..\..\lib\modules\sanitizer\sanitizer.vcxitems" Condition="exists('..\..\lib\modules\sanitizer\sanitizer.vcxitems')" Label="Shared" />
104105
</ImportGroup>
105106
<ImportGroup Label="PropertySheets">
106107
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

‎Solutions/win10-dll/win10-dll.vcxproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@
104104
<Import Project="..\..\lib\modules\liveeventinspector\liveeventinspector.vcxitems" Condition="exists('..\..\lib\modules\liveeventinspector\liveeventinspector.vcxitems')" Label="Shared" />
105105
<Import Project="..\..\lib\modules\cds\cds.vcxitems" Condition="exists('..\..\lib\modules\cds\cds.vcxitems')" Label="Shared" />
106106
<Import Project="..\..\lib\modules\signals\signals.vcxitems" Condition="exists('..\..\lib\modules\signals\signals.vcxitems')" Label="Shared" />
107+
<Import Project="..\..\lib\modules\sanitizer\sanitizer.vcxitems" Condition="exists('..\..\lib\modules\sanitizer\sanitizer.vcxitems')" Label="Shared" />
107108
</ImportGroup>
108109
<ImportGroup Label="PropertySheets">
109110
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

‎Solutions/win10-lib/win10-lib.vcxproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@
100100
<Import Project="..\..\lib\modules\liveeventinspector\liveeventinspector.vcxitems" Condition="exists('..\..\lib\modules\liveeventinspector\liveeventinspector.vcxitems')" Label="Shared" />
101101
<Import Project="..\..\lib\modules\cds\cds.vcxitems" Condition="exists('..\..\lib\modules\cds\cds.vcxitems')" Label="Shared" />
102102
<Import Project="..\..\lib\modules\signals\signals.vcxitems" Condition="exists('..\..\lib\modules\signals\signals.vcxitems')" Label="Shared" />
103+
<Import Project="..\..\lib\modules\sanitizer\sanitizer.vcxitems" Condition="exists('..\..\lib\modules\sanitizer\sanitizer.vcxitems')" Label="Shared" />
103104
</ImportGroup>
104105
<ImportGroup Label="PropertySheets">
105106
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

‎Solutions/win32-dll/win32-dll.vcxproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@
102102
<Import Project="..\..\lib\modules\liveeventinspector\liveeventinspector.vcxitems" Condition="exists('..\..\lib\modules\liveeventinspector\liveeventinspector.vcxitems')" Label="Shared" />
103103
<Import Project="..\..\lib\modules\cds\cds.vcxitems" Condition="exists('..\..\lib\modules\cds\cds.vcxitems')" Label="Shared" />
104104
<Import Project="..\..\lib\modules\signals\signals.vcxitems" Condition="exists('..\..\lib\modules\signals\signals.vcxitems')" Label="Shared" />
105+
<Import Project="..\..\lib\modules\sanitizer\sanitizer.vcxitems" Condition="exists('..\..\lib\modules\sanitizer\sanitizer.vcxitems')" Label="Shared" />
105106
</ImportGroup>
106107
<ImportGroup Label="PropertySheets">
107108
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

‎Solutions/win32-lib/win32-lib.vcxproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@
149149
<Import Project="..\..\lib\modules\liveeventinspector\liveeventinspector.vcxitems" Condition="exists('..\..\lib\modules\liveeventinspector\liveeventinspector.vcxitems')" Label="Shared" />
150150
<Import Project="..\..\lib\modules\cds\cds.vcxitems" Condition="exists('..\..\lib\modules\cds\cds.vcxitems')" Label="Shared" />
151151
<Import Project="..\..\lib\modules\signals\signals.vcxitems" Condition="exists('..\..\lib\modules\signals\signals.vcxitems')" Label="Shared" />
152+
<Import Project="..\..\lib\modules\sanitizer\sanitizer.vcxitems" Condition="exists('..\..\lib\modules\sanitizer\sanitizer.vcxitems')" Label="Shared" />
152153
</ImportGroup>
153154
<ImportGroup Label="PropertySheets">
154155
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

‎lib/CMakeLists.txt‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Honor visibility properties for all target types
22
cmake_policy(SET CMP0063 NEW)
33

4-
include_directories( . ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include/public ${CMAKE_CURRENT_SOURCE_DIR}/include/public ${CMAKE_CURRENT_SOURCE_DIR}/include/mat ${CMAKE_CURRENT_SOURCE_DIR}/pal ${CMAKE_CURRENT_SOURCE_DIR}/utils ${CMAKE_CURRENT_SOURCE_DIR}/modules/exp ${CMAKE_CURRENT_SOURCE_DIR}/modules/dataviewer ${CMAKE_CURRENT_SOURCE_DIR}/modules/privacyguard ${CMAKE_CURRENT_SOURCE_DIR}/modules/liveeventinspector ${CMAKE_CURRENT_SOURCE_DIR}/../third_party/Reachability ${CMAKE_CURRENT_SOURCE_DIR}/modules/cds ${CMAKE_CURRENT_SOURCE_DIR}/modules/signals /usr/local/include )
4+
include_directories( . ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include/public ${CMAKE_CURRENT_SOURCE_DIR}/include/public ${CMAKE_CURRENT_SOURCE_DIR}/include/mat ${CMAKE_CURRENT_SOURCE_DIR}/pal ${CMAKE_CURRENT_SOURCE_DIR}/utils ${CMAKE_CURRENT_SOURCE_DIR}/modules/exp ${CMAKE_CURRENT_SOURCE_DIR}/modules/dataviewer ${CMAKE_CURRENT_SOURCE_DIR}/modules/privacyguard ${CMAKE_CURRENT_SOURCE_DIR}/modules/liveeventinspector ${CMAKE_CURRENT_SOURCE_DIR}/../third_party/Reachability ${CMAKE_CURRENT_SOURCE_DIR}/modules/cds ${CMAKE_CURRENT_SOURCE_DIR}/modules/signals ${CMAKE_CURRENT_SOURCE_DIR}/modules/sanitizer /usr/local/include )
55

66
set(SRCS decorators/BaseDecorator.cpp
77
packager/BondSplicer.cpp
@@ -110,6 +110,17 @@ if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/modules/signals/ AND BUILD_SIGNALS)
110110
)
111111
endif()
112112

113+
if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/modules/sanitizer/ AND BUILD_SANITIZER)
114+
list(APPEND SRCS
115+
modules/sanitizer/Sanitizer.cpp
116+
modules/sanitizer/SanitizerProvider.cpp
117+
modules/sanitizer/SanitizerStringUtils.cpp
118+
modules/sanitizer/SanitizerTargets.cpp
119+
modules/sanitizer/SanitizerTrie.cpp
120+
modules/sanitizer/SanitizerTrieNode.cpp
121+
)
122+
endif()
123+
113124
if(PAL_IMPLEMENTATION STREQUAL "CPP11")
114125
if(APPLE)
115126
list(APPEND SRCS

‎lib/api/LogManagerImpl.cpp‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,19 @@
8585
#endif
8686
#endif
8787

88+
#ifdef HAVE_MAT_SANITIZER
89+
#if defined __has_include
90+
#if __has_include("modules/sanitizer/Sanitizer.hpp")
91+
#include "modules/sanitizer/Sanitizer.hpp"
92+
#else
93+
/* Compiling without Sanitizer support because Santizer private header is unavailable */
94+
#undef HAVE_MAT_SANITIZER
95+
#endif
96+
#else
97+
#include "modules/sanitizer/Sanitizer.hpp"
98+
#endif
99+
#endif
100+
88101
namespace MAT_NS_BEGIN
89102
{
90103
void DeadLoggers::AddMap(LoggerMap&& source)

‎lib/include/mat/config-default.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
1616
# if __has_include("modules/signals/Signals.hpp")
1717
# define HAVE_MAT_SIGNALS
1818
# endif
19+
# if __has_include("modules/sanitizer/Sanitizer.hpp")
20+
# define HAVE_MAT_SANITIZER
21+
# endif
1922
#endif
2023
#endif
2124
#if defined(HAVE_PRIVATE_MODULES)

0 commit comments

Comments
 (0)