From c80e533dc92e275db9fb5a5a09d7d9b8a07f5604 Mon Sep 17 00:00:00 2001 From: khizmax Date: Sat, 11 Oct 2014 17:37:47 +0400 Subject: [PATCH] Remove unused files --- cds/intrusive/details/dummy_node_holder.h | 67 ---------------- cds/intrusive/details/queue_stat.h | 93 ----------------------- projects/Win/vc12/cds.vcxproj | 2 - projects/Win/vc12/cds.vcxproj.filters | 6 -- 4 files changed, 168 deletions(-) delete mode 100644 cds/intrusive/details/dummy_node_holder.h delete mode 100644 cds/intrusive/details/queue_stat.h diff --git a/cds/intrusive/details/dummy_node_holder.h b/cds/intrusive/details/dummy_node_holder.h deleted file mode 100644 index 56a2a925..00000000 --- a/cds/intrusive/details/dummy_node_holder.h +++ /dev/null @@ -1,67 +0,0 @@ -//$$CDS-header$$ - -#ifndef __CDS_INTRUSIVE_DETAILS_DUMMY_NODE_HOLDER_H -#define __CDS_INTRUSIVE_DETAILS_DUMMY_NODE_HOLDER_H - -#include -#include - -//@cond -namespace cds { namespace intrusive { namespace details { - - template - class dummy_node: public Node - { - typedef Node node_type; - - node_type m_Dummy; - public: - node_type * get() - { - return &m_Dummy; - } - - void retire() - {} - }; - - template - class dummy_node< cds::gc::HRC, Node, Alloc > - { - typedef Node node_type; - typedef cds::gc::HRC gc; - typedef cds::details::Allocator< node_type, Alloc> allocator_type; - - node_type * m_pDummy; - - struct dummy_node_disposer { - void operator()( node_type * p ) - { - assert( p != nullptr ); - - p->m_pNext.store( nullptr, atomics::memory_order_release ); - allocator_type().Delete( p ); - } - }; - - public: - dummy_node() - : m_pDummy( allocator_type().New() ) - {} - - node_type * get() - { - return m_pDummy; - } - - void retire() - { - gc::template retire( m_pDummy ); - } - }; - -}}} // namepace cds::intrusive::details - -//@endcond - -#endif // #ifndef __CDS_INTRUSIVE_DETAILS_DUMMY_NODE_HOLDER_H diff --git a/cds/intrusive/details/queue_stat.h b/cds/intrusive/details/queue_stat.h deleted file mode 100644 index 0de77693..00000000 --- a/cds/intrusive/details/queue_stat.h +++ /dev/null @@ -1,93 +0,0 @@ -//$$CDS-header$$ - -#ifndef __CDS_INTRUSIVE_DETAILS_QUEUE_STAT_H -#define __CDS_INTRUSIVE_DETAILS_QUEUE_STAT_H - -#include - -namespace cds { namespace intrusive { - - /// Queue internal statistics. May be used for debugging or profiling - /** @ingroup cds_intrusive_helper - Template argument \p Counter defines type of counter. - Default is cds::atomicity::event_counter, that is weak, i.e. it is not guaranteed - strict event counting. - You may use stronger type of counter like as cds::atomicity::item_counter, - or even integral type, for example, \p int. - */ - template - struct queue_stat - { - typedef Counter counter_type ; ///< Counter type - - counter_type m_EnqueueCount ; ///< Enqueue call count - counter_type m_DequeueCount ; ///< Dequeue call count - counter_type m_EnqueueRace ; ///< Count of enqueue race conditions encountered - counter_type m_DequeueRace ; ///< Count of dequeue race conditions encountered - counter_type m_AdvanceTailError ; ///< Count of "advance tail failed" events - counter_type m_BadTail ; ///< Count of events "Tail is not pointed to the last item in the queue" - - /// Register enqueue call - void onEnqueue() { ++m_EnqueueCount; } - /// Register dequeue call - void onDequeue() { ++m_DequeueCount; } - /// Register enqueue race event - void onEnqueueRace() { ++m_EnqueueRace; } - /// Register dequeue race event - void onDequeueRace() { ++m_DequeueRace; } - /// Register "advance tail failed" event - void onAdvanceTailFailed() { ++m_AdvanceTailError; } - /// Register event "Tail is not pointed to last item in the queue" - void onBadTail() { ++m_BadTail; } - - //@cond - void reset() - { - m_EnqueueCount.reset(); - m_DequeueCount.reset(); - m_EnqueueRace.reset(); - m_DequeueRace.reset(); - m_AdvanceTailError.reset(); - m_BadTail.reset(); - } - - queue_stat& operator +=( queue_stat const& s ) - { - m_EnqueueCount += s.m_EnqueueCount.get(); - m_DequeueCount += s.m_DequeueCount.get(); - m_EnqueueRace += s.m_EnqueueRace.get(); - m_DequeueRace += s.m_DequeueRace.get(); - m_AdvanceTailError += s.m_AdvanceTailError.get(); - m_BadTail += s.m_BadTail.get(); - - return *this; - } - //@endcond - }; - - /// Dummy queue statistics - no counting is performed. Support interface like \ref queue_stat - /** @ingroup cds_intrusive_helper - */ - struct queue_dummy_stat - { - //@cond - void onEnqueue() {} - void onDequeue() {} - void onEnqueueRace() {} - void onDequeueRace() {} - void onAdvanceTailFailed() {} - void onBadTail() {} - - void reset() {} - queue_dummy_stat& operator +=( queue_dummy_stat const& s ) - { - return *this; - } - //@endcond - }; - - -}} // namespace cds::intrusive - - -#endif // #ifndef __CDS_INTRUSIVE_DETAILS_QUEUE_STAT_H diff --git a/projects/Win/vc12/cds.vcxproj b/projects/Win/vc12/cds.vcxproj index 12a608d2..a00b5821 100644 --- a/projects/Win/vc12/cds.vcxproj +++ b/projects/Win/vc12/cds.vcxproj @@ -747,13 +747,11 @@ - - diff --git a/projects/Win/vc12/cds.vcxproj.filters b/projects/Win/vc12/cds.vcxproj.filters index f6a65148..287f6d9a 100644 --- a/projects/Win/vc12/cds.vcxproj.filters +++ b/projects/Win/vc12/cds.vcxproj.filters @@ -1046,9 +1046,6 @@ Header Files\cds\gc - - Header Files\cds\intrusive\details - Header Files\cds\urcu\details @@ -1199,9 +1196,6 @@ Header Files\cds\intrusive\details - - Header Files\cds\intrusive\details - Header Files\cds\intrusive\details -- 2.34.1