Skip to content

FORMUS3IC_LAS3 / embb

Go to a project
Commit 4c569201 by Marcus Winter
Options

Revert "Started work on mutex-based atomics implementation." 

This reverts commit c2aa4b79.
parent c2aa4b79
Inline Side-by-side
Showing with 6 additions and 299 deletions
CMakeLists.txt
......@@ -86,7 +86,6 @@ option(USE_EXCEPTIONS "Specify whether exceptions should be activated in C++" ON
option(INSTALL_DOCS "Specify whether Doxygen docs should be installed" ON)
option(WARNINGS_ARE_ERRORS "Specify whether warnings should be treated as errors" OFF)
option(USE_AUTOMATIC_INITIALIZATION "Specify whether the MTAPI C++ interface, algorithms and dataflow should automatically intialize the MTAPI node if no explicit initialization is present" ON)
option(THREADING_ANALYSIS_MODE "Replaces lock-free synchronization constructs by mutex-based implementations to support threading analysis tools" OFF)
## LOCAL INSTALLATION OF SUBPROJECT BINARIES
#
......@@ -102,20 +101,12 @@ endif()
message(" (set with command line option -DWARNINGS_ARE_ERRORS=ON/OFF)")
if (USE_AUTOMATIC_INITIALIZATION STREQUAL ON)
set(EMBB_THREADING_ANALYSIS_MODE 1)
message("-- MTAPI/Tasks automatic initialization enabled (default)")
else()
message("-- MTAPI/Tasks automatic initialization disabled")
endif()
message(" (set with command line option -DUSE_AUTOMATIC_INITIALIZATION=ON/OFF)")
if (THREADING_ANALYSIS_MODE STREQUAL ON)
message("-- Threading analysis mode enabled")
else()
message("-- Threading analysis mode disabled (default")
endif()
message(" (set with command line option -DTHREADING_ANALYSIS_MODE=ON/OFF)")
include(CMakeCommon/SetCompilerFlags.cmake)
SetGNUCompilerFlags(compiler_libs compiler_flags)
SetVisualStudioCompilerFlags(compiler_libs compiler_flags)
......
base_c/include/embb/base/c/atomic.h
......@@ -92,9 +92,7 @@
* atomic operations.
*
* \ingroup C_BASE_ATOMIC
* \notthreadsafe No thread safety is given with respect to multiple calls of
* the method itself or to concurrent calls with other
* embb_atomic methods.
* \notthreadsafe
*/
void embb_atomic_init_TYPE(
emb_atomic_TYPE* variable,
......@@ -110,9 +108,7 @@ void embb_atomic_init_TYPE(
* \post The atomic variable is uninitialized.
*
* \ingroup C_BASE_ATOMIC
* \notthreadsafe No thread safety is given with respect to multiple calls of
* the method itself or to concurrent calls with other
* embb_atomic methods.
* \notthreadsafe
*/
void embb_atomic_destroy_TYPE(
emb_atomic_TYPE* variable
......
base_c/include/embb/base/c/internal/atomic/and_assign.h
......@@ -53,20 +53,6 @@
* BYTE_SIZE is the number of bytes passed to the macro.
*
*/
#ifdef EMBB_THREADING_ANALYSIS_MODE
#define EMBB_ATOMIC_INTERNAL_DEFINE_AND_ASSIGN_METHOD(EMBB_ATOMIC_PARAMETER_TYPE_NATIVE, EMBB_ATOMIC_PARAMETER_ATOMIC_TYPE_SUFFIX, EMBB_ATOMIC_PARAMETER_TYPE_SIZE) \
EMBB_PLATFORM_INLINE void EMBB_CAT2(embb_atomic_and_assign_, EMBB_ATOMIC_PARAMETER_ATOMIC_TYPE_SUFFIX)(\
EMBB_CAT2(embb_atomic_, EMBB_ATOMIC_PARAMETER_ATOMIC_TYPE_SUFFIX)* variable, \
EMBB_ATOMIC_PARAMETER_TYPE_NATIVE value) { \
embb_atomic_internal_check_init_flag(variable->init_flag); \
embb_mutex_lock(&(variable->mutex)); \
variable->internal_variable |= value; \
embb_mutex_unlock(&(variable->mutex)); \
}
#else // EMBB_THREADING_ANALYSIS_MODE
#ifdef EMBB_PLATFORM_ARCH_X86
#ifdef EMBB_PLATFORM_COMPILER_MSVC
......@@ -170,8 +156,6 @@ EMBB_DEFINE_AND_ASSIGN(4, "")
(&(variable->internal_variable)), value_pun); \
}
#endif // else EMBB_THREADING_ANALYSIS_MODE
#undef EMBB_ATOMIC_METHOD_TO_GENERATE
#define EMBB_ATOMIC_METHOD_TO_GENERATE AND_ASSIGN_METHOD
#include <embb/base/c/internal/atomic/generate_atomic_implementation_template.h>
......
base_c/include/embb/base/c/internal/atomic/atomic_variables.h
......@@ -28,43 +28,20 @@
#define EMBB_BASE_C_INTERNAL_ATOMIC_ATOMIC_VARIABLES_H_
#include <stddef.h>
#include <embb/base/c/internal/config.h>
#include <embb/base/c/internal/macro_helper.h>
#ifdef EMBB_PLATFORM_COMPILER_MSVC
#include <intrin.h>
#endif
#ifdef EMBB_THREADING_ANALYSIS_MODE
#include <embb/base/c/mutex.h>
// Flag value to indicate that an atomic variable has been initialized
// Value 31426 corresponds to binary number 0111101011000010
#define EMBB_ATOMIC_INTERNAL_INITIALIZED_VALUE 31426
#define EMBB_ATOMIC_INTERNAL_DEFINE_VARIABLE( \
EMBB_ATOMIC_PARAMETER_TYPE_NATIVE, \
EMBB_ATOMIC_PARAMETER_ATOMIC_TYPE_SUFFIX) \
typedef struct \
{ \
EMBB_ATOMIC_PARAMETER_TYPE_NATIVE internal_variable; \
embb_mutex_t mutex; \
volatile int init_flag; \
} EMBB_CAT2(embb_atomic_, EMBB_ATOMIC_PARAMETER_ATOMIC_TYPE_SUFFIX);
#else // EMBB_THREADING_ANALYSIS_MODE
#define EMBB_ATOMIC_INTERNAL_DEFINE_VARIABLE( \
EMBB_ATOMIC_PARAMETER_TYPE_NATIVE, \
EMBB_ATOMIC_PARAMETER_ATOMIC_TYPE_SUFFIX) \
typedef struct \
{ \
EMBB_ATOMIC_PARAMETER_TYPE_NATIVE internal_variable; \
} EMBB_CAT2(embb_atomic_, EMBB_ATOMIC_PARAMETER_ATOMIC_TYPE_SUFFIX);
#endif // else EMBB_THREADING_ANALYSIS_MODE
EMBB_ATOMIC_INTERNAL_DEFINE_VARIABLE(char, char)
EMBB_ATOMIC_INTERNAL_DEFINE_VARIABLE(short, short)
EMBB_ATOMIC_INTERNAL_DEFINE_VARIABLE(unsigned short, unsigned_short)
......
base_c/test/atomic_test.h → base_c/include/embb/base/c/internal/atomic/init.h
......@@ -24,43 +24,9 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef BASE_C_TEST_ATOMIC_TEST_H_
#define BASE_C_TEST_ATOMIC_TEST_H_
#ifndef EMBB_BASE_C_INTERNAL_ATOMIC_INIT_H_
#define EMBB_BASE_C_INTERNAL_ATOMIC_INIT_H_
#include <partest/partest.h>
// TODO implementation of embb_atomic_init()
namespace embb {
namespace base {
namespace test {
class AtomicTest : public partest::TestCase {
public:
/**
* Adds test methods.
*/
AtomicTest();
private:
/**
* Tests init and destroy methods.
*/
void TestInitDestroy();
/**
* Tests and_assign method.
*/
void TestAndAssign();
/**
* Tests load method.
*/
void TestLoad();
};
} // namespace test
} // namespace base
} // namespace embb
#endif // BASE_C_TEST_ATOMIC_TEST_H_
#endif // EMBB_BASE_C_INTERNAL_ATOMIC_INIT_H_
base_c/include/embb/base/c/internal/atomic/init_destroy.h deleted 100755 → 0
/*
* Copyright (c) 2014-2015, Siemens AG. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <embb/base/c/internal/config.h>
#include <embb/base/c/internal/atomic/store.h>
#include <embb/base/c/internal/atomic/atomic_sizes.h>
#include <embb/base/c/internal/macro_helper.h>
#include <embb/base/c/internal/atomic/atomic_variables.h>
#include <string.h>
#ifndef EMBB_BASE_C_INTERNAL_ATOMIC_INIT_DESTROY_H_
#define EMBB_BASE_C_INTERNAL_ATOMIC_INIT_DESTROY_H_
#ifdef EMBB_THREADING_ANALYSIS_MODE
#include <stdio.h>
#include <stdlib.h>
#include <embb/base/c/errors.h>
EMBB_PLATFORM_INLINE void embb_atomic_internal_check_init_flag(int flag) {
if (flag != EMBB_ATOMIC_INTERNAL_INITIALIZED_VALUE) {
fprintf(stderr, "Exit program due to not initialized or not properly "
"synchronized initialization of atomic variable");
exit(EMBB_ERROR);
}
}
#endif
// embb_mutex_init():
#ifdef EMBB_THREADING_ANALYSIS_MODE
#define EMBB_ATOMIC_INTERNAL_DEFINE_INIT_METHOD(EMBB_ATOMIC_PARAMETER_TYPE_NATIVE, EMBB_ATOMIC_PARAMETER_ATOMIC_TYPE_SUFFIX, EMBB_ATOMIC_PARAMETER_TYPE_SIZE) \
EMBB_PLATFORM_INLINE void EMBB_CAT2(embb_atomic_init_, EMBB_ATOMIC_PARAMETER_ATOMIC_TYPE_SUFFIX)( \
volatile EMBB_CAT2(embb_atomic_, EMBB_ATOMIC_PARAMETER_ATOMIC_TYPE_SUFFIX)* variable, \
EMBB_ATOMIC_PARAMETER_TYPE_NATIVE initial_value) { \
embb_mutex_init(&(((EMBB_CAT2(embb_atomic_, EMBB_ATOMIC_PARAMETER_ATOMIC_TYPE_SUFFIX)*)variable)->mutex), EMBB_MUTEX_PLAIN); \
variable->init_flag = EMBB_ATOMIC_INTERNAL_INITIALIZED_VALUE; \
variable->internal_variable = initial_value; \
}
#else // EMBB_THREADING_ANALYSIS_MODE
#define EMBB_ATOMIC_INTERNAL_DEFINE_INIT_METHOD(EMBB_ATOMIC_PARAMETER_TYPE_NATIVE, EMBB_ATOMIC_PARAMETER_ATOMIC_TYPE_SUFFIX, EMBB_ATOMIC_PARAMETER_TYPE_SIZE) \
EMBB_PLATFORM_INLINE void EMBB_CAT2(embb_atomic_init_, EMBB_ATOMIC_PARAMETER_ATOMIC_TYPE_SUFFIX)( \
EMBB_CAT2(embb_atomic_, EMBB_ATOMIC_PARAMETER_ATOMIC_TYPE_SUFFIX) volatile* variable, \
EMBB_ATOMIC_PARAMETER_TYPE_NATIVE initial_value) { \
memcpy(&(variable->internal_variable), &initial_value, sizeof(EMBB_ATOMIC_PARAMETER_TYPE_NATIVE)); \
}
#endif // else EMBB_THREADING_ANALYSIS_MODE
#undef EMBB_ATOMIC_METHOD_TO_GENERATE
#define EMBB_ATOMIC_METHOD_TO_GENERATE INIT_METHOD
#include <embb/base/c/internal/atomic/generate_atomic_implementation_template.h>
#undef EMBB_ATOMIC_METHOD_TO_GENERATE
// embb_mutex_destroy():
#ifdef EMBB_THREADING_ANALYSIS_MODE
#define EMBB_ATOMIC_INTERNAL_DEFINE_DESTROY_METHOD(EMBB_ATOMIC_PARAMETER_TYPE_NATIVE, EMBB_ATOMIC_PARAMETER_ATOMIC_TYPE_SUFFIX, EMBB_ATOMIC_PARAMETER_TYPE_SIZE) \
EMBB_PLATFORM_INLINE void EMBB_CAT2(embb_atomic_destroy_, EMBB_ATOMIC_PARAMETER_ATOMIC_TYPE_SUFFIX)(EMBB_CAT2(embb_atomic_, EMBB_ATOMIC_PARAMETER_ATOMIC_TYPE_SUFFIX)* variable) \
{ \
embb_mutex_destroy(&(variable->mutex)); \
variable->init_flag = EMBB_ATOMIC_INTERNAL_INITIALIZED_VALUE - 1; \
}
#else // EMBB_THREADING_ANALYSIS_MODE
#define EMBB_ATOMIC_INTERNAL_DEFINE_DESTROY_METHOD(EMBB_ATOMIC_PARAMETER_TYPE_NATIVE, EMBB_ATOMIC_PARAMETER_ATOMIC_TYPE_SUFFIX, EMBB_ATOMIC_PARAMETER_TYPE_SIZE) \
EMBB_PLATFORM_INLINE void EMBB_CAT2(embb_atomic_destroy_, EMBB_ATOMIC_PARAMETER_ATOMIC_TYPE_SUFFIX)(EMBB_CAT2(embb_atomic_, EMBB_ATOMIC_PARAMETER_ATOMIC_TYPE_SUFFIX)* variable) \
{}
#endif // else EMBB_THREADING_ANALYSIS_MODE
#undef EMBB_ATOMIC_METHOD_TO_GENERATE
#define EMBB_ATOMIC_METHOD_TO_GENERATE DESTROY_METHOD
#include <embb/base/c/internal/atomic/generate_atomic_implementation_template.h>
#undef EMBB_ATOMIC_METHOD_TO_GENERATE
#endif // EMBB_BASE_C_INTERNAL_ATOMIC_INIT_DESTROY_H_
base_c/include/embb/base/c/internal/atomic/load.h
......@@ -35,23 +35,6 @@
#include <embb/base/c/internal/atomic/atomic_variables.h>
#include <string.h>
#ifdef EMBB_THREADING_ANALYSIS_MODE
/**
* This macro is used to generate the load function for all atomic types
*/
#define EMBB_ATOMIC_INTERNAL_DEFINE_LOAD_METHOD(EMBB_ATOMIC_PARAMETER_TYPE_NATIVE, EMBB_ATOMIC_PARAMETER_ATOMIC_TYPE_SUFFIX, EMBB_ATOMIC_PARAMETER_TYPE_SIZE) \
EMBB_PLATFORM_INLINE EMBB_ATOMIC_PARAMETER_TYPE_NATIVE EMBB_CAT2(embb_atomic_load_, EMBB_ATOMIC_PARAMETER_ATOMIC_TYPE_SUFFIX)(\
const EMBB_CAT2(embb_atomic_, EMBB_ATOMIC_PARAMETER_ATOMIC_TYPE_SUFFIX)* variable) { \
embb_atomic_internal_check_init_flag(variable->init_flag); \
embb_mutex_lock((embb_mutex_t*)&(variable->mutex)); \
EMBB_ATOMIC_PARAMETER_TYPE_NATIVE return_value = variable->internal_variable; \
embb_mutex_unlock((embb_mutex_t*)&(variable->mutex)); \
return return_value; \
}
#else // EMBB_THREADING_ANALYSIS_MODE
/*
* See file and_assign.h for a detailed (and operation independent) description
* of the following macro.
......@@ -145,8 +128,6 @@ EMBB_DEFINE_LOAD(4, "")
return return_val_pun; \
}
#endif // else EMBB_THREADING_ANALYSIS_MODE
#undef EMBB_ATOMIC_METHOD_TO_GENERATE
#define EMBB_ATOMIC_METHOD_TO_GENERATE LOAD_METHOD
#include <embb/base/c/internal/atomic/generate_atomic_implementation_template.h>
......
base_c/include/embb/base/c/internal/cmake_config.h.in
......@@ -53,9 +53,4 @@
*/
#cmakedefine EMBB_PLATFORM_HAS_GLIB_CPU
/**
* Enables mutex-based implementation of all synchronization constructs.
*/
#cmakedefine EMBB_THREADING_ANALYSIS_MODE
#endif /* EMBB_BASE_INTERNAL_CMAKE_CONFIG_H_ */
base_c/test/atomic_test.cc deleted 100755 → 0
/*
* Copyright (c) 2014-2015, Siemens AG. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <atomic_test.h>
#include <embb/base/c/atomic.h>
namespace embb {
namespace base {
namespace test {
AtomicTest::AtomicTest() {
CreateUnit("Initialization and destroy").Add(&AtomicTest::TestInitDestroy, this);
CreateUnit("AndAssign").Add(&AtomicTest::TestAndAssign, this);
CreateUnit("Load").Add(&AtomicTest::TestLoad, this);
}
void AtomicTest::TestInitDestroy() {
embb_atomic_int var;
embb_atomic_init_int(&var, 1);
PT_EXPECT_EQ(var.internal_variable, 1);
#ifdef EMBB_THREADING_ANALYSIS_MODE
PT_EXPECT_EQ(var.init_flag, EMBB_ATOMIC_INTERNAL_INITIALIZED_VALUE);
#endif
embb_atomic_destroy_int(&var);
#ifdef EMBB_THREADING_ANALYSIS_MODE
PT_EXPECT_NE(var.init_flag, EMBB_ATOMIC_INTERNAL_INITIALIZED_VALUE);
#endif
}
void AtomicTest::TestAndAssign() {
embb_atomic_int var;
embb_atomic_init_int(&var, 1);
embb_atomic_and_assign_int(&var, 2);
PT_EXPECT_EQ(var.internal_variable, 3);
embb_atomic_destroy_int(&var);
}
void AtomicTest::TestLoad() {
embb_atomic_int var;
embb_atomic_init_int(&var, 1);
int value = embb_atomic_load_int(&var);
PT_EXPECT_EQ(value, 1);
}
} // namespace test
} // namespace base
} // namespace embb
base_c/test/main.cc
......@@ -25,7 +25,6 @@
*/
#include <partest/partest.h>
#include <atomic_test.h>
#include <alloc_test.h>
#include <duration_test.h>
#include <time_test.h>
......@@ -42,7 +41,6 @@
#include <embb/base/c/memory_allocation.h>
using embb::base::test::AtomicTest;
using embb::base::test::AllocTest;
using embb::base::test::DurationTest;
using embb::base::test::TimeTest;
......@@ -60,7 +58,6 @@ PT_MAIN("Base C") {
static_cast<unsigned int>(2 * partest::TestSuite::GetDefaultNumThreads());
embb_thread_set_max_count(max_threads);
PT_RUN(AtomicTest);
PT_RUN(AllocTest);
PT_RUN(DurationTest);
PT_RUN(TimeTest);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment