projects
/
libcds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9f365e3
)
IterableList: renamed some internal methods
author
khizmax
<libcds.dev@gmail.com>
Thu, 6 Oct 2016 16:54:01 +0000
(19:54 +0300)
committer
khizmax
<libcds.dev@gmail.com>
Thu, 6 Oct 2016 16:54:01 +0000
(19:54 +0300)
cds/intrusive/impl/iterable_list.h
patch
|
blob
|
history
diff --git
a/cds/intrusive/impl/iterable_list.h
b/cds/intrusive/impl/iterable_list.h
index d16cf1c06991b64860ed000e4abc0f40123561b1..eb87e3e8b7b0e32dc17d418ca6f166e63c91e4f8 100644
(file)
--- a/
cds/intrusive/impl/iterable_list.h
+++ b/
cds/intrusive/impl/iterable_list.h
@@
-779,7
+779,7
@@
namespace cds { namespace intrusive {
pos.pFound = pos.guard.protect( pos.pCur->data, []( marked_data_ptr p ) { return p.ptr(); }).ptr();
if ( !pos.pFound )
break;
pos.pFound = pos.guard.protect( pos.pCur->data, []( marked_data_ptr p ) { return p.ptr(); }).ptr();
if ( !pos.pFound )
break;
- if ( cds_likely( unlink_
node
( pos ))) {
+ if ( cds_likely( unlink_
data
( pos ))) {
--m_ItemCounter;
break;
}
--m_ItemCounter;
break;
}
@@
-845,7
+845,7
@@
namespace cds { namespace intrusive {
return false;
}
return false;
}
- if ( link_
node
( &val, pos ) ) {
+ if ( link_
data
( &val, pos ) ) {
++m_ItemCounter;
m_Stat.onInsertSuccess();
return true;
++m_ItemCounter;
m_Stat.onInsertSuccess();
return true;
@@
-869,7
+869,7
@@
namespace cds { namespace intrusive {
return false;
}
return false;
}
- if ( link_
node
( &val, pos ) ) {
+ if ( link_
data
( &val, pos ) ) {
f( val );
++m_ItemCounter;
m_Stat.onInsertSuccess();
f( val );
++m_ItemCounter;
m_Stat.onInsertSuccess();
@@
-912,7
+912,7
@@
namespace cds { namespace intrusive {
return std::make_pair( false, false );
}
return std::make_pair( false, false );
}
- if ( link_
node
( &val, pos )) {
+ if ( link_
data
( &val, pos )) {
func( val, static_cast<value_type*>( nullptr ));
++m_ItemCounter;
m_Stat.onUpdateNew();
func( val, static_cast<value_type*>( nullptr ));
++m_ItemCounter;
m_Stat.onUpdateNew();
@@
-931,7
+931,7
@@
namespace cds { namespace intrusive {
back_off bkoff;
while ( search( refHead, val, pos, key_comparator())) {
if ( pos.pFound == &val ) {
back_off bkoff;
while ( search( refHead, val, pos, key_comparator())) {
if ( pos.pFound == &val ) {
- if ( unlink_
node
( pos )) {
+ if ( unlink_
data
( pos )) {
--m_ItemCounter;
m_Stat.onEraseSuccess();
return true;
--m_ItemCounter;
m_Stat.onEraseSuccess();
return true;
@@
-954,7
+954,7
@@
namespace cds { namespace intrusive {
{
back_off bkoff;
while ( search( refHead, val, pos, cmp )) {
{
back_off bkoff;
while ( search( refHead, val, pos, cmp )) {
- if ( unlink_
node
( pos )) {
+ if ( unlink_
data
( pos )) {
f( *pos.pFound );
--m_ItemCounter;
m_Stat.onEraseSuccess();
f( *pos.pFound );
--m_ItemCounter;
m_Stat.onEraseSuccess();
@@
-990,7
+990,7
@@
namespace cds { namespace intrusive {
position pos;
back_off bkoff;
while ( search( refHead, val, pos, cmp )) {
position pos;
back_off bkoff;
while ( search( refHead, val, pos, cmp )) {
- if ( unlink_
node
( pos )) {
+ if ( unlink_
data
( pos )) {
--m_ItemCounter;
m_Stat.onEraseSuccess();
assert( pos.pFound != nullptr );
--m_ItemCounter;
m_Stat.onEraseSuccess();
assert( pos.pFound != nullptr );
@@
-1140,7
+1140,7
@@
namespace cds { namespace intrusive {
}
}
}
}
- bool link_
node
( value_type * pVal, position& pos )
+ bool link_
data
( value_type * pVal, position& pos )
{
if ( pos.pPrev ) {
if ( pos.pPrev->data.load( memory_model::memory_order_relaxed ) == marked_data_ptr() ) {
{
if ( pos.pPrev ) {
if ( pos.pPrev->data.load( memory_model::memory_order_relaxed ) == marked_data_ptr() ) {
@@
-1200,7
+1200,7
@@
namespace cds { namespace intrusive {
return false;
}
return false;
}
- static bool unlink_
node
( position& pos )
+ static bool unlink_
data
( position& pos )
{
assert( pos.pCur != nullptr );
assert( pos.pFound != nullptr );
{
assert( pos.pCur != nullptr );
assert( pos.pFound != nullptr );