-
Notifications
You must be signed in to change notification settings - Fork 276
Enable string-views for use with Tracelogging #589
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.
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
base: master
Are you sure you want to change the base?
Enable string-views for use with Tracelogging #589
Conversation
|
The exact output from the asan tests (x64) are: Which maps to: ... so this is llvm/llvm-project#125105 |
| #include <string> | ||
| #include <vector> | ||
| #include <utility> | ||
| #include <TraceLoggingProvider.h> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Technically this is illegally reaching into internal implementation details of TraceLoggingProvider.h.
Probably the right thing to do is:
- Modify TraceLoggingProvider.h to expose enough "supported" machinery to support some C++ constructs.
- Modify WIL to use the supported mechanism if present, or to poly-fill the machinery if not present. (The poly-fill will only be used on old versions of TraceLoggingProvider.h, so future changes to TraceLoggingProvider.h internals will not break the poly-fill.
| #if __cpp_lib_string_view >= 201606L | ||
|
|
||
| template <typename TContainer> | ||
| struct _tlgWrapBufferStlContainer |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The _tlg prefix is used to signal "TraceLoggingProvider.h-internal machinery". This prefix should not be used for "WIL-internal machinery", even if it is "WIL-internal TraceLogging-related" machinery.
| }; | ||
|
|
||
| template <typename TChar> | ||
| struct _tlgTypeMapStlString |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should not use _tlg prefix for this.
| }; | ||
|
|
||
| template <typename TChar, typename TTraits> | ||
| TLG_INLINE auto _tlg_CALL _tlgWrapAuto(std::basic_string_view<TChar, TTraits> const& value) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Don't use _tlg_CALL here -- it's an unnecessary use of TraceLoggingProvider.h internal machinery. Instead, use WINAPI or STDCALL or similar.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why would we need a calling convention for this template function? is it passed as a function pointer somewhere?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In practice, it's probably not particularly significant. However, it is possible for two LIBs to use different default calling conventions and both include the header. In that case, the linker will see two distinct inline functions, and that can be confusing or sub-optimal. I just find it to be best practice to put a calling convention on any non-member function declaration in a header.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ok. I don't think we put calling conventions on standalone functions anywhere else in wil :)
| } | ||
|
|
||
| #define TraceLoggingStringView(pValue, ...) _tlgArgAuto(static_cast<std::string_view>(pValue), __VA_ARGS__) | ||
| #define TraceLoggingWideStringView(pValue, ...) _tlgArgAuto(static_cast<std::wstring_view>(pValue), __VA_ARGS__) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The parameter to this macro should not be a pointer, so probably shouldn't be named pValue.
| typedef UINT8 _tlgTypeType0; | ||
| typedef UINT16 _tlgTypeType1; | ||
| static bool const _tlgIsSimple = false; | ||
| static TlgIn_t const _tlgViewIn = wistd::is_same_v<TChar, char> ? TlgInCOUNTEDANSISTRING : TlgInCOUNTEDSTRING; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should probably be based on sizeof(TChar) so it can do something reasonable with char8_t and char16_t. (And it should error-out for sizes other than 1 and 2.)
| }; | ||
|
|
||
| template <typename TChar> | ||
| struct _tlgTypeMapStlString |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should probably have a specialization for char8_t that sets OutType to UTF8.
| }; | ||
|
|
||
| template <typename TChar, typename TTraits> | ||
| TLG_INLINE auto _tlg_CALL _tlgWrapAuto(std::basic_string_view<TChar, TTraits> const& value) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Don't need TLG_INLINE here -- it's an unnecessary obfuscation. Just use inline.
| :: so we _can_ build the ASan tests, which is at least something. For now we're going to handle this limitation here and | ||
| :: avoid running the ASan test in this specific scenario | ||
| set RUN_ASAN_TEST=1 | ||
| if not %RUN_ASAN_TEST%=='' set RUN_ASAN_TEST=1 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I assume your intent is to initialize if not set, in which case the not seems out of place. Additionally, you probably want to surround with quotes so that once variable substitution takes place, you don't have something empty on the left hand side, which normally causes errors and is probably why CI is failing. E.g.
| if not %RUN_ASAN_TEST%=='' set RUN_ASAN_TEST=1 | |
| if "%RUN_ASAN_TEST%"=="" set RUN_ASAN_TEST=1 |
|
|
||
| TContainer const& view; | ||
|
|
||
| __forceinline explicit _tlgWrapBufferStlContainer(_In_ TContainer const& ref) : view(ref) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
does this need our special __forceinline keyword? can we just use the standard 'inline' keyword?
|
|
||
| TContainer const& view; | ||
|
|
||
| __forceinline explicit _tlgWrapBufferStlContainer(_In_ TContainer const& ref) : view(ref) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
as this is a template parameter, can we use a 'Universal Reference' with std::forward?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think that achieves anything here. Universal reference is so that you can accept both const and non-const references, or so you can accept both non-const-rvalue and non-const-lvalue references. We only need to be able to accept a const reference, so no fancy universal reference is needed.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
that's because moves don't buy us anything for these templated types vs. making copies?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There are no copies. It's a const ref all the way down.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
oops. yep. sorry, missed that!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Jon - feel free to close this. I can't seem to resolve/close it myself :(
| { | ||
| typedef UINT8 _tlgTypeType0; | ||
| typedef UINT16 _tlgTypeType1; | ||
| static bool const _tlgIsSimple = false; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
can these be constexpr?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There isn't really any significant difference between class scope static bool const and static bool constexpr. A constexpr would allow more complex variables to be used here (const static only allows trivial scalars to be used without a corresponding extern), but we only need a bool.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
sure. I tend to make everything constexpr that can be supported, as I don't assume what the compiler can optimize / change where it puts such things - so I make it the rule, not the exception :)
it's clearly not a bit deal to go either way to me.
| }; | ||
|
|
||
| template <typename TChar, typename TTraits> | ||
| TLG_INLINE auto _tlg_CALL _tlgWrapAuto(std::basic_string_view<TChar, TTraits> const& value) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why would we need a calling convention for this template function? is it passed as a function pointer somewhere?
| }; | ||
|
|
||
| template <typename TChar, typename TTraits> | ||
| TLG_INLINE auto _tlg_CALL _tlgWrapAuto(std::basic_string_view<TChar, TTraits> const& value) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we probably don't need TLG_INLINE either.
We have a lot of tracelogging, and we have a lot of things that are string views to log. Unfortunately, without direct support for counted strings in TLG, we see people doing this:
Or worse,
winrt::hstring(x).c_str()- all to get the null-terminated form that TraceLoggingWrite/TraceLoggingXString require.This change adds specializations for the
_tlgAutotemplates, sowil::zwstring_view,std::wstring_view,std::string_view,std::wstring,std::string, andwinrt::hstringcan all be used withTraceLoggingValue(). They can also be used as the parameter-type for theDEFINE_EVENT_*family of macro-stamped-out events.A better test would use one of the ETW watchers to verify that the event got logged, but a manual use of
xperf -start MyLogger -on bd2bf191-ac1a-4732-b563-bb3e3006f617then run the tests, thenxperf -stop -d something.etland opensomething.etlwith WPA.The infrastructure is also present to support passing arrays/spans of scalar types, but left unimplemented for now.