Text formatting, docfix

diff --git a/cds/algo/split_bitstring.h b/cds/algo/split_bitstring.h
index 82cf1242635f6faad52a9aa66194290d3cd0506e..0c9049e03c2c12456ba1091a48efc3f9b90eaf61 100644 (file)
--- a/cds/algo/split_bitstring.h
+++ b/cds/algo/split_bitstring.h
@@ -14,7 +14,7 @@ namespace cds { namespace algo {
         and keeps the position inside bit-string for the next call.
 
         The splitter stores a const reference to bit-string, not a copy.
         and keeps the position inside bit-string for the next call.
 
         The splitter stores a const reference to bit-string, not a copy.

-        The maximum count of bits that can be cut for single call is <tt> sizeof(UInt) * 8 </tt>
+        The maximum count of bits that can be cut in a single call is <tt> sizeof(UInt) * 8 </tt>

     */
     template <typename BitString, typename UInt = size_t >
     class split_bitstring
     */
     template <typename BitString, typename UInt = size_t >
     class split_bitstring


@@ -34,7 +34,7 @@ namespace cds { namespace algo {
         /// Initializises the splitter with reference to \p h and zero start bit offset
         explicit split_bitstring( bitstring const& h )
             : m_ptr(reinterpret_cast<uint_type const*>( &h ))
         /// Initializises the splitter with reference to \p h and zero start bit offset
         explicit split_bitstring( bitstring const& h )
             : m_ptr(reinterpret_cast<uint_type const*>( &h ))

-            , m_pos(0)
+            , m_offset(0)

             , m_first( m_ptr )
 #   ifdef _DEBUG
             , m_last( m_ptr + c_nHashSize )
             , m_first( m_ptr )
 #   ifdef _DEBUG
             , m_last( m_ptr + c_nHashSize )


@@ -44,7 +44,7 @@ namespace cds { namespace algo {
         /// Initializises the splitter with reference to \p h and start bit offset \p nBitOffset
         split_bitstring( bitstring const& h, size_t nBitOffset )
             : m_ptr( reinterpret_cast<uint_type const*>( &h ) + nBitOffset / c_nBitPerInt )
         /// Initializises the splitter with reference to \p h and start bit offset \p nBitOffset
         split_bitstring( bitstring const& h, size_t nBitOffset )
             : m_ptr( reinterpret_cast<uint_type const*>( &h ) + nBitOffset / c_nBitPerInt )

-            , m_pos( nBitOffset )
+            , m_offset( nBitOffset )

             , m_first( reinterpret_cast<uint_type const*>(&h))
 #   ifdef _DEBUG
             , m_last( m_first + c_nHashSize )
             , m_first( reinterpret_cast<uint_type const*>(&h))
 #   ifdef _DEBUG
             , m_last( m_first + c_nHashSize )


@@ -61,7 +61,7 @@ namespace cds { namespace algo {
         /// Returns \p true if end-of-stream encountered
         bool eos() const
         {
         /// Returns \p true if end-of-stream encountered
         bool eos() const
         {

-            return m_pos >= c_nBitPerHash;
+            return m_offset >= c_nBitPerHash;

         }
 
         /// Cuts next \p nBits from bit-string
         }
 
         /// Cuts next \p nBits from bit-string


@@ -75,14 +75,14 @@ namespace cds { namespace algo {
         {
             assert( !eos() );
             assert( nBits <= c_nBitPerInt );
         {
             assert( !eos() );
             assert( nBits <= c_nBitPerInt );

-            assert( m_pos + nBits <= c_nBitPerHash );
+            assert( m_offset + nBits <= c_nBitPerHash );

 #   ifdef _DEBUG
             assert( m_ptr < m_last );
 #   endif
             uint_type result;
 
 #   ifdef _DEBUG
             assert( m_ptr < m_last );
 #   endif
             uint_type result;
 

-            uint_type const nRest = c_nBitPerInt - m_pos % c_nBitPerInt;
-            m_pos += nBits;
+            uint_type const nRest = c_nBitPerInt - m_offset % c_nBitPerInt;
+            m_offset += nBits;

             if ( nBits < nRest ) {
                 result = *m_ptr << ( nRest - nBits );
                 result = result >> ( c_nBitPerInt - nBits );
             if ( nBits < nRest ) {
                 result = *m_ptr << ( nRest - nBits );
                 result = result >> ( c_nBitPerInt - nBits );


@@ -90,7 +90,7 @@ namespace cds { namespace algo {
             else if ( nBits == nRest ) {
                 result = *m_ptr >> ( c_nBitPerInt - nRest );
                 ++m_ptr;
             else if ( nBits == nRest ) {
                 result = *m_ptr >> ( c_nBitPerInt - nRest );
                 ++m_ptr;

-                assert( m_pos % c_nBitPerInt == 0 );
+                assert( m_offset % c_nBitPerInt == 0 );

             }
             else {
                 uint_type const lsb = *m_ptr >> ( c_nBitPerInt - nRest );
             }
             else {
                 uint_type const lsb = *m_ptr >> ( c_nBitPerInt - nRest );


@@ -102,7 +102,7 @@ namespace cds { namespace algo {
                 result = (result << nRest) + lsb;
             }
 
                 result = (result << nRest) + lsb;
             }
 

-            assert( m_pos <= c_nBitPerHash );
+            assert( m_offset <= c_nBitPerHash );

 #   ifdef _DEBUG
             assert( m_ptr <= m_last );
 #   endif
 #   ifdef _DEBUG
             assert( m_ptr <= m_last );
 #   endif


@@ -122,8 +122,8 @@ namespace cds { namespace algo {
 
             assert( nBits <= sizeof(uint_type) * c_nBitPerByte );
 
 
             assert( nBits <= sizeof(uint_type) * c_nBitPerByte );
 

-            if ( m_pos + nBits > c_nBitPerHash )
-                nBits = c_nBitPerHash - m_pos;
+            if ( m_offset + nBits > c_nBitPerHash )
+                nBits = c_nBitPerHash - m_offset;

             return nBits ? cut( nBits ) : 0;
         }
 
             return nBits ? cut( nBits ) : 0;
         }
 


@@ -131,10 +131,10 @@ namespace cds { namespace algo {
         void reset() CDS_NOEXCEPT
         {
             m_ptr = m_first;
         void reset() CDS_NOEXCEPT
         {
             m_ptr = m_first;

-            m_pos = 0;
+            m_offset = 0;

         }
 
         }
 

-        // Returns pointer to source bitstring
+        /// Returns pointer to source bitstring

         bitstring const * source() const
         {
             return reinterpret_cast<bitstring const *>( m_first );
         bitstring const * source() const
         {
             return reinterpret_cast<bitstring const *>( m_first );


@@ -143,16 +143,16 @@ namespace cds { namespace algo {
         /// Returns current bit offset from beginning of bit-string
         size_t bit_offset() const
         {
         /// Returns current bit offset from beginning of bit-string
         size_t bit_offset() const
         {

-            return m_pos;
+            return m_offset;

         }
 
     private:
         //@cond
         }
 
     private:
         //@cond

-        uint_type const* m_ptr;  ///< current position in the hash
-        size_t           m_pos;  ///< current position in bits
-        uint_type const* m_first; ///< first position
+        uint_type const* m_ptr;     ///< current position in the hash
+        size_t           m_offset;  ///< current bit offset in bit-string
+        uint_type const* m_first;   ///< first position

 #   ifdef _DEBUG
 #   ifdef _DEBUG

-        uint_type const* m_last;  ///< last position
+        uint_type const* m_last;    ///< last position

 #   endif
         //@endcond
     };
 #   endif
         //@endcond
     };

diff --git a/cds/container/bronson_avltree_map_rcu.h b/cds/container/bronson_avltree_map_rcu.h
index 51a94da30ac511d073941dfd6aa6b98ea46f3e69..ae2d794f3cd128dfa71b0930b02505ce47a516c8 100644 (file)
--- a/cds/container/bronson_avltree_map_rcu.h
+++ b/cds/container/bronson_avltree_map_rcu.h
@@ -281,7 +281,7 @@ namespace cds { namespace container {
             The operation performs inserting or changing data with lock-free manner.
 
             If the \p key not found in the map, then the new item created from \p key
             The operation performs inserting or changing data with lock-free manner.
 
             If the \p key not found in the map, then the new item created from \p key

-            will be inserted into the map iff \p bAllowInsert is \p true 
+            will be inserted into the map iff \p bAllowInsert is \p true

             (note that in this case the \ref key_type should be constructible from type \p K).
             Otherwise, the functor \p func is called with item found.
             The functor \p Func signature is:
             (note that in this case the \ref key_type should be constructible from type \p K).
             Otherwise, the functor \p func is called with item found.
             The functor \p Func signature is:

diff --git a/cds/container/feldman_hashmap_rcu.h b/cds/container/feldman_hashmap_rcu.h
index ebbd50e5b5227a576b6f7d9e6c602578f84ef3fc..7a11254d00c4485265b098c163a2ab010d7a0a55 100644 (file)
--- a/cds/container/feldman_hashmap_rcu.h
+++ b/cds/container/feldman_hashmap_rcu.h
@@ -680,7 +680,7 @@ namespace cds { namespace container {
                     i->second.payload++;
                 }
             } // at this point RCU lock is released
                     i->second.payload++;
                 }
             } // at this point RCU lock is released

-            /endcode
+            \endcode

 
             Each iterator object supports the common interface:
             - dereference operators:
 
             Each iterator object supports the common interface:
             - dereference operators:

diff --git a/cds/container/feldman_hashset_rcu.h b/cds/container/feldman_hashset_rcu.h
index d6b3bfa9ea0f6a90fc173cef8541d920fdf43763..5563a9daf203353db0cfca9be908942789d04a52 100644 (file)
--- a/cds/container/feldman_hashset_rcu.h
+++ b/cds/container/feldman_hashset_rcu.h
@@ -448,7 +448,7 @@ namespace cds { namespace container {
                     i->payload++;
                 }
             } // at this point RCU lock is released
                     i->payload++;
                 }
             } // at this point RCU lock is released

-            /endcode
+            \endcode

 
             Each iterator object supports the common interface:
             - dereference operators:
 
             Each iterator object supports the common interface:
             - dereference operators:

diff --git a/cds/container/lazy_kvlist_nogc.h b/cds/container/lazy_kvlist_nogc.h
index 1cf0729af27543fc03b66f91bff8f080108aad62..48bb3b7500bb12344f77e55bb9e7815c63ecc7fb 100644 (file)
--- a/cds/container/lazy_kvlist_nogc.h
+++ b/cds/container/lazy_kvlist_nogc.h
@@ -377,7 +377,8 @@ namespace cds { namespace container {
 
         /// Updates the item
         /**
 
         /// Updates the item
         /**

-            If \p key is not in the list and \p bAllowInsert is \p true, 
+            If \p key is not in the list and \p bAllowInsert is \p true,
+

             the function inserts a new item.
             Otherwise, the function returns an iterator pointing to the item found.
 
             the function inserts a new item.
             Otherwise, the function returns an iterator pointing to the item found.
 

diff --git a/cds/container/lazy_list_nogc.h b/cds/container/lazy_list_nogc.h
index c4d8a2ea1df0512e2f75db576412849c99e2f39e..605b344ab94adc19087d50bdbf58fdfc258a83d8 100644 (file)
--- a/cds/container/lazy_list_nogc.h
+++ b/cds/container/lazy_list_nogc.h
@@ -298,7 +298,8 @@ namespace cds { namespace container {
 
         /// Updates the item
         /**
 
         /// Updates the item
         /**

-            If \p key is not in the list and \p bAllowInsert is \p true, 
+            If \p key is not in the list and \p bAllowInsert is \p true,
+

             the function inserts a new item.
             Otherwise, the function returns an iterator pointing to the item found.
 
             the function inserts a new item.
             Otherwise, the function returns an iterator pointing to the item found.
 

diff --git a/cds/container/michael_kvlist_nogc.h b/cds/container/michael_kvlist_nogc.h
index ad0a7c4d2b9662ceeceba7d4b6da90019116488a..23c39c66172914999c3e0cbce51209c31727a1c3 100644 (file)
--- a/cds/container/michael_kvlist_nogc.h
+++ b/cds/container/michael_kvlist_nogc.h
@@ -393,7 +393,8 @@ namespace cds { namespace container {
 
         /// Updates the item
         /**
 
         /// Updates the item
         /**

-            If \p key is not in the list and \p bAllowInsert is \p true, 
+            If \p key is not in the list and \p bAllowInsert is \p true,
+

             the function inserts a new item.
             Otherwise, the function returns an iterator pointing to the item found.
 
             the function inserts a new item.
             Otherwise, the function returns an iterator pointing to the item found.
 


@@ -532,7 +533,8 @@ namespace cds { namespace container {
             scoped_node_ptr pNode( alloc_node( key ));
             node_type * pItemFound = nullptr;
 
             scoped_node_ptr pNode( alloc_node( key ));
             node_type * pItemFound = nullptr;
 

-            std::pair<bool, bool> ret = base_class::update_at( refHead, *pNode, 
+            std::pair<bool, bool> ret = base_class::update_at( refHead, *pNode,
+

                 [&pItemFound](bool, node_type& item, node_type&){ pItemFound = &item; },
                 bAllowInsert );
 
                 [&pItemFound](bool, node_type& item, node_type&){ pItemFound = &item; },
                 bAllowInsert );
 

diff --git a/cds/container/michael_list_nogc.h b/cds/container/michael_list_nogc.h
index 3c41b4dee1361bfe59ed6952c5c52212979669c4..43ea8076bf379b2b3690568d3f21cd9d9a5bde41 100644 (file)
--- a/cds/container/michael_list_nogc.h
+++ b/cds/container/michael_list_nogc.h
@@ -294,7 +294,8 @@ namespace cds { namespace container {
 
         /// Updates the item
         /**
 
         /// Updates the item
         /**

-            If \p key is not in the list and \p bAllowInsert is \p true, 
+            If \p key is not in the list and \p bAllowInsert is \p true,
+

             the function inserts a new item.
             Otherwise, the function returns an iterator pointing to the item found.
 
             the function inserts a new item.
             Otherwise, the function returns an iterator pointing to the item found.
 

diff --git a/cds/container/michael_map_nogc.h b/cds/container/michael_map_nogc.h
index 68d0c575a008337eb1a0f9f8b51dcd0a5264d98c..fc4f69b8d9f179a630e5528b0d8e67092baf4d2b 100644 (file)
--- a/cds/container/michael_map_nogc.h
+++ b/cds/container/michael_map_nogc.h
@@ -397,7 +397,8 @@ namespace cds { namespace container {
             Otherwise, the function returns an iterator pointing to the item found.
 
             Returns <tt> std::pair<iterator, bool> </tt> where \p first is an iterator pointing to
             Otherwise, the function returns an iterator pointing to the item found.
 
             Returns <tt> std::pair<iterator, bool> </tt> where \p first is an iterator pointing to

-            item found or inserted (if inserting is not allowed and \p key is not found, the iterator will be \p end()), 
+            item found or inserted (if inserting is not allowed and \p key is not found, the iterator will be \p end()),
+

             \p second is true if new item has been added or \p false if the item
             already is in the map.
 
             \p second is true if new item has been added or \p false if the item
             already is in the map.
 

diff --git a/cds/container/michael_set.h b/cds/container/michael_set.h
index fcfc917c8e227556a5e263ebad98ac4508944da7..03948f6025fedf16ccf87e59c9ae5a3133d60c8e 100644 (file)
--- a/cds/container/michael_set.h
+++ b/cds/container/michael_set.h
@@ -614,7 +614,8 @@ namespace cds { namespace container {
         //@endcond
 
         /// Checks whether the set contains \p key
         //@endcond
 
         /// Checks whether the set contains \p key

-        /** 
+        /**
+

             The function searches the item with key equal to \p key
             and returns \p true if the key is found, and \p false otherwise.
 
             The function searches the item with key equal to \p key
             and returns \p true if the key is found, and \p false otherwise.
 

diff --git a/cds/container/michael_set_nogc.h b/cds/container/michael_set_nogc.h
index e66ddb69a0814c3e5378a0068e57564fc0aa1b43..878534b7596d64e11c26201b9e983ec707251d87 100644 (file)
--- a/cds/container/michael_set_nogc.h
+++ b/cds/container/michael_set_nogc.h
@@ -227,7 +227,8 @@ namespace cds { namespace container {
             If the item \p val not found in the set, then \p val is inserted iff \p bAllowInsert is \p true.
 
             Returns <tt> std::pair<iterator, bool> </tt> where \p first is an iterator pointing to
             If the item \p val not found in the set, then \p val is inserted iff \p bAllowInsert is \p true.
 
             Returns <tt> std::pair<iterator, bool> </tt> where \p first is an iterator pointing to

-            item found or inserted, or \p end() if \p bAllowInsert is \p false, 
+            item found or inserted, or \p end() if \p bAllowInsert is \p false,
+

             \p second is true if new item has been added or \p false if the item is already in the set.
 
             @warning For \ref cds_intrusive_MichaelList_hp "MichaelList" as the bucket see \ref cds_intrusive_item_creating "insert item troubleshooting".
             \p second is true if new item has been added or \p false if the item is already in the set.
 
             @warning For \ref cds_intrusive_MichaelList_hp "MichaelList" as the bucket see \ref cds_intrusive_item_creating "insert item troubleshooting".

diff --git a/cds/container/michael_set_rcu.h b/cds/container/michael_set_rcu.h
index a2a3180dbedfc0bce0b8c3e487139c259230f26d..42dfb18161e829da8c6f9d7871af53c724b29a5f 100644 (file)
--- a/cds/container/michael_set_rcu.h
+++ b/cds/container/michael_set_rcu.h
@@ -614,7 +614,8 @@ namespace cds { namespace container {
         //@endcond
 
         /// Checks whether the set contains \p key
         //@endcond
 
         /// Checks whether the set contains \p key

-        /** 
+        /**
+

             The function searches the item with key equal to \p key
             and returns \p true if the key is found, and \p false otherwise.
 
             The function searches the item with key equal to \p key
             and returns \p true if the key is found, and \p false otherwise.
 

diff --git a/cds/container/skip_list_map_nogc.h b/cds/container/skip_list_map_nogc.h
index 33a41e4ce34639c0560976a6aafbb16af1724e3b..fe68e64b94178a5f633910d63ff64c8114fce727 100644 (file)
--- a/cds/container/skip_list_map_nogc.h
+++ b/cds/container/skip_list_map_nogc.h
@@ -266,7 +266,8 @@ namespace cds { namespace container {
         {
             return base_class::contains( key );
         }
         {
             return base_class::contains( key );
         }

-        //@cond 
+        //@cond
+

         template <typename K>
         CDS_DEPRECATED("deprecated, use contains()")
         iterator find( K const& key )
         template <typename K>
         CDS_DEPRECATED("deprecated, use contains()")
         iterator find( K const& key )

diff --git a/cds/container/split_list_map_nogc.h b/cds/container/split_list_map_nogc.h
index c6708856d0ac83edb459b18ad2a1c2f56cd27a88..509bd05c0c45aefc5e76ac24ad4859f99c1b8ae8 100644 (file)
--- a/cds/container/split_list_map_nogc.h
+++ b/cds/container/split_list_map_nogc.h
@@ -229,7 +229,8 @@ namespace cds { namespace container {
             Otherwise, the function returns an iterator pointing to the item found.
 
             Returns <tt> std::pair<iterator, bool> </tt> where \p first is an iterator pointing to
             Otherwise, the function returns an iterator pointing to the item found.
 
             Returns <tt> std::pair<iterator, bool> </tt> where \p first is an iterator pointing to

-            item found or inserted (if inserting is not allowed and \p key is not found, the iterator will be \p end()), 
+            item found or inserted (if inserting is not allowed and \p key is not found, the iterator will be \p end()),
+

             \p second is true if new item has been added or \p false if the item
             already is in the map.
         */
             \p second is true if new item has been added or \p false if the item
             already is in the map.
         */

diff --git a/cds/container/split_list_set_nogc.h b/cds/container/split_list_set_nogc.h
index f84cc019c9ae4ca26a675f9aea4905f13daa9553..fc9c772385026431d6cf47d5c1ddb1e2c4e963e8 100644 (file)
--- a/cds/container/split_list_set_nogc.h
+++ b/cds/container/split_list_set_nogc.h
@@ -286,13 +286,16 @@ namespace cds { namespace container {
             Otherwise, the function returns an iterator pointing to the item found.
 
             Returns <tt> std::pair<iterator, bool> </tt> where \p first is an iterator pointing to
             Otherwise, the function returns an iterator pointing to the item found.
 
             Returns <tt> std::pair<iterator, bool> </tt> where \p first is an iterator pointing to

-            item found or inserted (if inserting is not allowed and \p key is not found, the iterator will be \p end()), 
+            item found or inserted (if inserting is not allowed and \p key is not found, the iterator will be \p end()),
+

             \p second is true if new item has been added or \p false if the item
             already is in the set.
 
             \p second is true if new item has been added or \p false if the item
             already is in the set.
 

-            @warning If the set is based on \ref cds_nonintrusive_MichaelList_nogc "MichaelList", 
+            @warning If the set is based on \ref cds_nonintrusive_MichaelList_nogc "MichaelList",
+

             see \ref cds_intrusive_item_creating "insert item troubleshooting".
             see \ref cds_intrusive_item_creating "insert item troubleshooting".

-            \ref cds_nonintrusive_LazyList_nogc "LazyList" as the base provides exclusive access to inserted item 
+            \ref cds_nonintrusive_LazyList_nogc "LazyList" as the base provides exclusive access to inserted item
+

             and does not require any node-level synchronization.
         */
         template <typename Q>
             and does not require any node-level synchronization.
         */
         template <typename Q>


@@ -300,7 +303,8 @@ namespace cds { namespace container {
         {
             scoped_node_ptr pNode( alloc_node( key ));
 
         {
             scoped_node_ptr pNode( alloc_node( key ));
 

-            std::pair<typename base_class::iterator, bool> ret = base_class::update_( *pNode, 
+            std::pair<typename base_class::iterator, bool> ret = base_class::update_( *pNode,
+

                 [](bool /*bNew*/, node_type& /*item*/, node_type& /*val*/){},
                 bAllowInsert );
             if ( ret.first != base_class::end() && ret.second ) {
                 [](bool /*bNew*/, node_type& /*item*/, node_type& /*val*/){},
                 bAllowInsert );
             if ( ret.first != base_class::end() && ret.second ) {

diff --git a/cds/container/striped_set.h b/cds/container/striped_set.h
index 509407530dc0b11ba54df873182b0c0b185a8e3f..cee434bc1af76ee6380391669ba9acaf8df0b711 100644 (file)
--- a/cds/container/striped_set.h
+++ b/cds/container/striped_set.h
@@ -498,7 +498,8 @@ namespace cds { namespace container {
         /// Ctor with initial capacity specified
         StripedSet(
             size_t nCapacity    ///< Initial size of bucket table and lock array. Must be power of two, the minimum is 16.
         /// Ctor with initial capacity specified
         StripedSet(
             size_t nCapacity    ///< Initial size of bucket table and lock array. Must be power of two, the minimum is 16.

-        ) 
+        )
+

             : base_class( nCapacity )
         {}
 
             : base_class( nCapacity )
         {}
 


@@ -509,7 +510,8 @@ namespace cds { namespace container {
         StripedSet(
             size_t nCapacity    ///< Initial size of bucket table and lock array. Must be power of two, the minimum is 16.
             ,resizing_policy const& resizingPolicy  ///< Resizing policy
         StripedSet(
             size_t nCapacity    ///< Initial size of bucket table and lock array. Must be power of two, the minimum is 16.
             ,resizing_policy const& resizingPolicy  ///< Resizing policy

-        ) 
+        )
+

             : base_class( nCapacity, resizingPolicy )
         {}
 
             : base_class( nCapacity, resizingPolicy )
         {}
 


@@ -521,7 +523,8 @@ namespace cds { namespace container {
         StripedSet(
             size_t nCapacity    ///< Initial size of bucket table and lock array. Must be power of two, the minimum is 16.
             ,resizing_policy&& resizingPolicy  ///< Resizing policy
         StripedSet(
             size_t nCapacity    ///< Initial size of bucket table and lock array. Must be power of two, the minimum is 16.
             ,resizing_policy&& resizingPolicy  ///< Resizing policy

-        ) 
+        )
+

             : base_class( nCapacity, std::forward<resizing_policy>(resizingPolicy) )
         {}
 
             : base_class( nCapacity, std::forward<resizing_policy>(resizingPolicy) )
         {}
 

diff --git a/cds/container/striped_set/adapter.h b/cds/container/striped_set/adapter.h
index c0f130633f2271dc406f086db481d4751dbb9a23..22fbe170ba20aeb68eadeb0dd1f078af9cd17d5a 100644 (file)
--- a/cds/container/striped_set/adapter.h
+++ b/cds/container/striped_set/adapter.h
@@ -203,7 +203,7 @@ namespace cds { namespace container {
             class RecursiveLock = std::recursive_mutex,
             typename BackOff = cds::backoff::yield,
             class Alloc = CDS_DEFAULT_ALLOCATOR
             class RecursiveLock = std::recursive_mutex,
             typename BackOff = cds::backoff::yield,
             class Alloc = CDS_DEFAULT_ALLOCATOR

-        > 
+        >

         using refinable = cds::intrusive::striped_set::refinable<RecursiveLock, BackOff, Alloc >;
 
         //@cond
         using refinable = cds::intrusive::striped_set::refinable<RecursiveLock, BackOff, Alloc >;
 
         //@cond

diff --git a/cds/container/vyukov_mpmc_cycle_queue.h b/cds/container/vyukov_mpmc_cycle_queue.h
index 5f57d115b465c627a9de5413184507acdd5c4f6f..e40a26bcdcf9922eb52bdf35089aa9ba69c248c6 100644 (file)
--- a/cds/container/vyukov_mpmc_cycle_queue.h
+++ b/cds/container/vyukov_mpmc_cycle_queue.h
@@ -55,7 +55,8 @@ namespace cds { namespace container {
 
             /// Single-consumer version
             /**
 
             /// Single-consumer version
             /**

-                For single-consumer version of algorithm some additional functions 
+                For single-consumer version of algorithm some additional functions
+

                 (\p front(), \p pop_front()) is available.
 
                 Default is \p false
                 (\p front(), \p pop_front()) is available.
 
                 Default is \p false


@@ -459,7 +460,8 @@ namespace cds { namespace container {
     };
 
     //@cond
     };
 
     //@cond

-    namespace vyukov_queue { 
+    namespace vyukov_queue {
+

         template <typename Traits>
         struct single_consumer_traits : public Traits
         {
         template <typename Traits>
         struct single_consumer_traits : public Traits
         {


@@ -468,7 +470,8 @@ namespace cds { namespace container {
     } // namespace vyukov_queue
     //@endcond
 
     } // namespace vyukov_queue
     //@endcond
 

-    /// Vyukov's queue multiple producer - single consumer version 
+    /// Vyukov's queue multiple producer - single consumer version
+

     template <typename T, typename Traits = vyukov_queue::traits >
     using VyukovMPSCCycleQueue = VyukovMPMCCycleQueue< T, vyukov_queue::single_consumer_traits<Traits> >;
 
     template <typename T, typename Traits = vyukov_queue::traits >
     using VyukovMPSCCycleQueue = VyukovMPMCCycleQueue< T, vyukov_queue::single_consumer_traits<Traits> >;
 

diff --git a/cds/gc/details/dhp.h b/cds/gc/details/dhp.h
index 017d8d3d4e65b470152b10f34d00b8fb132e342a..e18168239e6f9ece3b6476991c66e513d4093bea 100644 (file)
--- a/cds/gc/details/dhp.h
+++ b/cds/gc/details/dhp.h
@@ -394,7 +394,8 @@ namespace cds { namespace gc {
                     , m_pEpochFree( epoch_array_alloc().NewArray( m_nEpochBitmask + 1))
                     , m_pGlobalFreeHead( nullptr )
                 {
                     , m_pEpochFree( epoch_array_alloc().NewArray( m_nEpochBitmask + 1))
                     , m_pGlobalFreeHead( nullptr )
                 {

-                    
+
+

                     for (unsigned int i = 0; i <= m_nEpochBitmask; ++i )
                         m_pEpochFree[i].store( nullptr, atomics::memory_order_relaxed );
 
                     for (unsigned int i = 0; i <= m_nEpochBitmask; ++i )
                         m_pEpochFree[i].store( nullptr, atomics::memory_order_relaxed );
 


@@ -764,7 +765,8 @@ namespace cds { namespace gc {
                     By perforce the local thread's guard pool is grown automatically from common pool.
                     When the thread terminated its guard pool is backed to common GC's pool.
                 - \p nEpochCount: internally, DHP memory manager uses epoch-based schema to solve
                     By perforce the local thread's guard pool is grown automatically from common pool.
                     When the thread terminated its guard pool is backed to common GC's pool.
                 - \p nEpochCount: internally, DHP memory manager uses epoch-based schema to solve

-                    ABA problem for internal data. \p nEpochCount specifies the epoch count, 
+                    ABA problem for internal data. \p nEpochCount specifies the epoch count,
+

                     i.e. the count of simultaneously working threads that remove the elements
                     of DHP-based concurrent data structure. Default value is 8.
 
                     i.e. the count of simultaneously working threads that remove the elements
                     of DHP-based concurrent data structure. Default value is 8.
 

diff --git a/cds/intrusive/basket_queue.h b/cds/intrusive/basket_queue.h
index 5a0658fa543e1a504def53110c174a7b8ff78521..5ff4117ecbab092fe786ffa2671f6d579c4d0731 100644 (file)
--- a/cds/intrusive/basket_queue.h
+++ b/cds/intrusive/basket_queue.h
@@ -673,8 +673,10 @@ namespace cds { namespace intrusive {
 
                     typename gc::template GuardArray<2> g;
                     g.assign( 0, node_traits::to_value_ptr( pNext.ptr()));
 
                     typename gc::template GuardArray<2> g;
                     g.assign( 0, node_traits::to_value_ptr( pNext.ptr()));

-                    if ( m_pTail.load( memory_model::memory_order_acquire ) != t 
-                      || t->m_pNext.load( memory_model::memory_order_relaxed ) != pNext ) 
+                    if ( m_pTail.load( memory_model::memory_order_acquire ) != t
+
+                      || t->m_pNext.load( memory_model::memory_order_relaxed ) != pNext )
+

                     {
                         m_Stat.onEnqueueRace();
                         bkoff();
                     {
                         m_Stat.onEnqueueRace();
                         bkoff();

diff --git a/cds/intrusive/feldman_hashset_rcu.h b/cds/intrusive/feldman_hashset_rcu.h
index 0f3bc27f47abfb55e734ee68440cc4c9867dfcb9..4495b8ab7cc0a5daaa15b546eba10af0ec9f7c16 100644 (file)
--- a/cds/intrusive/feldman_hashset_rcu.h
+++ b/cds/intrusive/feldman_hashset_rcu.h
@@ -45,7 +45,8 @@ namespace cds { namespace intrusive {
         @note Before including <tt><cds/intrusive/feldman_hashset_rcu.h></tt> you should include appropriate RCU header file,
         see \ref cds_urcu_gc "RCU type" for list of existing RCU class and corresponding header files.
 
         @note Before including <tt><cds/intrusive/feldman_hashset_rcu.h></tt> you should include appropriate RCU header file,
         see \ref cds_urcu_gc "RCU type" for list of existing RCU class and corresponding header files.
 

-        The set supports @ref cds_intrusive_FeldmanHashSet_rcu_iterators "bidirectional thread-safe iterators" 
+        The set supports @ref cds_intrusive_FeldmanHashSet_rcu_iterators "bidirectional thread-safe iterators"
+

         with some restrictions.
     */
     template <
         with some restrictions.
     */
     template <


@@ -898,7 +899,7 @@ namespace cds { namespace intrusive {
                     i->payload++;
                 }
             } // at this point RCU lock is released
                     i->payload++;
                 }
             } // at this point RCU lock is released

-            /endcode
+            \endcode

 
             Each iterator object supports the common interface:
             - dereference operators:
 
             Each iterator object supports the common interface:
             - dereference operators:

diff --git a/cds/intrusive/michael_set.h b/cds/intrusive/michael_set.h
index 803bcaf9a9ccbf48fd42c7e5b54e294e3f72b1ae..ac11cf2bbfae5edc28a4adf9b1c95047ec45229c 100644 (file)
--- a/cds/intrusive/michael_set.h
+++ b/cds/intrusive/michael_set.h
@@ -669,7 +669,8 @@ namespace cds { namespace intrusive {
         //@endcond
 
         /// Checks whether the set contains \p key
         //@endcond
 
         /// Checks whether the set contains \p key

-        /** 
+        /**
+

             The function searches the item with key equal to \p key
             and returns \p true if the key is found, and \p false otherwise.
 
             The function searches the item with key equal to \p key
             and returns \p true if the key is found, and \p false otherwise.
 

diff --git a/cds/intrusive/michael_set_nogc.h b/cds/intrusive/michael_set_nogc.h
index 2bb458374da588bcbdd41bed537cce67dfffec45..0710b1d057a31d543c91866e428deec654d82291 100644 (file)
--- a/cds/intrusive/michael_set_nogc.h
+++ b/cds/intrusive/michael_set_nogc.h
@@ -225,7 +225,8 @@ namespace cds { namespace intrusive {
         //@endcond
 
         /// Checks whether the set contains \p key
         //@endcond
 
         /// Checks whether the set contains \p key

-        /** 
+        /**
+

             The function searches the item with key equal to \p key
             and returns the pointer to an element found or \p nullptr.
 
             The function searches the item with key equal to \p key
             and returns the pointer to an element found or \p nullptr.
 

diff --git a/cds/intrusive/michael_set_rcu.h b/cds/intrusive/michael_set_rcu.h
index 3331795b102d2780eea8caf44bb9b68040e16743..177cfb6204bd2273bd490741b91cb658354ca7b7 100644 (file)
--- a/cds/intrusive/michael_set_rcu.h
+++ b/cds/intrusive/michael_set_rcu.h
@@ -468,7 +468,8 @@ namespace cds { namespace intrusive {
         }
 
         /// Checks whether the set contains \p key
         }
 
         /// Checks whether the set contains \p key

-        /** 
+        /**
+

             The function searches the item with key equal to \p key
             and returns \p true if the key is found, and \p false otherwise.
 
             The function searches the item with key equal to \p key
             and returns \p true if the key is found, and \p false otherwise.
 

diff --git a/cds/urcu/details/gpt.h b/cds/urcu/details/gpt.h
index 519a704f8e50b07b41b506b8260735fefa2f2a06..62d89920b3ee9f9a182f7019ad51e42ecb09cc73 100644 (file)
--- a/cds/urcu/details/gpt.h
+++ b/cds/urcu/details/gpt.h
@@ -27,7 +27,8 @@ namespace cds { namespace urcu {
         There is a wrapper \ref cds_urcu_general_threaded_gc "gc<general_threaded>" for \p %general_threaded class
         that provides unified RCU interface. You should use this wrapper class instead \p %general_threaded
 
         There is a wrapper \ref cds_urcu_general_threaded_gc "gc<general_threaded>" for \p %general_threaded class
         that provides unified RCU interface. You should use this wrapper class instead \p %general_threaded
 

-        The \p Buffer contains items of \ref cds_urcu_retired_ptr "epoch_retired_ptr" type 
+        The \p Buffer contains items of \ref cds_urcu_retired_ptr "epoch_retired_ptr" type
+

         and it should support a multiple producer/single consumer queue with the following interface:
         - <tt> bool push( epoch_retired_ptr& p ) </tt> - places the retired pointer \p p into queue. If the function
         returns \p false it means that the buffer is full and RCU synchronization cycle must be processed.
         and it should support a multiple producer/single consumer queue with the following interface:
         - <tt> bool push( epoch_retired_ptr& p ) </tt> - places the retired pointer \p p into queue. If the function
         returns \p false it means that the buffer is full and RCU synchronization cycle must be processed.


@@ -38,7 +39,8 @@ namespace cds { namespace urcu {
         The buffer is considered as full if \p push() returns \p false or the buffer size reaches the RCU threshold.
 
         Template arguments:
         The buffer is considered as full if \p push() returns \p false or the buffer size reaches the RCU threshold.
 
         Template arguments:

-        - \p Buffer - MPSC (muliple producer/single consumer) buffer type with FIFO semantics. 
+        - \p Buffer - MPSC (muliple producer/single consumer) buffer type with FIFO semantics.
+

             Default is \p cds::container::VyukovMPSCCycleQueue. The buffer contains the objects of \ref epoch_retired_ptr
             type that contains additional \p m_nEpoch field. This field specifies an epoch when the object
             has been placed into the buffer. The \p %general_threaded object has a global epoch counter
             Default is \p cds::container::VyukovMPSCCycleQueue. The buffer contains the objects of \ref epoch_retired_ptr
             type that contains additional \p m_nEpoch field. This field specifies an epoch when the object
             has been placed into the buffer. The \p %general_threaded object has a global epoch counter

diff --git a/tests/data/test-debug.conf b/tests/data/test-debug.conf
index 6b9e4444db735938a744a4417121a0f0cb0cb768..7e8ca1b3b2d72b59caf337b2f5fb90f77bfc5ab8 100644 (file)
--- a/tests/data/test-debug.conf
+++ b/tests/data/test-debug.conf
@@ -131,7 +131,8 @@ PrintGCStateFlag=1
 CuckooInitialSize=256\r
 CuckooProbesetSize=8\r
 # 0 - use default\r
 CuckooInitialSize=256\r
 CuckooProbesetSize=8\r
 # 0 - use default\r

-CuckooProbesetThreshold=0 \r
+CuckooProbesetThreshold=0\r
+\r

 # *** FeldmanHashMap properties\r
 FeldmanMapHeadBits=8\r
 FeldmanMapArrayBits=4\r
 # *** FeldmanHashMap properties\r
 FeldmanMapHeadBits=8\r
 FeldmanMapArrayBits=4\r


@@ -147,7 +148,8 @@ PrintGCStateFlag=1
 CuckooInitialSize=256\r
 CuckooProbesetSize=8\r
 # 0 - use default\r
 CuckooInitialSize=256\r
 CuckooProbesetSize=8\r
 # 0 - use default\r

-CuckooProbesetThreshold=0 \r
+CuckooProbesetThreshold=0\r
+\r

 # *** FeldmanHashMap properties\r
 FeldmanMapHeadBits=8\r
 FeldmanMapArrayBits=4\r
 # *** FeldmanHashMap properties\r
 FeldmanMapHeadBits=8\r
 FeldmanMapArrayBits=4\r


@@ -163,7 +165,8 @@ PrintGCStateFlag=1
 CuckooInitialSize=256\r
 CuckooProbesetSize=8\r
 # 0 - use default\r
 CuckooInitialSize=256\r
 CuckooProbesetSize=8\r
 # 0 - use default\r

-CuckooProbesetThreshold=0 \r
+CuckooProbesetThreshold=0\r
+\r

 # *** FeldmanHashMap properties\r
 FeldmanMapHeadBits=8\r
 FeldmanMapArrayBits=4\r
 # *** FeldmanHashMap properties\r
 FeldmanMapHeadBits=8\r
 FeldmanMapArrayBits=4\r


@@ -180,7 +183,8 @@ PrintGCStateFlag=1
 CuckooInitialSize=256\r
 CuckooProbesetSize=8\r
 # 0 - use default\r
 CuckooInitialSize=256\r
 CuckooProbesetSize=8\r
 # 0 - use default\r

-CuckooProbesetThreshold=0 \r
+CuckooProbesetThreshold=0\r
+\r

 # *** FeldmanHashMap properties\r
 FeldmanMapHeadBits=8\r
 FeldmanMapArrayBits=4\r
 # *** FeldmanHashMap properties\r
 FeldmanMapHeadBits=8\r
 FeldmanMapArrayBits=4\r


@@ -196,7 +200,8 @@ PrintGCStateFlag=1
 CuckooInitialSize=256\r
 CuckooProbesetSize=8\r
 # 0 - use default\r
 CuckooInitialSize=256\r
 CuckooProbesetSize=8\r
 # 0 - use default\r

-CuckooProbesetThreshold=0 \r
+CuckooProbesetThreshold=0\r
+\r

 # *** FeldmanHashMap properties\r
 FeldmanMapHeadBits=8\r
 FeldmanMapArrayBits=4\r
 # *** FeldmanHashMap properties\r
 FeldmanMapHeadBits=8\r
 FeldmanMapArrayBits=4\r


@@ -212,7 +217,8 @@ PrintGCStateFlag=1
 CuckooInitialSize=256\r
 CuckooProbesetSize=8\r
 # 0 - use default\r
 CuckooInitialSize=256\r
 CuckooProbesetSize=8\r
 # 0 - use default\r

-CuckooProbesetThreshold=0 \r
+CuckooProbesetThreshold=0\r
+\r

 # *** FeldmanHashMap properties\r
 FeldmanMapHeadBits=8\r
 FeldmanMapArrayBits=4\r
 # *** FeldmanHashMap properties\r
 FeldmanMapHeadBits=8\r
 FeldmanMapArrayBits=4\r


@@ -228,7 +234,8 @@ PrintGCStateFlag=1
 CuckooInitialSize=256\r
 CuckooProbesetSize=8\r
 # 0 - use default\r
 CuckooInitialSize=256\r
 CuckooProbesetSize=8\r
 # 0 - use default\r

-CuckooProbesetThreshold=0 \r
+CuckooProbesetThreshold=0\r
+\r

 # *** FeldmanHashMap properties\r
 FeldmanMapHeadBits=8\r
 FeldmanMapArrayBits=4\r
 # *** FeldmanHashMap properties\r
 FeldmanMapHeadBits=8\r
 FeldmanMapArrayBits=4\r


@@ -242,7 +249,8 @@ PrintGCStateFlag=1
 CuckooInitialSize=256\r
 CuckooProbesetSize=8\r
 # 0 - use default\r
 CuckooInitialSize=256\r
 CuckooProbesetSize=8\r
 # 0 - use default\r

-CuckooProbesetThreshold=0 \r
+CuckooProbesetThreshold=0\r
+\r

 # *** FeldmanHashMap properties\r
 FeldmanMapHeadBits=8\r
 FeldmanMapArrayBits=4\r
 # *** FeldmanHashMap properties\r
 FeldmanMapHeadBits=8\r
 FeldmanMapArrayBits=4\r


@@ -259,7 +267,8 @@ PrintGCStateFlag=1
 CuckooInitialSize=256\r
 CuckooProbesetSize=8\r
 # 0 - use default\r
 CuckooInitialSize=256\r
 CuckooProbesetSize=8\r
 # 0 - use default\r

-CuckooProbesetThreshold=0 \r
+CuckooProbesetThreshold=0\r
+\r

 # *** FeldmanHashMap properties\r
 FeldmanMapHeadBits=8\r
 FeldmanMapArrayBits=4\r
 # *** FeldmanHashMap properties\r
 FeldmanMapHeadBits=8\r
 FeldmanMapArrayBits=4\r


@@ -275,7 +284,8 @@ PrintGCStateFlag=1
 CuckooInitialSize=256\r
 CuckooProbesetSize=8\r
 # 0 - use default\r
 CuckooInitialSize=256\r
 CuckooProbesetSize=8\r
 # 0 - use default\r

-CuckooProbesetThreshold=0 \r
+CuckooProbesetThreshold=0\r
+\r

 # *** FeldmanHashMap properties\r
 FeldmanMapHeadBits=8\r
 FeldmanMapArrayBits=4\r
 # *** FeldmanHashMap properties\r
 FeldmanMapHeadBits=8\r
 FeldmanMapArrayBits=4\r

diff --git a/tests/data/test-express.conf b/tests/data/test-express.conf
index 6f9b2f558d92263cca2fc48f3463d65c94a1d9f9..3569b3e02405ef9c5270f591fbe4e90eb1ac6b42 100644 (file)
--- a/tests/data/test-express.conf
+++ b/tests/data/test-express.conf
@@ -125,7 +125,8 @@ PrintGCStateFlag=1
 CuckooInitialSize=1024\r
 CuckooProbesetSize=16\r
 # 0 - use default\r
 CuckooInitialSize=1024\r
 CuckooProbesetSize=16\r
 # 0 - use default\r

-CuckooProbesetThreshold=0 \r
+CuckooProbesetThreshold=0\r
+\r

 # *** FeldmanHashMap properties\r
 FeldmanMapHeadBits=8\r
 FeldmanMapArrayBits=4\r
 # *** FeldmanHashMap properties\r
 FeldmanMapHeadBits=8\r
 FeldmanMapArrayBits=4\r


@@ -141,7 +142,8 @@ PrintGCStateFlag=1
 CuckooInitialSize=1024\r
 CuckooProbesetSize=16\r
 # 0 - use default\r
 CuckooInitialSize=1024\r
 CuckooProbesetSize=16\r
 # 0 - use default\r

-CuckooProbesetThreshold=0 \r
+CuckooProbesetThreshold=0\r
+\r

 # *** FeldmanHashMap properties\r
 FeldmanMapHeadBits=8\r
 FeldmanMapArrayBits=4\r
 # *** FeldmanHashMap properties\r
 FeldmanMapHeadBits=8\r
 FeldmanMapArrayBits=4\r


@@ -157,7 +159,8 @@ PrintGCStateFlag=1
 CuckooInitialSize=1024\r
 CuckooProbesetSize=16\r
 # 0 - use default\r
 CuckooInitialSize=1024\r
 CuckooProbesetSize=16\r
 # 0 - use default\r

-CuckooProbesetThreshold=0 \r
+CuckooProbesetThreshold=0\r
+\r

 # *** FeldmanHashMap properties\r
 FeldmanMapHeadBits=8\r
 FeldmanMapArrayBits=4\r
 # *** FeldmanHashMap properties\r
 FeldmanMapHeadBits=8\r
 FeldmanMapArrayBits=4\r


@@ -174,7 +177,8 @@ PrintGCStateFlag=1
 CuckooInitialSize=1024\r
 CuckooProbesetSize=16\r
 # 0 - use default\r
 CuckooInitialSize=1024\r
 CuckooProbesetSize=16\r
 # 0 - use default\r

-CuckooProbesetThreshold=0 \r
+CuckooProbesetThreshold=0\r
+\r

 # *** FeldmanHashMap properties\r
 FeldmanMapHeadBits=8\r
 FeldmanMapArrayBits=4\r
 # *** FeldmanHashMap properties\r
 FeldmanMapHeadBits=8\r
 FeldmanMapArrayBits=4\r


@@ -190,7 +194,8 @@ PrintGCStateFlag=1
 CuckooInitialSize=1024\r
 CuckooProbesetSize=16\r
 # 0 - use default\r
 CuckooInitialSize=1024\r
 CuckooProbesetSize=16\r
 # 0 - use default\r

-CuckooProbesetThreshold=0 \r
+CuckooProbesetThreshold=0\r
+\r

 # *** FeldmanHashMap properties\r
 FeldmanMapHeadBits=8\r
 FeldmanMapArrayBits=4\r
 # *** FeldmanHashMap properties\r
 FeldmanMapHeadBits=8\r
 FeldmanMapArrayBits=4\r


@@ -206,7 +211,8 @@ PrintGCStateFlag=1
 CuckooInitialSize=1024\r
 CuckooProbesetSize=16\r
 # 0 - use default\r
 CuckooInitialSize=1024\r
 CuckooProbesetSize=16\r
 # 0 - use default\r

-CuckooProbesetThreshold=0 \r
+CuckooProbesetThreshold=0\r
+\r

 # *** FeldmanHashMap properties\r
 FeldmanMapHeadBits=8\r
 FeldmanMapArrayBits=4\r
 # *** FeldmanHashMap properties\r
 FeldmanMapHeadBits=8\r
 FeldmanMapArrayBits=4\r


@@ -222,7 +228,8 @@ PrintGCStateFlag=1
 CuckooInitialSize=1024\r
 CuckooProbesetSize=16\r
 # 0 - use default\r
 CuckooInitialSize=1024\r
 CuckooProbesetSize=16\r
 # 0 - use default\r

-CuckooProbesetThreshold=0 \r
+CuckooProbesetThreshold=0\r
+\r

 # *** FeldmanHashMap properties\r
 FeldmanMapHeadBits=8\r
 FeldmanMapArrayBits=4\r
 # *** FeldmanHashMap properties\r
 FeldmanMapHeadBits=8\r
 FeldmanMapArrayBits=4\r


@@ -236,7 +243,8 @@ PrintGCStateFlag=1
 CuckooInitialSize=1024\r
 CuckooProbesetSize=16\r
 # 0 - use default\r
 CuckooInitialSize=1024\r
 CuckooProbesetSize=16\r
 # 0 - use default\r

-CuckooProbesetThreshold=0 \r
+CuckooProbesetThreshold=0\r
+\r

 # *** FeldmanHashMap properties\r
 FeldmanMapHeadBits=8\r
 FeldmanMapArrayBits=4\r
 # *** FeldmanHashMap properties\r
 FeldmanMapHeadBits=8\r
 FeldmanMapArrayBits=4\r


@@ -253,7 +261,8 @@ PrintGCStateFlag=1
 CuckooInitialSize=1024\r
 CuckooProbesetSize=16\r
 # 0 - use default\r
 CuckooInitialSize=1024\r
 CuckooProbesetSize=16\r
 # 0 - use default\r

-CuckooProbesetThreshold=0 \r
+CuckooProbesetThreshold=0\r
+\r

 # *** FeldmanHashMap properties\r
 FeldmanMapHeadBits=8\r
 FeldmanMapArrayBits=4\r
 # *** FeldmanHashMap properties\r
 FeldmanMapHeadBits=8\r
 FeldmanMapArrayBits=4\r


@@ -269,7 +278,8 @@ PrintGCStateFlag=1
 CuckooInitialSize=1024\r
 CuckooProbesetSize=16\r
 # 0 - use default\r
 CuckooInitialSize=1024\r
 CuckooProbesetSize=16\r
 # 0 - use default\r

-CuckooProbesetThreshold=0 \r
+CuckooProbesetThreshold=0\r
+\r

 # *** FeldmanHashMap properties\r
 FeldmanMapHeadBits=8\r
 FeldmanMapArrayBits=4\r
 # *** FeldmanHashMap properties\r
 FeldmanMapHeadBits=8\r
 FeldmanMapArrayBits=4\r

diff --git a/tests/data/test.conf b/tests/data/test.conf
index 2d35bd012ced14f8d1f75b78109001b2ff16c019..702c6bf84a93b8af0d606b471177fa92a01c9728 100644 (file)
--- a/tests/data/test.conf
+++ b/tests/data/test.conf
@@ -124,7 +124,8 @@ PrintGCStateFlag=1
 CuckooInitialSize=1024\r
 CuckooProbesetSize=16\r
 # 0 - use default\r
 CuckooInitialSize=1024\r
 CuckooProbesetSize=16\r
 # 0 - use default\r

-CuckooProbesetThreshold=0 \r
+CuckooProbesetThreshold=0\r
+\r

 # *** FeldmanHashMap properties\r
 FeldmanMapHeadBits=10\r
 FeldmanMapArrayBits=4\r
 # *** FeldmanHashMap properties\r
 FeldmanMapHeadBits=10\r
 FeldmanMapArrayBits=4\r


@@ -140,7 +141,8 @@ PrintGCStateFlag=1
 CuckooInitialSize=1024\r
 CuckooProbesetSize=16\r
 # 0 - use default\r
 CuckooInitialSize=1024\r
 CuckooProbesetSize=16\r
 # 0 - use default\r

-CuckooProbesetThreshold=0 \r
+CuckooProbesetThreshold=0\r
+\r

 # *** FeldmanHashMap properties\r
 FeldmanMapHeadBits=10\r
 FeldmanMapArrayBits=4\r
 # *** FeldmanHashMap properties\r
 FeldmanMapHeadBits=10\r
 FeldmanMapArrayBits=4\r


@@ -156,7 +158,8 @@ PrintGCStateFlag=1
 CuckooInitialSize=1024\r
 CuckooProbesetSize=16\r
 # 0 - use default\r
 CuckooInitialSize=1024\r
 CuckooProbesetSize=16\r
 # 0 - use default\r

-CuckooProbesetThreshold=0 \r
+CuckooProbesetThreshold=0\r
+\r

 # *** FeldmanHashMap properties\r
 FeldmanMapHeadBits=10\r
 FeldmanMapArrayBits=4\r
 # *** FeldmanHashMap properties\r
 FeldmanMapHeadBits=10\r
 FeldmanMapArrayBits=4\r


@@ -173,7 +176,8 @@ PrintGCStateFlag=1
 CuckooInitialSize=1024\r
 CuckooProbesetSize=16\r
 # 0 - use default\r
 CuckooInitialSize=1024\r
 CuckooProbesetSize=16\r
 # 0 - use default\r

-CuckooProbesetThreshold=0 \r
+CuckooProbesetThreshold=0\r
+\r

 # *** FeldmanHashMap properties\r
 FeldmanMapHeadBits=10\r
 FeldmanMapArrayBits=4\r
 # *** FeldmanHashMap properties\r
 FeldmanMapHeadBits=10\r
 FeldmanMapArrayBits=4\r


@@ -189,7 +193,8 @@ PrintGCStateFlag=1
 CuckooInitialSize=1024\r
 CuckooProbesetSize=16\r
 # 0 - use default\r
 CuckooInitialSize=1024\r
 CuckooProbesetSize=16\r
 # 0 - use default\r

-CuckooProbesetThreshold=0 \r
+CuckooProbesetThreshold=0\r
+\r

 # *** FeldmanHashMap properties\r
 FeldmanMapHeadBits=10\r
 FeldmanMapArrayBits=4\r
 # *** FeldmanHashMap properties\r
 FeldmanMapHeadBits=10\r
 FeldmanMapArrayBits=4\r


@@ -205,7 +210,8 @@ PrintGCStateFlag=1
 CuckooInitialSize=1024\r
 CuckooProbesetSize=16\r
 # 0 - use default\r
 CuckooInitialSize=1024\r
 CuckooProbesetSize=16\r
 # 0 - use default\r

-CuckooProbesetThreshold=0 \r
+CuckooProbesetThreshold=0\r
+\r

 # *** FeldmanHashMap properties\r
 FeldmanMapHeadBits=10\r
 FeldmanMapArrayBits=4\r
 # *** FeldmanHashMap properties\r
 FeldmanMapHeadBits=10\r
 FeldmanMapArrayBits=4\r


@@ -221,7 +227,8 @@ PrintGCStateFlag=1
 CuckooInitialSize=1024\r
 CuckooProbesetSize=16\r
 # 0 - use default\r
 CuckooInitialSize=1024\r
 CuckooProbesetSize=16\r
 # 0 - use default\r

-CuckooProbesetThreshold=0 \r
+CuckooProbesetThreshold=0\r
+\r

 # *** FeldmanHashMap properties\r
 FeldmanMapHeadBits=10\r
 FeldmanMapArrayBits=4\r
 # *** FeldmanHashMap properties\r
 FeldmanMapHeadBits=10\r
 FeldmanMapArrayBits=4\r


@@ -235,7 +242,8 @@ PrintGCStateFlag=1
 CuckooInitialSize=1024\r
 CuckooProbesetSize=16\r
 # 0 - use default\r
 CuckooInitialSize=1024\r
 CuckooProbesetSize=16\r
 # 0 - use default\r

-CuckooProbesetThreshold=0 \r
+CuckooProbesetThreshold=0\r
+\r

 # *** FeldmanHashMap properties\r
 FeldmanMapHeadBits=10\r
 FeldmanMapArrayBits=4\r
 # *** FeldmanHashMap properties\r
 FeldmanMapHeadBits=10\r
 FeldmanMapArrayBits=4\r


@@ -252,7 +260,8 @@ PrintGCStateFlag=1
 CuckooInitialSize=1024\r
 CuckooProbesetSize=16\r
 # 0 - use default\r
 CuckooInitialSize=1024\r
 CuckooProbesetSize=16\r
 # 0 - use default\r

-CuckooProbesetThreshold=0 \r
+CuckooProbesetThreshold=0\r
+\r

 # *** FeldmanHashMap properties\r
 FeldmanMapHeadBits=10\r
 FeldmanMapArrayBits=4\r
 # *** FeldmanHashMap properties\r
 FeldmanMapHeadBits=10\r
 FeldmanMapArrayBits=4\r


@@ -269,7 +278,8 @@ PrintGCStateFlag=1
 CuckooInitialSize=1024\r
 CuckooProbesetSize=16\r
 # 0 - use default\r
 CuckooInitialSize=1024\r
 CuckooProbesetSize=16\r
 # 0 - use default\r

-CuckooProbesetThreshold=0 \r
+CuckooProbesetThreshold=0\r
+\r

 # *** FeldmanHashMap properties\r
 FeldmanMapHeadBits=10\r
 FeldmanMapArrayBits=4\r
 # *** FeldmanHashMap properties\r
 FeldmanMapHeadBits=10\r
 FeldmanMapArrayBits=4\r

diff --git a/tests/unit/map2/map_type_cuckoo.h b/tests/unit/map2/map_type_cuckoo.h
index 312c64f940507afd8163bae78a4e19bb53f12de1..a1c3cbdaf8bc0b3251436515e3ed3c0664ea3a5a 100644 (file)
--- a/tests/unit/map2/map_type_cuckoo.h
+++ b/tests/unit/map2/map_type_cuckoo.h
@@ -18,7 +18,8 @@ namespace map2 {
     public:
         template <typename Config>
         CuckooMap( Config const& cfg )
     public:
         template <typename Config>
         CuckooMap( Config const& cfg )

-            : base_class( 
+            : base_class(
+

                 cfg.c_nCuckooInitialSize,
                 static_cast<unsigned int>( cfg.c_nCuckooProbesetSize ),
                 static_cast<unsigned int>( cfg.c_nCuckooProbesetThreshold )
                 cfg.c_nCuckooInitialSize,
                 static_cast<unsigned int>( cfg.c_nCuckooProbesetSize ),
                 static_cast<unsigned int>( cfg.c_nCuckooProbesetThreshold )

diff --git a/tests/unit/queue/bounded_queue_fulness.cpp b/tests/unit/queue/bounded_queue_fulness.cpp
index 2d681f77f7f00a31910d804d48587f6e987a8f4d..6f63dd5a383930de15f71ddfa4c9c61346115d7b 100644 (file)
--- a/tests/unit/queue/bounded_queue_fulness.cpp
+++ b/tests/unit/queue/bounded_queue_fulness.cpp
@@ -109,7 +109,8 @@ namespace queue {
             for ( size_t i = 0; i < nSize; ++i )
                 testQueue.push( i );
 
             for ( size_t i = 0; i < nSize; ++i )
                 testQueue.push( i );
 

-            CPPUNIT_MSG( "   Thread count=" << s_nThreadCount << ", push/pop pairs=" << s_nPassCount 
+            CPPUNIT_MSG( "   Thread count=" << s_nThreadCount << ", push/pop pairs=" << s_nPassCount
+

                          << ", queue capacity=" << testQueue.capacity() << " ...");
             pool.run();
 
                          << ", queue capacity=" << testQueue.capacity() << " ...");
             pool.run();
 

diff --git a/tests/unit/set2/set_defs.h b/tests/unit/set2/set_defs.h
index addee6e13405743827a9f236d815dddf3b707b6e..76d91d2beab3ce2148e023aa534a336227a837de 100644 (file)
--- a/tests/unit/set2/set_defs.h
+++ b/tests/unit/set2/set_defs.h
@@ -720,7 +720,8 @@
     CDSUNIT_TEST_FeldmanHashSet_stdhash_RCU_signal
 
 
     CDSUNIT_TEST_FeldmanHashSet_stdhash_RCU_signal
 
 

-// CityHash -only for 64bit 
+// CityHash -only for 64bit
+

 #undef CDSUNIT_DECLARE_FeldmanHashSet_city
 #undef CDSUNIT_DECLARE_FeldmanHashSet_city_RCU_signal
 #undef CDSUNIT_TEST_FeldmanHashSet_city
 #undef CDSUNIT_DECLARE_FeldmanHashSet_city
 #undef CDSUNIT_DECLARE_FeldmanHashSet_city_RCU_signal
 #undef CDSUNIT_TEST_FeldmanHashSet_city


@@ -808,7 +809,8 @@
 #endif // CDS_BUILD_BITS == 64
 
 
 #endif // CDS_BUILD_BITS == 64
 
 

-// All 
+// All
+

 #define CDSUNIT_DECLARE_FeldmanHashSet \
     CDSUNIT_DECLARE_FeldmanHashSet_fixed \
     CDSUNIT_DECLARE_FeldmanHashSet_stdhash \
 #define CDSUNIT_DECLARE_FeldmanHashSet \
     CDSUNIT_DECLARE_FeldmanHashSet_fixed \
     CDSUNIT_DECLARE_FeldmanHashSet_stdhash \

diff --git a/tests/unit/set2/set_type_cuckoo.h b/tests/unit/set2/set_type_cuckoo.h
index 31010b9afd729cc41f9fabaaf1aaddff51b1560d..bf7d2120508078d5f6618b3fa9cc21510cdb62a0 100644 (file)
--- a/tests/unit/set2/set_type_cuckoo.h
+++ b/tests/unit/set2/set_type_cuckoo.h
@@ -19,7 +19,8 @@ namespace set2 {
     public:
         template <typename Config>
         CuckooSet( Config const& cfg )
     public:
         template <typename Config>
         CuckooSet( Config const& cfg )

-            : cuckoo_base_class( 
+            : cuckoo_base_class(
+

                 cfg.c_nCuckooInitialSize,
                 static_cast<unsigned int>( cfg.c_nCuckooProbesetSize ),
                 static_cast<unsigned int>( cfg.c_nCuckooProbesetThreshold )
                 cfg.c_nCuckooInitialSize,
                 static_cast<unsigned int>( cfg.c_nCuckooProbesetSize ),
                 static_cast<unsigned int>( cfg.c_nCuckooProbesetThreshold )