[TSan] Fixed memory order

[libcds.git] / cds / container / details / skip_list_base.h

diff --git a/cds/container/details/skip_list_base.h b/cds/container/details/skip_list_base.h
index d29e8338e1b602d2d69c8f3b1b99b9d05565cf5a..5a343afe7ffc120cd3a5bab752c39f335f92757f 100644 (file)
--- a/cds/container/details/skip_list_base.h
+++ b/cds/container/details/skip_list_base.h
@@ -1,11 +1,11 @@
 /*
     This file is a part of libcds - Concurrent Data Structures library
 
-    (C) Copyright Maxim Khizhinsky (libcds.dev@gmail.com) 2006-2016
+    (C) Copyright Maxim Khizhinsky (libcds.dev@gmail.com) 2006-2017
 
     Source code repo: http://github.com/khizmax/libcds/
     Download: http://sourceforge.net/projects/libcds/files/
-    
+
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions are met:
 
@@ -25,7 +25,7 @@
     SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
     OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-    OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.     
+    OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 #ifndef CDSLIB_CONTAINER_DETAILS_SKIP_LIST_BASE_H
@@ -170,23 +170,30 @@ namespace cds { namespace container {
                 {
                     return c_nNodeSize + (nHeight - 1) * c_nTowerItemSize;
                 }
+
                 static unsigned char * alloc_space( unsigned int nHeight )
                 {
+                    unsigned char * pMem;
+                    size_t const sz = node_size( nHeight );
+
                     if ( nHeight > 1 ) {
-                        unsigned char * pMem = tower_allocator_type().allocate( node_size(nHeight) );
+                        pMem = tower_allocator_type().allocate( sz );
 
                         // check proper alignments
                         assert( (((uintptr_t) pMem) & (alignof(node_type) - 1)) == 0 );
                         assert( (((uintptr_t) (pMem + c_nNodeSize)) & (alignof(node_tower_item) - 1)) == 0 );
                         return pMem;
                     }
+                    else
+                        pMem = reinterpret_cast<unsigned char *>( node_allocator_type().allocate( 1 ) );
 
-                    return reinterpret_cast<unsigned char *>( node_allocator_type().allocate(1));
+                    return pMem;
                 }
 
                 static void free_space( unsigned char * p, unsigned int nHeight )
                 {
                     assert( p != nullptr );
+
                     if ( nHeight == 1 )
                         node_allocator_type().deallocate( reinterpret_cast<node_type *>(p), 1 );
                     else