From cc0e9149b8528f2b5ec2492665a152881fcafd01 Mon Sep 17 00:00:00 2001 From: khizmax Date: Mon, 3 Oct 2016 23:27:10 +0300 Subject: [PATCH] Renamed internal stat events --- cds/intrusive/details/iterable_list_base.h | 16 ++++++++-------- cds/intrusive/impl/iterable_list.h | 8 ++++---- test/include/cds_test/stat_iterable_list_out.h | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/cds/intrusive/details/iterable_list_base.h b/cds/intrusive/details/iterable_list_base.h index e9c27fd7..83fa58d9 100644 --- a/cds/intrusive/details/iterable_list_base.h +++ b/cds/intrusive/details/iterable_list_base.h @@ -76,8 +76,8 @@ namespace cds { namespace intrusive { event_counter m_nInsertSuccess; ///< Number of success \p insert() operations event_counter m_nInsertFailed; ///< Number of failed \p insert() operations event_counter m_nInsertRetry; ///< Number of attempts to insert new item - event_counter m_nInsertReuse; ///< Number of reusing empty node when inserting - event_counter m_nInsertReuseFailed; ///< Number of failed attempsof reusing free node when inserting + event_counter m_nReuseNode; ///< Number of reusing empty node when inserting/updating + event_counter m_nReuseNodeFailed; ///< Number of failed attempsof reusing free node when inserting/updating event_counter m_nUpdateNew; ///< Number of new item inserted for \p update() event_counter m_nUpdateExisting; ///< Number of existing item updates event_counter m_nUpdateFailed; ///< Number of failed \p update() call @@ -95,8 +95,8 @@ namespace cds { namespace intrusive { void onInsertSuccess() { ++m_nInsertSuccess; } void onInsertFailed() { ++m_nInsertFailed; } void onInsertRetry() { ++m_nInsertRetry; } - void onInsertReuse() { ++m_nInsertReuse; } - void onInsertReuseFailed() { ++m_nInsertReuseFailed; } + void onReuseNode() { ++m_nReuseNode; } + void onReuseNodeFailed() { ++m_nReuseNodeFailed; } void onUpdateNew() { ++m_nUpdateNew; } void onUpdateExisting() { ++m_nUpdateExisting; } void onUpdateFailed() { ++m_nUpdateFailed; } @@ -118,8 +118,8 @@ namespace cds { namespace intrusive { void onInsertSuccess() const {} void onInsertFailed() const {} void onInsertRetry() const {} - void onInsertReuse() const {} - void onInsertReuseFailed() const {} + void onReuseNode() const {} + void onReuseNodeFailed() const {} void onUpdateNew() const {} void onUpdateExisting() const {} void onUpdateFailed() const {} @@ -147,8 +147,8 @@ namespace cds { namespace intrusive { void onInsertSuccess() { m_stat.onInsertSuccess(); } void onInsertFailed() { m_stat.onInsertFailed(); } void onInsertRetry() { m_stat.onInsertRetry(); } - void onInsertReuse() { m_stat.onInsertReuse(); } - void onInsertReuseFailed() { m_stat.onInsertReuseFailed(); } + void onReuseNode() { m_stat.onReuseNode(); } + void onReuseNodeFailed() { m_stat.onReuseNodeFailed(); } void onUpdateNew() { m_stat.onUpdateNew(); } void onUpdateExisting() { m_stat.onUpdateExisting();} void onUpdateFailed() { m_stat.onUpdateFailed(); } diff --git a/cds/intrusive/impl/iterable_list.h b/cds/intrusive/impl/iterable_list.h index 6561787e..a733b2d2 100644 --- a/cds/intrusive/impl/iterable_list.h +++ b/cds/intrusive/impl/iterable_list.h @@ -1084,10 +1084,10 @@ namespace cds { namespace intrusive { return false; } - value_type * pVal = pos.guard.protect( pCur->data, + value_type * pVal = pos.guard.protect( pCur->data, []( marked_data_ptr p ) -> value_type* { - return p.ptr(); + return p.ptr(); }).ptr(); if ( pVal ) { @@ -1153,7 +1153,7 @@ namespace cds { namespace intrusive { marked_data_ptr val( pos.pFound ); if ( pos.pCur && !pos.pCur->data.compare_exchange_strong( val, val | 1, memory_model::memory_order_acquire, atomics::memory_order_relaxed )) { // oops, pos.pCur data has been changed or another thread is setting pos.pPrev data - m_Stat.onInsertReuseFailed(); + m_Stat.onReuseNodeFailed(); return false; } @@ -1167,7 +1167,7 @@ namespace cds { namespace intrusive { pos.pCur->data.store( val, memory_model::memory_order_relaxed ); if ( result ) - m_Stat.onInsertReuse(); + m_Stat.onReuseNode(); return result; } else { diff --git a/test/include/cds_test/stat_iterable_list_out.h b/test/include/cds_test/stat_iterable_list_out.h index c14f204e..94db6436 100644 --- a/test/include/cds_test/stat_iterable_list_out.h +++ b/test/include/cds_test/stat_iterable_list_out.h @@ -46,8 +46,8 @@ namespace cds_test { << CDSSTRESS_STAT_OUT( s, m_nInsertSuccess ) << CDSSTRESS_STAT_OUT( s, m_nInsertFailed ) << CDSSTRESS_STAT_OUT( s, m_nInsertRetry ) - << CDSSTRESS_STAT_OUT( s, m_nInsertReuse ) - << CDSSTRESS_STAT_OUT( s, m_nInsertReuseFailed ) + << CDSSTRESS_STAT_OUT( s, m_nReuseNode ) + << CDSSTRESS_STAT_OUT( s, m_nReuseNodeFailed ) << CDSSTRESS_STAT_OUT( s, m_nUpdateNew ) << CDSSTRESS_STAT_OUT( s, m_nUpdateExisting ) << CDSSTRESS_STAT_OUT( s, m_nUpdateFailed ) -- 2.34.1