Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Use thread_local instead of static in EASY_LOCAL_STATIC_PTR. #130

Open
wants to merge 5 commits into
base: develop
Choose a base branch
from
Open

Use thread_local instead of static in EASY_LOCAL_STATIC_PTR. #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3ee2067
Use thread_local instead of static in EASY_LOCAL_STATIC_PTR. As witho…
Oct 2, 2018
3759ed6
Revert "Use thread_local instead of static in EASY_LOCAL_STATIC_PTR. …
Oct 4, 2018
7c11264
Added option EASY_OPTION_THREAD_SAFE_INIT to support disabled thread-…
Oct 5, 2018
cddba4e
Added generation of config header to avoid setting some defines also …
Oct 5, 2018
f86b817
Fixed freeze if EASY_OPTION_THREAD_SAFE_INIT is turned off.
Oct 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions easy_profiler_core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ if (WIN32)
set(EASY_OPTION_IMPLICIT_THREAD_REGISTRATION ON CACHE BOOL ${EASY_OPTION_IMPLICIT_THREAD_REGISTER_TEXT})
set(EASY_OPTION_EVENT_TRACING ON CACHE BOOL "Enable event tracing by default")
set(EASY_OPTION_LOW_PRIORITY_EVENT_TRACING ON CACHE BOOL "Set low priority for event tracing thread")
set(EASY_OPTION_THREAD_SAFE_INIT ON CACHE BOOL "Should be turn off if thread-safe initialization of static local variables is disabled (see visual studio's /Zc:threadSafeInit- compiler option for details).")
else ()
if (NO_CXX11_THREAD_LOCAL_SUPPORT)
set(EASY_OPTION_IMPLICIT_THREAD_REGISTRATION OFF CACHE BOOL ${EASY_OPTION_IMPLICIT_THREAD_REGISTER_TEXT})
Expand All @@ -62,6 +63,21 @@ set(BUILD_WITH_CHRONO_HIGH_RESOLUTION_CLOCK OFF CACHE BOOL "Use std::chrono::hig



#####################################################################
# Generate config header:
if (${EASY_OPTION_THREAD_SAFE_INIT})
set(EASY_DISABLE_THREAD_SAFE_INIT 0)
else ()
set(EASY_DISABLE_THREAD_SAFE_INIT 1)
endif ()

configure_file (
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you, please, use existing easy_define_target_option cmake command instead of generating new file?

"${CMAKE_CURRENT_SOURCE_DIR}/include/easy/details/profiler_config.h.in"
"${CMAKE_CURRENT_SOURCE_DIR}/include/easy/details/profiler_config.h"
)



#####################################################################
# Print EasyProfiler options status:
message(STATUS "-------- EASY_PROFILER OPTIONS: --------")
Expand Down Expand Up @@ -156,6 +172,7 @@ set(INCLUDE_FILES
${EASY_INCLUDE_DIR}/details/profiler_aux.h
${EASY_INCLUDE_DIR}/details/profiler_colors.h
${EASY_INCLUDE_DIR}/details/profiler_public_types.h
${EASY_INCLUDE_DIR}/details/profiler_config.h
)

source_group(include FILES ${INCLUDE_FILES})
Expand Down
11 changes: 9 additions & 2 deletions easy_profiler_core/include/easy/details/easy_compiler_support.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@

#include <cstddef>

#include <easy/details/profiler_config.h>

#if defined(_WIN32) && !defined(EASY_PROFILER_STATIC)
// Visual Studio and MinGW
# ifdef _BUILD_PROFILER
Expand Down Expand Up @@ -191,8 +193,13 @@ static_assert(false, "EasyProfiler is not configured for using your compiler typ
#endif

#ifndef EASY_LOCAL_STATIC_PTR
# define EASY_LOCAL_STATIC_PTR(VarType, VarName, VarInitializer) static VarType VarName = VarInitializer
# define EASY_MAGIC_STATIC_AVAILABLE
# if defined(_MSC_VER) && EASY_DISABLE_THREAD_SAFE_INIT != 0
# define EASY_LOCAL_STATIC_PTR(VarType, VarName, VarInitializer) thread_local static VarType VarName = VarInitializer
# define EASY_MAGIC_STATIC_AVAILABLE
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

EASY_MAGIC_STATIC_AVAILABLE should not be defined if thread-safe static init is disabled

# else
# define EASY_LOCAL_STATIC_PTR(VarType, VarName, VarInitializer) static VarType VarName = VarInitializer
# define EASY_MAGIC_STATIC_AVAILABLE
# endif
#endif

#ifndef EASY_FINAL
Expand Down
62 changes: 62 additions & 0 deletions easy_profiler_core/include/easy/details/profiler_config.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
/************************************************************************
* file name : profiler_aux.h
* ----------------- :
* creation time : 2016/06/11
* author : Victor Zarubkin
* email : [email protected]
* ----------------- :
* description : This file contains auxiliary profiler macros and funcitons.
* ----------------- :
* change log : * 2016/06/11 Victor Zarubkin: Moved sources from profiler.h
* :
* : *
* ----------------- :
* license : Lightweight profiler library for c++
* : Copyright(C) 2016-2018 Sergey Yagovtsev, Victor Zarubkin
* :
* : Licensed under either of
* : * MIT license (LICENSE.MIT or http://opensource.org/licenses/MIT)
* : * Apache License, Version 2.0, (LICENSE.APACHE or http://www.apache.org/licenses/LICENSE-2.0)
* : at your option.
* :
* : The MIT License
* :
* : Permission is hereby granted, free of charge, to any person obtaining a copy
* : of this software and associated documentation files (the "Software"), to deal
* : in the Software without restriction, including without limitation the rights
* : to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
* : of the Software, and to permit persons to whom the Software is furnished
* : to do so, subject to the following conditions:
* :
* : The above copyright notice and this permission notice shall be included in all
* : copies or substantial portions of the Software.
* :
* : THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
* : INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
* : PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
* : LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
* : TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
* : USE OR OTHER DEALINGS IN THE SOFTWARE.
* :
* : The Apache License, Version 2.0 (the "License")
* :
* : You may not use this file except in compliance with the License.
* : You may obtain a copy of the License at
* :
* : http://www.apache.org/licenses/LICENSE-2.0
* :
* : Unless required by applicable law or agreed to in writing, software
* : distributed under the License is distributed on an "AS IS" BASIS,
* : WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* : See the License for the specific language governing permissions and
* : limitations under the License.
************************************************************************/

// THIS IS GENERATED FILE. PLEASE DON'T EDIT //

#ifndef EASY_PROFILER_CONFIG_H
#define EASY_PROFILER_CONFIG_H

#define EASY_DISABLE_THREAD_SAFE_INIT @EASY_DISABLE_THREAD_SAFE_INIT@

#endif // EASY_PROFILER_CONFIG_H
1 change: 0 additions & 1 deletion easy_profiler_core/include/easy/profiler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,6 @@ You don't need to rebuild or restart your application for that.
# define EASY_OPTION_LOW_PRIORITY_EVENT_TRACING true
# endif


/** If != 0 then EasyProfiler will print error messages into stderr.
Otherwise, no log messages will be printed.

Expand Down