From c5f8174b91eca62606a13c738fb134a89d047e25 Mon Sep 17 00:00:00 2001 From: Marcus Winter Date: Mon, 2 Feb 2015 14:38:44 +0100 Subject: [PATCH] removed cpplint warnings --- algorithms_cpp/include/embb/algorithms/invoke.h | 3 ++- base_c/include/embb/base/c/internal/platform.h | 2 +- base_c/src/thread.c | 3 ++- base_cpp/include/embb/base/internal/platform.h | 2 +- base_cpp/test/memory_allocation_test.cc | 9 ++++++--- containers_cpp/test/main.cc | 6 +++--- containers_cpp/test/queue_test-inl.h | 27 ++++++++++++++------------- containers_cpp/test/queue_test.h | 7 ++++--- mtapi_cpp/src/continuation.cc | 4 +--- mtapi_cpp/src/node.cc | 3 ++- 10 files changed, 36 insertions(+), 30 deletions(-) diff --git a/algorithms_cpp/include/embb/algorithms/invoke.h b/algorithms_cpp/include/embb/algorithms/invoke.h index fa365fc..bffbe77 100644 --- a/algorithms_cpp/include/embb/algorithms/invoke.h +++ b/algorithms_cpp/include/embb/algorithms/invoke.h @@ -74,7 +74,8 @@ void Invoke( Function1 func1, /**< [in] Function to invoke */ ..., - const embb::mtapi::ExecutionPolicy & policy /**< [in] ExecutionPolicy to use */ + const embb::mtapi::ExecutionPolicy & policy + /**< [in] ExecutionPolicy to use */ ); #else // DOXYGEN diff --git a/base_c/include/embb/base/c/internal/platform.h b/base_c/include/embb/base/c/internal/platform.h index 96d5c0f..90f098c 100644 --- a/base_c/include/embb/base/c/internal/platform.h +++ b/base_c/include/embb/base/c/internal/platform.h @@ -71,7 +71,7 @@ typedef CONDITION_VARIABLE embb_condition_t; #define EMBB_THREAD_SPECIFIC static __declspec(thread) -#elif defined EMBB_PLATFORM_THREADING_POSIXTHREADS /* EMBB_PLATFORM_THREADING_WINTHREADS */ +#elif defined EMBB_PLATFORM_THREADING_POSIXTHREADS #include #include diff --git a/base_c/src/thread.c b/base_c/src/thread.c index 1f44e33..7f3be04 100644 --- a/base_c/src/thread.c +++ b/base_c/src/thread.c @@ -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); if (status != 0) return EMBB_ERROR; 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 && "Core sets are only supported up to CPU_SETSIZE processors!"); #ifdef EMBB_PLATFORM_HAS_GLIB_CPU diff --git a/base_cpp/include/embb/base/internal/platform.h b/base_cpp/include/embb/base/internal/platform.h index b6fa3b6..d11f135 100644 --- a/base_cpp/include/embb/base/internal/platform.h +++ b/base_cpp/include/embb/base/internal/platform.h @@ -49,7 +49,7 @@ typedef embb_condition_t ConditionVariableType; } // namespace base } // namespace embb -#elif defined EMBB_PLATFORM_THREADING_POSIXTHREADS // EMBB_PLATFORM_THREADING_WINTHREADS +#elif defined EMBB_PLATFORM_THREADING_POSIXTHREADS namespace embb { namespace base { diff --git a/base_cpp/test/memory_allocation_test.cc b/base_cpp/test/memory_allocation_test.cc index 4c4c9f9..c937b5c 100644 --- a/base_cpp/test/memory_allocation_test.cc +++ b/base_cpp/test/memory_allocation_test.cc @@ -85,7 +85,8 @@ void MemoryAllocationTest::ClassAllocationTest() { #ifdef EMBB_DEBUG size_t n = (sizeof(DummyClassForAlignedAllocation) + (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 //check that the memory is aligned! @@ -136,14 +137,16 @@ void MemoryAllocationTest::ClassAllocationTest() { #ifdef EMBB_DEBUG size_t n = (sizeof(DummyClassForAlignedAllocation)*alloc_iterations + (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 // This assert does _not_ hold, but is left for documentation. // It is not guaranteed that the pointer to the array is aligned. // See the documentation of the overloaded new[] operator in // 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! expected = 0; diff --git a/containers_cpp/test/main.cc b/containers_cpp/test/main.cc index 21dbe61..4aff866 100644 --- a/containers_cpp/test/main.cc +++ b/containers_cpp/test/main.cc @@ -55,11 +55,11 @@ PT_MAIN("Data Structures C++") { PT_RUN(embb::containers::test::HazardPointerTest); - PT_RUN(embb::containers::test::QueueTest< + PT_RUN(embb::containers::test::QueueTest< embb::containers::WaitFreeSPSCQueue< ::std::pair > >); - PT_RUN(embb::containers::test::QueueTest< - embb::containers::LockFreeMPMCQueue< ::std::pair > + PT_RUN(embb::containers::test::QueueTest< + embb::containers::LockFreeMPMCQueue< ::std::pair > COMMA true COMMA true >); PT_RUN(embb::containers::test::StackTest< diff --git a/containers_cpp/test/queue_test-inl.h b/containers_cpp/test/queue_test-inl.h index 3b29355..9efa99e 100644 --- a/containers_cpp/test/queue_test-inl.h +++ b/containers_cpp/test/queue_test-inl.h @@ -45,7 +45,7 @@ QueueTest::QueueTest() : next_producer_id(0), next_consumer_id(0), n_producer_elements( - static_cast(partest::TestSuite::GetDefaultNumIterations() * + static_cast(partest::TestSuite::GetDefaultNumIterations() * MIN_ENQ_ELEMENTS)) { CreateUnit("QueueTestSingleThreadEnqueueDequeue"). Pre(&QueueTest::QueueTestSingleThreadEnqueueDequeue_Pre, this). @@ -105,10 +105,11 @@ template void QueueTest:: QueueTestOrderMPMC_Post() { delete queue; - // Tally for all elements enqueued by all producers, - // initialized with all 0: + // Tally for all elements enqueued by all producers, + // initialized with all 0: ::std::vector total_tally; - size_t n_elements_total = static_cast(n_producers * n_producer_elements); + size_t n_elements_total = + static_cast(n_producers * n_producer_elements); for (size_t i = 0; i < n_elements_total / 8; ++i) { total_tally.push_back(0); } @@ -118,10 +119,10 @@ QueueTestOrderMPMC_Post() { total_tally[e] |= consumers[c].Tally()[e]; } } - // Test if all elements have been dequeued by any - // consumer. + // Test if all elements have been dequeued by any + // consumer. // To avoid static cast warning: - for (size_t t = 0; + for (size_t t = 0; t < static_cast(n_producers * n_producer_elements / 8); ++t) { PT_ASSERT_EQ_MSG(total_tally[t], 0xff, @@ -146,13 +147,13 @@ QueueTestOrderMPMC_ConsumerThreadMethod() { template void QueueTest::Producer:: Run() { - // Enqueue pairs of (producer id, counter): + // Enqueue pairs of (producer id, counter): for (int i = 0; i < n_producer_elements; ++i) { while (!q->TryEnqueue(element_t(producer_id, i))) { embb::base::Thread::CurrentYield(); } } - // Enqueue -1 as terminator element of this producer: + // Enqueue -1 as terminator element of this producer: while (!q->TryEnqueue(element_t(producer_id, -1))) { embb::base::Thread::CurrentYield(); } @@ -161,14 +162,14 @@ Run() { template QueueTest::Consumer:: Consumer(Queue_t * const queue, int numProducers, int numProducerElements) : - q(queue), + q(queue), n_producers(numProducers), n_producer_elements(numProducerElements) { for (int p_id = 0; p_id < n_producers; ++p_id) { // Initialize last value dequeued from producers with // below-minimum value: sequence_number.push_back(-1); - // Initialize element tally for producer with all 0, + // Initialize element tally for producer with all 0, // 8 flags / char: for (int i = 0; i < n_producer_elements / 8; ++i) { consumer_tally.push_back(0); @@ -193,9 +194,9 @@ Run() { producerId = element.first; // Assert on dequeued element: PT_ASSERT_LT_MSG(producerId, static_cast(n_producers), - "Invalid producer id in dequeue"); + "Invalid producer id in dequeue"); PT_ASSERT_LT_MSG(sequence_number[producerId], element.second, - "Invalid element sequence"); + "Invalid element sequence"); // Store last value received from the element's producer: sequence_number[producerId] = element.second; const size_t pos((producerId * n_producer_elements) + diff --git a/containers_cpp/test/queue_test.h b/containers_cpp/test/queue_test.h index 136e4a7..830e123 100644 --- a/containers_cpp/test/queue_test.h +++ b/containers_cpp/test/queue_test.h @@ -41,6 +41,7 @@ template element_t; + private: /// Minimum number of elements enqueued by every producer /// in MP/MC unit test. Must be a multiple of 8. @@ -69,8 +70,8 @@ class QueueTest : public partest::TestCase { int n_producer_elements; public: Producer(Queue_t * const queue, size_t id, int numProducerElements) : - q(queue), - producer_id(id), + q(queue), + producer_id(id), n_producer_elements(numProducerElements) {} void Run(); }; @@ -108,7 +109,7 @@ class QueueTest : public partest::TestCase { void QueueTestSingleThreadEnqueueDequeue_Pre(); void QueueTestSingleThreadEnqueueDequeue_Post(); void QueueTestSingleThreadEnqueueDequeue_ThreadMethod(); - + public: QueueTest(); }; diff --git a/mtapi_cpp/src/continuation.cc b/mtapi_cpp/src/continuation.cc index 10e5ca0..3fb6267 100644 --- a/mtapi_cpp/src/continuation.cc +++ b/mtapi_cpp/src/continuation.cc @@ -87,9 +87,7 @@ Task Continuation::Spawn(ExecutionPolicy execution_policy) { return node.Spawn( Action( embb::base::MakeFunction(*this, &Continuation::ExecuteContinuation), - ExecutionPolicy(execution_policy) - ) - ); + ExecutionPolicy(execution_policy))); } } // namespace mtapi diff --git a/mtapi_cpp/src/node.cc b/mtapi_cpp/src/node.cc index 00565f0..cf14a2b 100644 --- a/mtapi_cpp/src/node.cc +++ b/mtapi_cpp/src/node.cc @@ -152,7 +152,8 @@ void Node::Initialize( assert(MTAPI_SUCCESS == status); embb_core_set_t cs; 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)) { embb_core_set_add(&cs, ii); } -- libgit2 0.26.0