Commit c5f8174b by Marcus Winter

removed cpplint warnings

parent 49c254b4
...@@ -74,7 +74,8 @@ void Invoke( ...@@ -74,7 +74,8 @@ void Invoke(
Function1 func1, Function1 func1,
/**< [in] Function to invoke */ /**< [in] Function to invoke */
..., ...,
const embb::mtapi::ExecutionPolicy & policy /**< [in] ExecutionPolicy to use */ const embb::mtapi::ExecutionPolicy & policy
/**< [in] ExecutionPolicy to use */
); );
#else // DOXYGEN #else // DOXYGEN
......
...@@ -71,7 +71,7 @@ typedef CONDITION_VARIABLE embb_condition_t; ...@@ -71,7 +71,7 @@ typedef CONDITION_VARIABLE embb_condition_t;
#define EMBB_THREAD_SPECIFIC static __declspec(thread) #define EMBB_THREAD_SPECIFIC static __declspec(thread)
#elif defined EMBB_PLATFORM_THREADING_POSIXTHREADS /* EMBB_PLATFORM_THREADING_WINTHREADS */ #elif defined EMBB_PLATFORM_THREADING_POSIXTHREADS
#include <pthread.h> #include <pthread.h>
#include <errno.h> #include <errno.h>
......
...@@ -207,7 +207,8 @@ int embb_thread_create(embb_thread_t* thread, const embb_core_set_t* core_set, ...@@ -207,7 +207,8 @@ int embb_thread_create(embb_thread_t* thread, const embb_core_set_t* core_set,
int status = pthread_attr_init(&attr); int status = pthread_attr_init(&attr);
if (status != 0) return EMBB_ERROR; if (status != 0) return EMBB_ERROR;
if (core_set != NULL) { if (core_set != NULL) {
#if defined(EMBB_PLATFORM_HAS_GLIB_CPU) || defined(EMBB_PLATFORM_HAS_HEADER_CPUSET) #if defined(EMBB_PLATFORM_HAS_GLIB_CPU) || \
defined(EMBB_PLATFORM_HAS_HEADER_CPUSET)
assert(embb_core_count_available() < CPU_SETSIZE && assert(embb_core_count_available() < CPU_SETSIZE &&
"Core sets are only supported up to CPU_SETSIZE processors!"); "Core sets are only supported up to CPU_SETSIZE processors!");
#ifdef EMBB_PLATFORM_HAS_GLIB_CPU #ifdef EMBB_PLATFORM_HAS_GLIB_CPU
......
...@@ -49,7 +49,7 @@ typedef embb_condition_t ConditionVariableType; ...@@ -49,7 +49,7 @@ typedef embb_condition_t ConditionVariableType;
} // namespace base } // namespace base
} // namespace embb } // namespace embb
#elif defined EMBB_PLATFORM_THREADING_POSIXTHREADS // EMBB_PLATFORM_THREADING_WINTHREADS #elif defined EMBB_PLATFORM_THREADING_POSIXTHREADS
namespace embb { namespace embb {
namespace base { namespace base {
......
...@@ -85,7 +85,8 @@ void MemoryAllocationTest::ClassAllocationTest() { ...@@ -85,7 +85,8 @@ void MemoryAllocationTest::ClassAllocationTest() {
#ifdef EMBB_DEBUG #ifdef EMBB_DEBUG
size_t n = (sizeof(DummyClassForAlignedAllocation) size_t n = (sizeof(DummyClassForAlignedAllocation)
+ (EMBB_PLATFORM_CACHE_LINE_SIZE - 1)) / EMBB_PLATFORM_CACHE_LINE_SIZE; + (EMBB_PLATFORM_CACHE_LINE_SIZE - 1)) / EMBB_PLATFORM_CACHE_LINE_SIZE;
expected += (n + 1)*EMBB_PLATFORM_CACHE_LINE_SIZE + (sizeof(size_t) * 3 - 1); expected += (n + 1)*EMBB_PLATFORM_CACHE_LINE_SIZE +
(sizeof(size_t) * 3 - 1);
#endif // else EMBB_DEBUG #endif // else EMBB_DEBUG
//check that the memory is aligned! //check that the memory is aligned!
...@@ -136,14 +137,16 @@ void MemoryAllocationTest::ClassAllocationTest() { ...@@ -136,14 +137,16 @@ void MemoryAllocationTest::ClassAllocationTest() {
#ifdef EMBB_DEBUG #ifdef EMBB_DEBUG
size_t n = (sizeof(DummyClassForAlignedAllocation)*alloc_iterations size_t n = (sizeof(DummyClassForAlignedAllocation)*alloc_iterations
+ (EMBB_PLATFORM_CACHE_LINE_SIZE - 1)) / EMBB_PLATFORM_CACHE_LINE_SIZE; + (EMBB_PLATFORM_CACHE_LINE_SIZE - 1)) / EMBB_PLATFORM_CACHE_LINE_SIZE;
expected += (n + 1)*EMBB_PLATFORM_CACHE_LINE_SIZE + (sizeof(size_t) * 3 - 1); expected += (n + 1)*EMBB_PLATFORM_CACHE_LINE_SIZE +
(sizeof(size_t) * 3 - 1);
#endif // else EMBB_DEBUG #endif // else EMBB_DEBUG
// This assert does _not_ hold, but is left for documentation. // This assert does _not_ hold, but is left for documentation.
// It is not guaranteed that the pointer to the array is aligned. // It is not guaranteed that the pointer to the array is aligned.
// See the documentation of the overloaded new[] operator in // See the documentation of the overloaded new[] operator in
// class MemoryAllocation. // class MemoryAllocation.
// PT_ASSERT_EQ((uintptr_t)aligned_allocated % EMBB_PLATFORM_CACHE_LINE_SIZE, 0); // PT_ASSERT_EQ((uintptr_t)aligned_allocated %
// EMBB_PLATFORM_CACHE_LINE_SIZE, 0);
//delete! //delete!
expected = 0; expected = 0;
......
...@@ -108,7 +108,8 @@ QueueTestOrderMPMC_Post() { ...@@ -108,7 +108,8 @@ QueueTestOrderMPMC_Post() {
// Tally for all elements enqueued by all producers, // Tally for all elements enqueued by all producers,
// initialized with all 0: // initialized with all 0:
::std::vector<unsigned char> total_tally; ::std::vector<unsigned char> total_tally;
size_t n_elements_total = static_cast<size_t>(n_producers * n_producer_elements); size_t n_elements_total =
static_cast<size_t>(n_producers * n_producer_elements);
for (size_t i = 0; i < n_elements_total / 8; ++i) { for (size_t i = 0; i < n_elements_total / 8; ++i) {
total_tally.push_back(0); total_tally.push_back(0);
} }
......
...@@ -41,6 +41,7 @@ template<typename Queue_t, ...@@ -41,6 +41,7 @@ template<typename Queue_t,
class QueueTest : public partest::TestCase { class QueueTest : public partest::TestCase {
public: public:
typedef ::std::pair<size_t, int> element_t; typedef ::std::pair<size_t, int> element_t;
private: private:
/// Minimum number of elements enqueued by every producer /// Minimum number of elements enqueued by every producer
/// in MP/MC unit test. Must be a multiple of 8. /// in MP/MC unit test. Must be a multiple of 8.
......
...@@ -87,9 +87,7 @@ Task Continuation::Spawn(ExecutionPolicy execution_policy) { ...@@ -87,9 +87,7 @@ Task Continuation::Spawn(ExecutionPolicy execution_policy) {
return node.Spawn( return node.Spawn(
Action( Action(
embb::base::MakeFunction(*this, &Continuation::ExecuteContinuation), embb::base::MakeFunction(*this, &Continuation::ExecuteContinuation),
ExecutionPolicy(execution_policy) ExecutionPolicy(execution_policy)));
)
);
} }
} // namespace mtapi } // namespace mtapi
......
...@@ -152,7 +152,8 @@ void Node::Initialize( ...@@ -152,7 +152,8 @@ void Node::Initialize(
assert(MTAPI_SUCCESS == status); assert(MTAPI_SUCCESS == status);
embb_core_set_t cs; embb_core_set_t cs;
embb_core_set_init(&cs, 0); embb_core_set_init(&cs, 0);
for (unsigned int ii = 0; embb_core_set_count(&cs) < core_set.Count(); ii++) { for (unsigned int ii = 0; embb_core_set_count(&cs) < core_set.Count();
ii++) {
if (core_set.IsContained(ii)) { if (core_set.IsContained(ii)) {
embb_core_set_add(&cs, ii); embb_core_set_add(&cs, ii);
} }
......
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