Changes in doc/theses/thierry_delisle_PhD/code/snzi.hpp [8c60d59:f0c3120]

File:

• doc/theses/thierry_delisle_PhD/code/snzi.hpp (modified) (4 diffs)

doc/theses/thierry_delisle_PhD/code/snzi.hpp

@@ -14 +14 @@
 
         void arrive(int idx) {
+                idx >>= 2;
                 idx %= mask;
                 nodes[idx].arrive();
@@ -19 +20 @@
 
         void depart(int idx) {
+                idx >>= 2;
                 idx %= mask;
                 nodes[idx].depart();
@@ -82 +84 @@
                                 if( x.cnt == val_t::Half ) {
                                         /* paranoid */ assert(parent);
-                                        parent->arrive();
+                                        if(undoArr == 2) {
+                                                undoArr--;
+                                        } else {
+                                                parent->arrive();
+                                        }
                                         if( !value.cas(x, 1, x.ver) ) {
                                                 undoArr = undoArr + 1;
@@ -151 +157 @@
 {
         int width = std::pow(base, depth);
-        std::cout << "SNZI: " << depth << "x" << width << "(" << mask - 1 << ")" << std::endl;
+        std::cout << "SNZI: " << depth << "x" << width << "(" << mask - 1 << ") " << (sizeof(snzi_t::node) * (root + 1)) << " bytes" << std::endl;
         for(int i = 0; i < root; i++) {
-                nodes[i].parent = &nodes[(i / base) + width ];
+                std::cout << i << " -> " << (i / base) + width << std::endl;
+                nodes[i].parent = &nodes[(i / base) + width];
         }
 }