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

refactor a bit for better readability

Browse Source
This commit is contained in:
Dennis Luxen 2014-03-17 15:46:13 +01:00
parent 5adfe2d46b
commit 121dcca7e3
1 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Tools/simpleclient.cpp
View File

@ -40,15 +40,17 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <sstream> #include <sstream>
//Dude, real recursions on the OS stack? You must be brave... //Dude, real recursions on the OS stack? You must be brave...
void print_tree(boost::property_tree::ptree const& pt, const unsigned recursion_depth) void print_tree(boost::property_tree::ptree const& property_tree, const unsigned recursion_depth)
{ {
boost::property_tree::ptree::const_iterator end = pt.end(); boost::property_tree::ptree::const_iterator end = property_tree.end();
for (boost::property_tree::ptree::const_iterator it = pt.begin(); it != end; ++it) { for (boost::property_tree::ptree::const_iterator tree_iterator = property_tree.begin(); tree_iterator != end; ++tree_iterator)
for(unsigned i = 0; i < recursion_depth; ++i) { {
for (unsigned current_recursion = 0; current_recursion < recursion_depth; ++current_recursion)
{
std::cout << " " << std::flush; std::cout << " " << std::flush;
} }
std::cout << it->first << ": " << it->second.get_value<std::string>() << std::endl; std::cout << tree_iterator->first << ": " << tree_iterator->second.get_value<std::string>() << std::endl;
print_tree(it->second, recursion_depth+1); print_tree(tree_iterator->second, recursion_depth+1);
} }
} }
@ -57,7 +59,7 @@ int main (int argc, const char * argv[]) {
LogPolicy::GetInstance().Unmute(); LogPolicy::GetInstance().Unmute();
try { try {
std::string ip_address; std::string ip_address;
int ip_port, requested_num_threads; int ip_port, requested_thread_num;
bool use_shared_memory = false; bool use_shared_memory = false;
ServerPaths server_paths; ServerPaths server_paths;
if( !GenerateServerProgramOptions( if( !GenerateServerProgramOptions(
@ -66,7 +68,7 @@ int main (int argc, const char * argv[]) {
server_paths, server_paths,
ip_address, ip_address,
ip_port, ip_port,
requested_num_threads, requested_thread_num,
use_shared_memory use_shared_memory
) )
) { ) {
@ -103,19 +105,20 @@ int main (int argc, const char * argv[]) {
//attention: super-inefficient hack below: //attention: super-inefficient hack below:
std::stringstream ss; std::stringstream my_stream;
BOOST_FOREACH(const std::string & line, osrm_reply.content) { BOOST_FOREACH(const std::string & line, osrm_reply.content)
{
std::cout << line; std::cout << line;
ss << line; my_stream << line;
} }
std::cout << std::endl; std::cout << std::endl;
boost::property_tree::ptree pt; boost::property_tree::ptree property_tree;
boost::property_tree::read_json(ss, pt); boost::property_tree::read_json(my_stream, property_tree);
print_tree(pt, 0); print_tree(property_tree, 0);
} catch (std::exception & e) { } catch (std::exception & current_exception) {
SimpleLogger().Write(logWARNING) << "caught exception: " << e.what(); SimpleLogger().Write(logWARNING) << "caught exception: " << current_exception.what();
return -1; return -1;
} }
return 0; return 0;