Merge pull request #20 from sivetic/master

Split PBF Parser into a single Read and a single Parse thread to increase parsing speed.

DataStructures/ConcurrentQueue.h

@@ -0,0 +1,103 @@
+/*
+    open source routing machine
+    Copyright (C) Dennis Luxen, others 2010
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU AFFERO General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+or see http://www.gnu.org/licenses/agpl.txt.
+ */
+
+#ifndef CONCURRENTQUEUE_H_INCLUDED
+#define CONCURRENTQUEUE_H_INCLUDED
+
+#include "typedefs.h"
+
+/* 
+   Concurrent Queue written by Anthony Williams: 
+   http://www.justsoftwaresolutions.co.uk/threading/implementing-a-thread-safe-queue-using-condition-variables.html  
+*/
+template<typename Data>
+class concurrent_queue
+{
+private:
+    std::queue<Data> internal_queue;
+    mutable boost::mutex queue_mutex;
+    mutable boost::mutex queue_full_mutex;
+    boost::condition_variable queue_cv;
+    boost::condition_variable queue_full_cv;
+    const size_t max_queue_size;
+
+    bool size_exceeded() const {
+        boost::mutex::scoped_lock lock(queue_mutex);
+        return internal_queue.size() >= max_queue_size;
+    }
+
+public:
+    concurrent_queue(const size_t max_size) 
+        : max_queue_size(max_size) {
+    }
+
+    void push(Data const& data)
+    {
+        if (size_exceeded()) {
+            boost::mutex::scoped_lock qf_lock(queue_full_mutex);
+            queue_full_cv.wait(qf_lock);
+        }
+
+        boost::mutex::scoped_lock lock(queue_mutex);
+        internal_queue.push(data);
+        lock.unlock();
+        queue_cv.notify_one();
+    }
+
+    bool empty() const
+    {
+        boost::mutex::scoped_lock lock(queue_mutex);
+        return internal_queue.empty();
+    }
+
+    bool try_pop(Data& popped_value)
+    {
+        boost::mutex::scoped_lock lock(queue_mutex);
+        if(internal_queue.empty())
+        {
+            return false;
+        }
+        
+        popped_value=internal_queue.front();
+        internal_queue.pop();
+        queue_full_cv.notify_one();
+        return true;
+    }
+
+    void wait_and_pop(Data& popped_value)
+    {
+        boost::mutex::scoped_lock lock(queue_mutex);
+        while(internal_queue.empty())
+        {
+            queue_cv.wait(lock);
+        }
+        
+        popped_value=internal_queue.front();
+        internal_queue.pop();
+        queue_full_cv.notify_one();
+    }
+
+    int size() const {
+        boost::mutex::scoped_lock lock(queue_mutex);
+        return static_cast<int>(internal_queue.size());
+    }
+};
+
+#endif //#ifndef CONCURRENTQUEUE_H_INCLUDED

DataStructures/PBFParser.h

@@ -30,7 +30,7 @@ or see http://www.gnu.org/licenses/agpl.txt.
 #include "../typedefs.h"
 #include "HashTable.h"
 #include "ExtractorStructs.h"
