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

Print diagnostic information to avoid boost cryptic errors

Browse Source
This commit is contained in:
Michael Krasnyk 2017-05-05 08:30:36 +02:00 committed by Patrick Niklaus
parent e92967167f
commit 669ac058b8
1 changed files with 33 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
include/updater/csv_file_parser.hpp
View File

@ -10,6 +10,7 @@
#include <tbb/parallel_for.h> #include <tbb/parallel_for.h>
#include <tbb/spin_mutex.h> #include <tbb/spin_mutex.h>
#include <boost/exception/diagnostic_information.hpp>
#include <boost/iostreams/device/mapped_file.hpp> #include <boost/iostreams/device/mapped_file.hpp>
#include <boost/spirit/include/phoenix.hpp> #include <boost/spirit/include/phoenix.hpp>
#include <boost/spirit/include/qi.hpp> #include <boost/spirit/include/qi.hpp>
@ -92,32 +93,41 @@ template <typename Key, typename Value> struct CSVFilesParser
// Parse a single CSV file and return result as a vector<Key, Value> // Parse a single CSV file and return result as a vector<Key, Value>
auto ParseCSVFile(const std::string &filename, std::size_t file_id) const auto ParseCSVFile(const std::string &filename, std::size_t file_id) const
{ {
boost::iostreams::mapped_file_source mmap(filename); try
auto first = mmap.begin(), last = mmap.end();
BOOST_ASSERT(file_id <= std::numeric_limits<std::uint8_t>::max());
ValueRule value_source =
value_rule[qi::_val = qi::_1, boost::phoenix::bind(&Value::source, qi::_val) = file_id];
qi::rule<Iterator, std::pair<Key, Value>()> csv_line =
(key_rule >> ',' >> value_source) >> -(',' >> *(qi::char_ - qi::eol));
std::vector<std::pair<Key, Value>> result;
const auto ok = qi::parse(first, last, -(csv_line % qi::eol) >> *qi::eol, result);
if (!ok || first != last)
{ {
auto begin_of_line = first - 1; boost::iostreams::mapped_file_source mmap(filename);
while (begin_of_line >= mmap.begin() && *begin_of_line != '\n') auto first = mmap.begin(), last = mmap.end();
--begin_of_line;
auto line_number = std::count(mmap.begin(), first, '\n') + 1; BOOST_ASSERT(file_id <= std::numeric_limits<std::uint8_t>::max());
const auto message = boost::format("CSV file %1% malformed on line %2%: %3%") % ValueRule value_source =
filename % std::to_string(line_number) % value_rule[qi::_val = qi::_1, boost::phoenix::bind(&Value::source, qi::_val) = file_id];
std::string(begin_of_line + 1, std::find(first, last, '\n')); qi::rule<Iterator, std::pair<Key, Value>()> csv_line =
(key_rule >> ',' >> value_source) >> -(',' >> *(qi::char_ - qi::eol));
std::vector<std::pair<Key, Value>> result;
const auto ok = qi::parse(first, last, -(csv_line % qi::eol) >> *qi::eol, result);
if (!ok || first != last)
{
auto begin_of_line = first - 1;
while (begin_of_line >= mmap.begin() && *begin_of_line != '\n')
--begin_of_line;
auto line_number = std::count(mmap.begin(), first, '\n') + 1;
const auto message = boost::format("CSV file %1% malformed on line %2%: %3%") %
filename % std::to_string(line_number) %
std::string(begin_of_line + 1, std::find(first, last, '\n'));
throw util::exception(message.str() + SOURCE_REF);
}
util::Log() << "Loaded " << filename << " with " << result.size() << "values";
return std::move(result);
}
catch (const boost::exception& e)
{
const auto message = boost::format("exception in loading %1%:\n %2%") %
filename % boost::diagnostic_information(e);
throw util::exception(message.str() + SOURCE_REF); throw util::exception(message.str() + SOURCE_REF);
} }
util::Log() << "Loaded " << filename << " with " << result.size() << "values";
return std::move(result);
} }
const std::size_t start_index; const std::size_t start_index;