CDPP / AMDA_Kernel

Commit e9b02dbfc0df272b23295a886445744c1ada0e02

Authored by Benjamin Renard
1 parent 05f2d856
Exists in master and in 96 other branches 10038, 10098, 5390, 5770, 6728, 7616, 7811, 7875, 8034_7628, 8038, 8041, 8045_8044, 8295, 8459, 8528, 8928, 9016, 9016Bis, 9017, 9017-new, 9049, 9084, 9259, 9326, 9347, 9383, 9719, 9719.new, AllLegends, CDF_ISTP, CDF_ISTP_HOPEFULLY_ALL_WORKING, FER_10400, FER_10412, FER_10663, FER_10765, FER_11000, FER_11100, FER_11242, FER_11277, FER_11500, FER_11537, FER_11588, FER_11651, FER_19836, FER_5344, FER_6031, FER_6598, FER_6966, FER_7318, FER_7618, FER_7857, FER_8455, FER_9629, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, JUNO_JEDI, MAZ_10936, MAZ_6018, MAZ_9016_New, MAZ_FIX_9016, SolarOrbiter, SpeasyGet, akka-scatter-multi-xparams, amdadev, amdadev_test, cu2022, das2, density_maps, develop, evol-5638, evol-6371, evol_9042, expression-parser-bre, feature/9259, frames-transformation, pickle, rm_5639, rm_5776, rm_6015, rm_6595, rm_6599, rm_6616, rm_6616_bis, rm_6912, rm_7926, rm_8050, rm_8932, shue, shue97, sum-components-indexes, test-merge, tickplot, ubuntu

Fix parameters synchronisation in multi params process (#6288)

Showing 1 changed file with 15 additions and 13 deletions   Show diff stats
Inline Side-by-side
src/InternLib/MultiParamProcess.cc
  Diff comments   View file @e9b02db
... ... @@ -67,21 +67,23 @@ unsigned int MultiParamProcess::write() {
67 67  
68 68 unsigned int nbDataBeforeCallProcess = _paramData->getDataNumber();
69 69  
70   - for (ParameterList::iterator itParam = _paramNameList.begin(); itParam != _paramNameList.end(); ++itParam) {
71   - if (itParam->second.second._timeIntToProcessChanged && !_paramDataIndexInfo._timeIntToProcessChanged)
72   - continue;
73   - lNbTotalAvalaible = itParam->second.second._startIndex + itParam->second.second._nbDataToProcess;
74   - if ( _paramDataIndexInfo._startIndex >= lNbTotalAvalaible)
75   - {
76   - LOG4CXX_DEBUG(_logger, "Need more data Parameter name: " << itParam->first );
77   - lResultList.push_back(make_pair(itParam,(*itParam->second.first).getAsync(this)));
  70 + if (_paramDataIndexInfo._timeIntToProcessChanged) {
  71 + for (ParameterList::iterator itParam = _paramNameList.begin(); itParam != _paramNameList.end(); ++itParam) {
  72 + LOG4CXX_DEBUG(_logger, "MultiParamProcess::write - New interval - Need more data for: " << itParam->first );
  73 + (*itParam).second.second = (*itParam->second.first).getAsync(this).get();
78 74 }
79 75 }
80   -
81   - // Wait data
82   - for ( ParamDataIndexInfoFutureList::iterator it= lResultList.begin();it != lResultList.end(); ++it) {
83   - LOG4CXX_DEBUG(_logger, "Wait data Parameter name: " << it->first->first );
84   - it->first->second.second=it->second.get();
  76 + else {
  77 + for (ParameterList::iterator itParam = _paramNameList.begin(); itParam != _paramNameList.end(); ++itParam) {
  78 + if (itParam->second.second._timeIntToProcessChanged) {
  79 + continue;
  80 + }
  81 + lNbTotalAvalaible = itParam->second.second._startIndex + itParam->second.second._nbDataToProcess;
  82 + if ( _paramDataIndexInfo._startIndex >= lNbTotalAvalaible) {
  83 + LOG4CXX_DEBUG(_logger, "MultiParamProcess::write - Need more data for: " << itParam->first );
  84 + (*itParam).second.second = (*itParam->second.first).getAsync(this).get();
  85 + }
  86 + }
85 87 }
86 88  
87 89 //compute minimum data available
... ...