Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Merge branch 'master' of https://github.com/DennisOSRM/Project-OSRM

Browse Source 
Conflicts:
	createHierarchy.cpp
This commit is contained in:
DennisOSRM 2011-11-26 12:38:42 +01:00
commit 295164302a
5 changed files with 50 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Util/OpenMPReplacement.h Normal file
View File

@ -0,0 +1,25 @@
/*
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.
*/
const int omp_get_num_procs() { return 1; }
const int omp_get_max_threads() { return 1; }
const int omp_get_thread_num() { return 0; }
const int omp_set_num_threads(int i) {}

6
createHierarchy.cpp
View File

@ -37,12 +37,16 @@ or see http://www.gnu.org/licenses/agpl.txt.
#include <vector>
#ifdef _OPENMP
#include <omp.h>
#include <omp.h>
#else
<<<<<<< HEAD
int omp_get_num_procs() { return 1; }
int omp_get_max_threads() { return 1; }
int omp_get_thread_num() { return 0; }
void omp_set_num_threads(int i) {}
=======
#include "Util/OpenMPReplacement.h"
>>>>>>> b5a1bf6a848b68bace62814497de44ce6c3fab5d
#endif
#include "typedefs.h"

7
extractor.cpp
View File

@ -17,6 +17,7 @@ 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.
*/
#ifdef STXXL_VERBOSE_LEVEL
#undef STXXL_VERBOSE_LEVEL
#endif
@ -42,6 +43,12 @@ or see http://www.gnu.org/licenses/agpl.txt.
#include <unistd.h>
#include <stxxl.h>
#ifdef _OPENMP
#include <omp.h>
#else
#include "Util/OpenMPReplacement.h"
#endif
#include "typedefs.h"
#include "DataStructures/InputReaderFactory.h"
#include "DataStructures/ExtractorCallBacks.h"

18
routed.cpp
View File

@ -21,25 +21,23 @@ or see http://www.gnu.org/licenses/agpl.txt.
#include <iostream>
#include <signal.h>
#ifdef _OPENMP
#include <omp.h>
#else
int omp_get_num_procs() { return 1; }
int omp_get_max_threads() { return 1; }
int omp_get_thread_num() { return 0; }
#endif
#include <boost/thread.hpp>
#include <boost/bind.hpp>
#ifdef _OPENMP
#include <omp.h>
#else
#include "Util/OpenMPReplacement.h"
#endif
#include "Server/ServerConfiguration.h"
#include "Server/ServerFactory.h"
#include "Plugins/ObjectForPluginStruct.h"
#include "Plugins/HelloWorldPlugin.h"
#include "Plugins/LocatePlugin.h"
#include "Plugins/NearestPlugin.h"
#include "Plugins/ObjectForPluginStruct.h"
#include "Plugins/RoutePlugin.h"
#include "Plugins/ViaRoutePlugin.h"
#include "Util/InputFileUtil.h"

10
server.ini
View File

@ -2,8 +2,8 @@ Threads = 8
IP = 0.0.0.0
Port = 5000
hsgrData=/opt/osm/berlin.osrm.hsgr
nodesData=/opt/osm/berlin.osrm.nodes
ramIndex=/opt/osm/berlin.osrm.ramIndex
fileIndex=/opt/osm/berlin.osrm.fileIndex
namesData=/opt/osm/berlin.osrm.names
hsgrData=/opt/osm/germany.osrm.hsgr
nodesData=/opt/osm/germany.osrm.nodes
ramIndex=/opt/osm/germany.osrm.ramIndex
fileIndex=/opt/osm/germany.osrm.fileIndex
namesData=/opt/osm/germany.osrm.names