From 9e9b1fd0c517e649e5cb19ae4715b518ce5a74f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Gra=CC=88tzer?= Date: Mon, 27 Feb 2017 13:16:40 +0100 Subject: [PATCH] Stuff --- arangod/Pregel/Algos/PageRank.cpp | 2 +- arangod/Pregel/Worker.cpp | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/arangod/Pregel/Algos/PageRank.cpp b/arangod/Pregel/Algos/PageRank.cpp index 3537031f04..7451be6c95 100644 --- a/arangod/Pregel/Algos/PageRank.cpp +++ b/arangod/Pregel/Algos/PageRank.cpp @@ -65,7 +65,7 @@ struct PRComputation : public VertexComputation { *ptr = 0.85 * sum + 0.15 / context()->vertexCount(); } float diff = fabs(copy - *ptr); - aggregate(kConvergence, diff); + aggregate(kConvergence, diff); RangeIterator> edges = getEdges(); float val = *ptr / edges.size(); diff --git a/arangod/Pregel/Worker.cpp b/arangod/Pregel/Worker.cpp index a30a254531..ec0cb5047e 100644 --- a/arangod/Pregel/Worker.cpp +++ b/arangod/Pregel/Worker.cpp @@ -353,6 +353,7 @@ void Worker::_startProcessing() { i++; } while (start != total); TRI_ASSERT(_runningThreads == i); + LOG_TOPIC(INFO, Logger::PREGEL) << "Using " << i << " Threads"; } template @@ -378,8 +379,10 @@ bool Worker::_processVertices( if (_config.asynchronousMode()) { outCache->sendToNextGSS(_requestedNextGSS); outCache->setLocalCacheNextGSS(_writeCacheNextGSS); + TRI_ASSERT(outCache->sendCountNextGSS() == 0); } - + TRI_ASSERT(outCache->sendCount() == 0); + AggregatorHandler workerAggregator(_algorithm.get()); // TODO look if we can avoid instantiating this std::unique_ptr> vertexComputation(