diff --git a/brion/plugin/spikeReportFile.cpp b/brion/plugin/spikeReportFile.cpp index a676831..8d8308e 100644 --- a/brion/plugin/spikeReportFile.cpp +++ b/brion/plugin/spikeReportFile.cpp @@ -181,11 +181,6 @@ bool SpikeReportFile::fillReportMap( Spikes& spikes, const size_t maxLines ) const size_t first = spikeArray.size( ); spikeArray.resize( first + linesRead ); - // OpenMP doesn't allow escaping a parallel section with an exception. - // These variables are used to annotate the first parse error. - std::string errorString; - int64_t errorIndex = int64_t(linesRead); - // Parsing strings #pragma omp parallel for for( int64_t i = 0; i < int64_t(linesRead); ++i ) @@ -198,18 +193,10 @@ bool SpikeReportFile::fillReportMap( Spikes& spikes, const size_t maxLines ) // Instead of telling the line number, the full line will be // printed. The error should be easy to spot in the file as // it will be found at the first occurence in the file. - #pragma omp critical - if( errorIndex > i ) - { - errorString = "Reading spike times file: " + _filename + - ", line: " + lines[i]; - errorIndex = i; - } + LBERROR << "Error reading spike times file: " << _filename + << ", line: " << lines[i] << std::endl; } } - - if( !errorString.empty( )) - LBTHROW( std::runtime_error( errorString )); } #else std::string line; diff --git a/doc/Changelog.md b/doc/Changelog.md index 6896ac4..a66cbd3 100644 --- a/doc/Changelog.md +++ b/doc/Changelog.md @@ -1,7 +1,10 @@ Changelog {#Changelog} ========= - +# git master {#master) + +* [28](https://github.com/BlueBrain/Brion/pull/28): + SpikeReport continues parsing files that have broken lines # Release 1.6.0 (9-Nov-2015)