Changeset c921712

Timestamp:

Sep 27, 2019, 11:07:56 AM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

c3a2007

Parents:

1e24d13

Message:

Fixed support for setting number of starting nodes

Location:

doc/theses/thierry_delisle_PhD/code

Files:

• relaxed_list.cpp (modified) (7 diffs)
• relaxed_list.hpp (modified) (2 diffs)

doc/theses/thierry_delisle_PhD/code/relaxed_list.cpp

@@ -2 +2 @@
 
 #include <array>
+#include <iomanip>
 #include <iostream>
 #include <locale>
@@ -104 +105 @@
 
         // Prep nodes
-        std::cout << "Initializing" << std::endl;
+        std::cout << "Initializing ";
+        size_t nnodes  = 0;
+        size_t npushed = 0;
         NodeArray all_nodes[nthread];
         for(auto & nodes : all_nodes) {
@@ -110 +113 @@
                 for(auto & node : nodes.array) {
                         auto r = rand.next() % 100;
-                        if(r < fill)
+                        if(r < fill) {
                                 node = new Node(rand.next() % 100);
-                        else
+                                nnodes++;
+                        } else {
                                 node = nullptr;
+                        }
                 }
 
@@ -121 +126 @@
                                 global.crc_in += node->value;
                                 list.push(node);
+                                npushed++;
                                 nodes.array[idx] = nullptr;
                         }
                 }
         }
+
+        std::cout << nnodes << " nodes " << fill << "% (" << npushed << " pushed)" << std::endl;
 
         enable_stats = true;
@@ -179 +187 @@
                         break;
                 }
-                std::cout << "\r" << durr.count() << "/" << duration;
+                std::cout << "\r" << std::setprecision(4) << durr.count();
                 std::cout.flush();
         }
@@ -187 +195 @@
         duration_t durr = after - before;
         duration = durr.count();
-        std::cout << "\nClosing down" << std::endl;
+        std::cout << "\rClosing down" << std::endl;
 
         for(auto t : threads) {
@@ -241 +249 @@
         {
         case 5:
-                nqueues = std::stoul(argv[4]);
+                fill = std::stoul(argv[4]);
                 [[fallthrough]];
         case 4:

doc/theses/thierry_delisle_PhD/code/relaxed_list.hpp

@@ -74 +74 @@
                 #ifndef NO_STATS
                         std::cout << "Difference   : "
-                                << size_t(double(intrusive_queue_t::stat::dif.value) / intrusive_queue_t::stat::dif.num  ) << " avg\t"
+                                << ssize_t(double(intrusive_queue_t::stat::dif.value) / intrusive_queue_t::stat::dif.num  ) << " avg\t"
                                 << intrusive_queue_t::stat::dif.max << "max" << std::endl;
                 #endif
@@ -200 +200 @@
                                 stat::dif.value+= s.diff;
                                 stat::dif.num  ++;
-                                stat::dif.max  = std::max(stat::dif.max, s.diff);
+                                stat::dif.max  = std::abs(stat::dif.max) > std::abs(s.diff) ? stat::dif.max : s.diff;
                         #endif
                 }