-
+#include "ConcurrentQueue.h"
 
 class PBFParser : public BaseParser<_Node, _RawRestrictionContainer, _Way> {
 
@@ -61,9 +61,9 @@ class PBFParser : public BaseParser<_Node, _RawRestrictionContainer, _Way> {
     };
 
 public:
-    PBFParser(const char * fileName) {
+    PBFParser(const char * fileName) 
+        : threadDataQueue( new concurrent_queue<_ThreadData*>(25) ) { /* Max 25 items in queue */
         GOOGLE_PROTOBUF_VERIFY_VERSION;
-        omp_set_num_threads(1);
         input.open(fileName, std::ios::in | std::ios::binary);
 
         if (!input) {
@@ -86,10 +86,12 @@ public:
         if(input.is_open())
             input.close();
 
-        unsigned maxThreads = omp_get_max_threads();
+        // Clean up any leftover ThreadData objects in the queue
-        for ( unsigned threadNum = 0; threadNum < maxThreads; ++threadNum ) {
+        _ThreadData* td;
-            delete threadDataVector[threadNum];
+        while (threadDataQueue->try_pop(td)) {
+            delete td;
         }
+        delete threadDataQueue;
 
         google::protobuf::ShutdownProtobufLibrary();
 
@@ -100,12 +102,6 @@ public:
     }
 
     bool Init() {
-        /** Init Vector with ThreadData Objects */
-        unsigned maxThreads = omp_get_max_threads();
-        for ( unsigned threadNum = 0; threadNum < maxThreads; ++threadNum ) {
-            threadDataVector.push_back( new _ThreadData( ) );
-        }
-
         _ThreadData initData;
         /** read Header */
         if(!readPBFBlobHeader(input, &initData)) {
@@ -137,19 +133,29 @@ public:
         return true;
     }
 
-    bool Parse() {
+    void ReadData() {
-#pragma omp parallel
-        {
-            _ThreadData * threadData = threadDataVector[omp_get_thread_num()];
-            //parse through all Blocks
         bool keepRunning = true;
-            //        while(readNextBlock(input)) {
+        do {
-            do{
+            _ThreadData *threadData = new _ThreadData();
-#pragma omp critical
-                {
             keepRunning = readNextBlock(input, threadData);
+
+            if (keepRunning)
+                threadDataQueue->push(threadData);
+            else
+                threadDataQueue->push(NULL); // No more data to read, parse stops when NULL encountered
+        } while(keepRunning);
     }
-                if(keepRunning) {
+
+    void ParseData() {
+        while (1) {
+            _ThreadData *threadData;
+            threadDataQueue->wait_and_pop(threadData);
+            if (threadData == NULL) {
+                cout << "Parse Data Thread Finished" << endl;
+                threadDataQueue->push(NULL); // Signal end of data for other threads
+                break;
+            }
+
             loadBlock(threadData);
             for(int i = 0; i < threadData->PBFprimitiveBlock.primitivegroup_size(); i++) {
                 threadData->currentGroupID = i;
@@ -164,9 +170,21 @@ public:
                 if(threadData->entityTypeIndicator == TypeDenseNode)
                     parseDenseNode(threadData);
             }
+
+            delete threadData;
+            threadData = NULL;
         }
-            }while(keepRunning);
     }
+
+    bool Parse() {
+        // Start the read and parse threads
+        boost::thread readThread(boost::bind(&PBFParser::ReadData, this));
+        boost::thread parseThread(boost::bind(&PBFParser::ParseData, this));
+        
+        // Wait for the threads to finish
+        readThread.join();
+        parseThread.join();
+
         return true;
     }
 
@@ -200,28 +218,19 @@ private:
                 keyVals.Add(key, value);
                 denseTagIndex += 2;
             }
-#pragma omp critical
-            {
             if(!(*addressCallback)(n, keyVals))
                 std::cerr << "[PBFParser] adress not parsed" << std::endl;
-            }
             
-#pragma omp critical
-            {
             if(!(*nodeCallback)(n))
                 std::cerr << "[PBFParser] dense node not parsed" << std::endl;
         }
     }
-    }
 
     void parseNode(_ThreadData * threadData) {
         _Node n;
-#pragma omp critical
-        {
         if(!(*nodeCallback)(n))
             std::cerr << "[PBFParser] simple node not parsed" << std::endl;
     }
-    }
 
     void parseRelation(_ThreadData * threadData) {
         const OSMPBF::PrimitiveGroup& group = threadData->PBFprimitiveBlock.primitivegroup( threadData->currentGroupID );
@@ -291,14 +300,11 @@ private:
 //                    cout << "node " << currentRestriction.viaNode;
 //                    cout << " to " << currentRestriction.to << endl;
 //                }
-#pragma omp critical
-                {
                 if(!(*restrictionCallback)(currentRestrictionContainer))
                     std::cerr << "[PBFParser] relation not parsed" << std::endl;
             }
         }
     }
-    }
 
     void parseWay(_ThreadData * threadData) {
         if( threadData->PBFprimitiveBlock.primitivegroup( threadData->currentGroupID ).ways_size() > 0) {
@@ -317,18 +323,15 @@ private:
                     const std::string val = threadData->PBFprimitiveBlock.stringtable().s(inputWay.vals(i));
                     w.keyVals.Add(key, val);
                 }
-#pragma omp critical
+
-                {
                 if(!(*wayCallback)(w)) {
                     std::cerr << "[PBFParser] way not parsed" << std::endl;
                 }
             }
         }
     }
-    }
 
     void loadGroup(_ThreadData * threadData) {
-#pragma omp atomic
         groupCount++;
 
         const OSMPBF::PrimitiveGroup& group = threadData->PBFprimitiveBlock.primitivegroup( threadData->currentGroupID );
@@ -350,7 +353,6 @@ private:
     }
 
     void loadBlock(_ThreadData * threadData) {
-#pragma omp critical
         blockCount++;
         threadData->currentGroupID = 0;
         threadData->currentEntityID = 0;
@@ -522,9 +524,8 @@ private:
     /* the input stream to parse */
     std::fstream input;
 
-    /* ThreadData Array */
+    /* ThreadData Queue */
-    std::vector < _ThreadData* > threadDataVector;
+    concurrent_queue < _ThreadData* >* threadDataQueue;
-
 };
 
 #endif /* PBFPARSER_H_ */

vcprojects/extractor.vcproj

@@ -250,6 +250,10 @@
 					RelativePath="..\DataStructures\BinaryHeap.h"
 					>
 				</File>
+				<File
+					RelativePath="..\DataStructures\ConcurrentQueue.h"
+					>
+				</File>
 				<File
 					RelativePath="..\DataStructures\DynamicGraph.h"
 					>