Improve call_once performance by using InitOnceBeginInitialize / InitOnceComplete #688
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| :: Copyright (c) Microsoft Corporation. | ||
| :: SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception | ||
| :: | ||
| :: Generates aliases for Windows API functions called by headers. | ||
| :: TRANSITION, VSO-1116868 "'aliasobj.exe' should be available with Visual Studio" | ||
|
|
||
| cd %~dp0 | ||
|
|
||
| rmdir /s /q i386 | ||
| rmdir /s /q amd64 | ||
| rmdir /s /q arm | ||
| rmdir /s /q arm64 | ||
| rmdir /s /q chpe | ||
|
|
||
| mkdir i386 | ||
| mkdir amd64 | ||
| mkdir arm | ||
| mkdir arm64 | ||
| mkdir chpe | ||
|
|
||
| :: __std_init_once_begin_initialize | ||
| ..\..\..\..\..\tools\x86\aliasobj.exe ^ | ||
| __imp____std_init_once_begin_initialize@16 ^ | ||
| __imp__InitOnceBeginInitialize@16 ^ | ||
| i386\std_init_once_begin_initialize.obj | ||
| ..\..\..\..\..\tools\amd64\aliasobj.exe ^ | ||
| __imp___std_init_once_begin_initialize ^ | ||
| __imp_InitOnceBeginInitialize ^ | ||
| amd64\std_init_once_begin_initialize.obj | ||
| ..\..\..\..\..\tools\x86\aliasobj.exe ^ | ||
| __imp___std_init_once_begin_initialize ^ | ||
| __imp_InitOnceBeginInitialize ^ | ||
| arm\std_init_once_begin_initialize.obj | ||
| copy amd64\std_init_once_begin_initialize.obj arm64\std_init_once_begin_initialize.obj | ||
| ..\..\..\..\..\tools\x86\aliasobj.exe ^ | ||
| __imp_#__std_init_once_begin_initialize@16 ^ | ||
| __imp_#InitOnceBeginInitialize@16 ^ | ||
| chpe\std_init_once_begin_initialize.obj | ||
|
|
||
| :: __std_init_once_complete | ||
| ..\..\..\..\..\tools\x86\aliasobj.exe ^ | ||
| __imp____std_init_once_complete@12 ^ | ||
| __imp__InitOnceComplete@12 ^ | ||
| i386\std_init_once_complete.obj | ||
| ..\..\..\..\..\tools\amd64\aliasobj.exe ^ | ||
| __imp___std_init_once_complete ^ | ||
| __imp_InitOnceComplete ^ | ||
| amd64\std_init_once_complete.obj | ||
| ..\..\..\..\..\tools\x86\aliasobj.exe ^ | ||
| __imp___std_init_once_complete ^ | ||
| __imp_InitOnceComplete ^ | ||
| arm\std_init_once_complete.obj | ||
| copy amd64\std_init_once_complete.obj arm64\std_init_once_complete.obj | ||
| ..\..\..\..\..\tools\x86\aliasobj.exe ^ | ||
| __imp_#__std_init_once_complete@12 ^ | ||
| __imp_#InitOnceComplete@12 ^ | ||
| chpe\std_init_once_complete.obj |
Binary file not shown.
Binary file not shown.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,9 +14,9 @@ | |
| #endif // _M_CEE_PURE | ||
|
|
||
| #include <chrono> | ||
| #include <stdlib.h> | ||
| #include <system_error> | ||
| #include <thread> | ||
| #include <utility> | ||
| #include <xcall_once.h> | ||
|
|
||
|
|
@@ -508,61 +508,72 @@ public: | |
| }; | ||
| #endif // _HAS_CXX17 | ||
|
|
||
| // FUNCTION TEMPLATE call_once | ||
| #ifdef _M_CEE | ||
| #define _WINDOWS_API __stdcall | ||
| #define _RENAME_WINDOWS_API(_Api) _Api##_clr | ||
| #else // ^^^ _M_CEE // !_M_CEE vvv | ||
| #define _WINDOWS_API __declspec(dllimport) __stdcall | ||
StephanTLavavej marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| #define _RENAME_WINDOWS_API(_Api) _Api | ||
| #endif // _M_CEE | ||
|
|
||
| // WINBASEAPI | ||
| // BOOL | ||
| // WINAPI | ||
| // InitOnceBeginInitialize( | ||
| // _Inout_ LPINIT_ONCE lpInitOnce, | ||
| // _In_ DWORD dwFlags, | ||
| // _Out_ PBOOL fPending, | ||
| // _Outptr_opt_result_maybenull_ LPVOID* lpContext | ||
| // ); | ||
| extern "C" _NODISCARD int _WINDOWS_API _RENAME_WINDOWS_API(__std_init_once_begin_initialize)( | ||
| void** _LpInitOnce, unsigned long _DwFlags, int* _FPending, void** _LpContext) noexcept; | ||
|
|
||
| // WINBASEAPI | ||
AlexGuteniev marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| // BOOL | ||
| // WINAPI | ||
| // InitOnceComplete( | ||
| // _Inout_ LPINIT_ONCE lpInitOnce, | ||
| // _In_ DWORD dwFlags, | ||
| // _In_opt_ LPVOID lpContext | ||
| // ); | ||
| extern "C" _NODISCARD int _WINDOWS_API _RENAME_WINDOWS_API(__std_init_once_complete)( | ||
| void** _LpInitOnce, unsigned long _DwFlags, void* _LpContext) noexcept; | ||
|
|
||
| // #define RTL_RUN_ONCE_INIT_FAILED 0x00000004UL | ||
AlexGuteniev marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| // #define INIT_ONCE_INIT_FAILED RTL_RUN_ONCE_INIT_FAILED | ||
| _INLINE_VAR constexpr unsigned long _Init_once_init_failed = 0x4UL; | ||
|
|
||
| struct _Init_once_completer { | ||
AlexGuteniev marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| once_flag& _Once; | ||
| unsigned long _DwFlags; | ||
|
Contributor
There was a problem hiding this comment. Why no
Contributor
Author
There was a problem hiding this comment. It's Billy's code but I am afraid of mixing default and value initialization since #661
Member
There was a problem hiding this comment. Because I wanted this thing to be an aggregate because optimizers like aggregates.
Contributor
There was a problem hiding this comment. We discovered with |
||
| ~_Init_once_completer() { | ||
| if (_RENAME_WINDOWS_API(__std_init_once_complete)(&_Once._Opaque, _DwFlags, nullptr) == 0) { | ||
| _CSTD abort(); | ||
| } | ||
| } | ||
| }; | ||
|
|
||
| template <class _Fn, class... _Args> | ||
| void(call_once)(once_flag& _Once, _Fn&& _Fx, _Args&&... _Ax) noexcept( | ||
| noexcept(_STD invoke(_STD forward<_Fn>(_Fx), _STD forward<_Args>(_Ax)...))) /* strengthened */ { | ||
| // call _Fx(_Ax...) once | ||
| // parentheses against common "#define call_once(flag,func) pthread_once(flag,func)" | ||
| int _Pending; | ||
| if (_RENAME_WINDOWS_API(__std_init_once_begin_initialize)(&_Once._Opaque, 0, &_Pending, nullptr) == 0) { | ||
| _CSTD abort(); | ||
| } | ||
|
|
||
| if (_Pending != 0) { | ||
| _Init_once_completer _Op{_Once, _Init_once_init_failed}; | ||
| _STD invoke(_STD forward<_Fn>(_Fx), _STD forward<_Args>(_Ax)...); | ||
| _Op._DwFlags = 0; | ||
| } | ||
| } | ||
|
|
||
| #undef _WINDOWS_API | ||
| #undef _RENAME_WINDOWS_API | ||
|
|
||
| // condition_variable, timed_mutex, and recursive_timed_mutex are not supported under /clr | ||
| #ifndef _M_CEE | ||
| enum class cv_status { // names for wait returns | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| // Copyright (c) Microsoft Corporation. | ||
| // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception | ||
|
|
||
| #include <yvals_core.h> | ||
|
|
||
| #include <synchapi.h> | ||
|
|
||
| // This must be as small as possible, because its contents are | ||
| // injected into the msvcprt.lib and msvcprtd.lib import libraries. | ||
| // Do not include or define anything else here. | ||
| // In particular, basic_string must not be included here. | ||
|
|
||
| // Provides forwarders for InitOnceBeginInitialize and InitOnceComplete for | ||
| // environments that can't use aliasobj, like /clr. | ||
|
|
||
| _EXTERN_C | ||
|
|
||
| int __stdcall __std_init_once_begin_initialize_clr( | ||
| void** _LpInitOnce, unsigned long _DwFlags, int* _FPending, void** _LpContext) noexcept { | ||
| return InitOnceBeginInitialize(reinterpret_cast<LPINIT_ONCE>(_LpInitOnce), _DwFlags, _FPending, _LpContext); | ||
| } | ||
|
|
||
| int __stdcall __std_init_once_complete_clr(void** _LpInitOnce, unsigned long _DwFlags, void* _LpContext) noexcept { | ||
| return InitOnceComplete(reinterpret_cast<LPINIT_ONCE>(_LpInitOnce), _DwFlags, _LpContext); | ||
| } | ||
|
|
||
| _END_EXTERN_C |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
@cbezault Why two object libraries instead of one?
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.
No reason. We could make them a single library and give it a nice logical name.