From e7c71a77293533563f2330085920b0bed9d7435e Mon Sep 17 00:00:00 2001 From: Debolina Ghatuary Date: Mon, 19 Apr 2021 19:36:55 +0530 Subject: [PATCH 1/3] message Signed-off-by: Debolina Ghatuary --- .../src/spatialtiledlocaldomaincontroller.cpp | 48 ++++++++++++------- 1 file changed, 32 insertions(+), 16 deletions(-) diff --git a/Source/moja.flint/src/spatialtiledlocaldomaincontroller.cpp b/Source/moja.flint/src/spatialtiledlocaldomaincontroller.cpp index 6ac1ca7..78fbcb5 100644 --- a/Source/moja.flint/src/spatialtiledlocaldomaincontroller.cpp +++ b/Source/moja.flint/src/spatialtiledlocaldomaincontroller.cpp @@ -792,25 +792,27 @@ bool SpatialTiledLocalDomainController::runCellSpinUp(std::shared_ptr_unitsProcessed++; return true; } catch (const flint::SimulationError& e) { - std::string details = *(boost::get_error_info
(e)); - std::string libraryName = *(boost::get_error_info(e)); - std::string moduleName = *(boost::get_error_info(e)); - const int* errorCode = boost::get_error_info(e); - _spatiallocationinfo->_errorCode = *errorCode; - _spatiallocationinfo->_library = libraryName; - _spatiallocationinfo->_module = moduleName; - _spatiallocationinfo->_message = details; + // std::string details = *(boost::get_error_info
(e)); + // std::string libraryName = *(boost::get_error_info(e)); + // std::string moduleName = *(boost::get_error_info(e)); + // const int* errorCode = boost::get_error_info(e); + //_spatiallocationinfo->_errorCode = *errorCode; + //_spatiallocationinfo->_library = libraryName; + //_spatiallocationinfo->_module = moduleName; + //_spatiallocationinfo->_message = details; + std::string details = _handleFLINTException(e); // Template function call _spinupNotificationCenter.postNotification(moja::signals::Error, details); return true; } catch (const flint::LocalDomainError& e) { - std::string details = *(boost::get_error_info
(e)); - std::string libraryName = *(boost::get_error_info(e)); - std::string moduleName = *(boost::get_error_info(e)); - const int* errorCode = boost::get_error_info(e); - _spatiallocationinfo->_errorCode = *errorCode; - _spatiallocationinfo->_library = libraryName; - _spatiallocationinfo->_module = moduleName; - _spatiallocationinfo->_message = details; + // std::string details = *(boost::get_error_info
(e)); + // std::string libraryName = *(boost::get_error_info(e)); + // std::string moduleName = *(boost::get_error_info(e)); + // const int* errorCode = boost::get_error_info(e); + //_spatiallocationinfo->_errorCode = *errorCode; + //_spatiallocationinfo->_library = libraryName; + //_spatiallocationinfo->_module = moduleName; + //_spatiallocationinfo->_message = details; + std::string details = _handleFLINTException(e); // Template function call _spinupNotificationCenter.postNotification(moja::signals::Error, details); } catch (flint::VariableNotFoundException& e) { std::string str = @@ -844,6 +846,20 @@ bool SpatialTiledLocalDomainController::runCellSpinUp(std::shared_ptr +std::string _handleFLINTException(const FlintExceptionType& e) { + std::string details = *(boost::get_error_info
(e)); + std::string libraryName = *(boost::get_error_info(e)); + std::string moduleName = *(boost::get_error_info(e)); + const int* errorCode = boost::get_error_info(e); + _spatiallocationinfo->_errorCode = *errorCode; + _spatiallocationinfo->_library = libraryName; + _spatiallocationinfo->_module = moduleName; + _spatiallocationinfo->_message = details; + return details; +} // -------------------------------------------------------------------------------------------- From ee796c2f6fb1b43fbd30c654fb5ef1393cbeed9f Mon Sep 17 00:00:00 2001 From: Debolina Ghatuary Date: Tue, 20 Apr 2021 11:49:02 +0530 Subject: [PATCH 2/3] removed some unnecessary comment lines Signed-off-by: Debolina Ghatuary --- .../src/spatialtiledlocaldomaincontroller.cpp | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/Source/moja.flint/src/spatialtiledlocaldomaincontroller.cpp b/Source/moja.flint/src/spatialtiledlocaldomaincontroller.cpp index 78fbcb5..aae10c7 100644 --- a/Source/moja.flint/src/spatialtiledlocaldomaincontroller.cpp +++ b/Source/moja.flint/src/spatialtiledlocaldomaincontroller.cpp @@ -792,26 +792,10 @@ bool SpatialTiledLocalDomainController::runCellSpinUp(std::shared_ptr_unitsProcessed++; return true; } catch (const flint::SimulationError& e) { - // std::string details = *(boost::get_error_info
(e)); - // std::string libraryName = *(boost::get_error_info(e)); - // std::string moduleName = *(boost::get_error_info(e)); - // const int* errorCode = boost::get_error_info(e); - //_spatiallocationinfo->_errorCode = *errorCode; - //_spatiallocationinfo->_library = libraryName; - //_spatiallocationinfo->_module = moduleName; - //_spatiallocationinfo->_message = details; std::string details = _handleFLINTException(e); // Template function call _spinupNotificationCenter.postNotification(moja::signals::Error, details); return true; } catch (const flint::LocalDomainError& e) { - // std::string details = *(boost::get_error_info
(e)); - // std::string libraryName = *(boost::get_error_info(e)); - // std::string moduleName = *(boost::get_error_info(e)); - // const int* errorCode = boost::get_error_info(e); - //_spatiallocationinfo->_errorCode = *errorCode; - //_spatiallocationinfo->_library = libraryName; - //_spatiallocationinfo->_module = moduleName; - //_spatiallocationinfo->_message = details; std::string details = _handleFLINTException(e); // Template function call _spinupNotificationCenter.postNotification(moja::signals::Error, details); } catch (flint::VariableNotFoundException& e) { From b55818a8577124a6e246c6df2a1a9ffc16339933 Mon Sep 17 00:00:00 2001 From: Debolina Ghatuary Date: Wed, 28 Apr 2021 19:42:56 +0530 Subject: [PATCH 3/3] Changes added for uniform exception handling Signed-off-by: Debolina Ghatuary --- .../src/spatialtiledlocaldomaincontroller.cpp | 22 ++++--------------- 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/Source/moja.flint/src/spatialtiledlocaldomaincontroller.cpp b/Source/moja.flint/src/spatialtiledlocaldomaincontroller.cpp index aae10c7..827c85f 100644 --- a/Source/moja.flint/src/spatialtiledlocaldomaincontroller.cpp +++ b/Source/moja.flint/src/spatialtiledlocaldomaincontroller.cpp @@ -831,7 +831,7 @@ bool SpatialTiledLocalDomainController::runCellSpinUp(std::shared_ptr std::string _handleFLINTException(const FlintExceptionType& e) { std::string details = *(boost::get_error_info
(e)); @@ -929,17 +929,10 @@ bool SpatialTiledLocalDomainController::runCell(std::shared_ptr } } - // This error is recoverable, retunr true for success + // This error is recoverable, return true for success catch (const flint::SimulationError& e) { // This error is recoverable, drop cell and continue simulation - std::string details = *(boost::get_error_info
(e)); - std::string libraryName = *(boost::get_error_info(e)); - std::string moduleName = *(boost::get_error_info(e)); - const int* errorCode = boost::get_error_info(e); - _spatiallocationinfo->_errorCode = *errorCode; - _spatiallocationinfo->_library = libraryName; - _spatiallocationinfo->_module = moduleName; - _spatiallocationinfo->_message = details; + std::string details = _handleFLINTException(e); // Template function call _notificationCenter.postNotification(moja::signals::Error, details); blockStatsUnit->_unitsNotProcessed++; blockStatsUnit->_unitsWithError++; @@ -947,14 +940,7 @@ bool SpatialTiledLocalDomainController::runCell(std::shared_ptr } // All other catches are failures for the localdomain, return false! catch (const flint::LocalDomainError& e) { - std::string details = *(boost::get_error_info
(e)); - std::string libraryName = *(boost::get_error_info(e)); - std::string moduleName = *(boost::get_error_info(e)); - const int* errorCode = boost::get_error_info(e); - _spatiallocationinfo->_errorCode = *errorCode; - _spatiallocationinfo->_library = libraryName; - _spatiallocationinfo->_module = moduleName; - _spatiallocationinfo->_message = details; + std::string details = _handleFLINTException(e); // Template function call _notificationCenter.postNotification(moja::signals::Error, details); } catch (flint::VariableNotFoundException& e) { std::string str = ((boost::format("Variable not found: %1%") % *(boost::get_error_info(e))).str());