Extend influencer counts if the resource monitor allows

Author: valeriy42

include/model/CBucketGatherer.h

@@ -168,7 +168,7 @@ class MODEL_EXPORT CBucketGatherer {
     //! to gather data.
     //! \param[in] numberInfluencers The number of result influencers
     //! for which to gather data.
-    CBucketGatherer(CDataGatherer& dataGatherer, core_t::TTime startTime, std::size_t numberInfluencers);
+    CBucketGatherer(CDataGatherer& dataGatherer, const SBucketGathererInitData& bucketGathererInitData);
 
     //! Create a copy that will result in the same persisted state as the
     //! original.  This is effectively a copy constructor that creates a
@@ -474,6 +474,8 @@ class MODEL_EXPORT CBucketGatherer {
 
     //! The influencing field value counts per person and/or attribute.
     TSizeSizePrOptionalStrPrUInt64UMapVecQueue m_InfluencerCounts;
+
+    TOptionalResourceMonitorCRef m_ResourceMonitor;
 };
 }
 }

lib/model/CBucketGatherer.cc

@@ -9,6 +9,7 @@
  * limitation.
  */
 
+#include "model/CResourceMonitor.h"
 #include <model/CBucketGatherer.h>
 
 #include <core/CLogger.h>
@@ -202,29 +203,29 @@ const std::string CBucketGatherer::EVENTRATE_BUCKET_GATHERER_TAG("a");
 const std::string CBucketGatherer::METRIC_BUCKET_GATHERER_TAG("b");
 
 CBucketGatherer::CBucketGatherer(CDataGatherer& dataGatherer,
-                                 core_t::TTime startTime,
-                                 std::size_t numberInfluencers)
-    : m_DataGatherer(dataGatherer), m_EarliestTime(startTime), m_BucketStart(startTime),
+                                 const SBucketGathererInitData& initData)
+    : m_DataGatherer(dataGatherer), m_EarliestTime(initData.s_StartTime), m_BucketStart(initData.s_StartTime),
       m_PersonAttributeCounts(dataGatherer.params().s_LatencyBuckets,
                               dataGatherer.params().s_BucketLength,
-                              startTime,
+                              initData.s_StartTime,
                               TSizeSizePrUInt64UMap(1)),
       m_PersonAttributeExplicitNulls(dataGatherer.params().s_LatencyBuckets,
                                      dataGatherer.params().s_BucketLength,
-                                     startTime,
+                                     initData.s_StartTime,
                                      TSizeSizePrUSet(1)),
       m_InfluencerCounts(dataGatherer.params().s_LatencyBuckets + 3,
                          dataGatherer.params().s_BucketLength,
-                         startTime,
-                         TSizeSizePrOptionalStrPrUInt64UMapVec(numberInfluencers)) {
+                         initData.s_StartTime,
+                         TSizeSizePrOptionalStrPrUInt64UMapVec(initData.s_InfluenceFieldNames.size())),
+m_ResourceMonitor(initData.s_ResourceMonitor){
 }
 
 CBucketGatherer::CBucketGatherer(bool isForPersistence, const CBucketGatherer& other)
     : m_DataGatherer(other.m_DataGatherer),
       m_EarliestTime(other.m_EarliestTime), m_BucketStart(other.m_BucketStart),
       m_PersonAttributeCounts(other.m_PersonAttributeCounts),
       m_PersonAttributeExplicitNulls(other.m_PersonAttributeExplicitNulls),
-      m_InfluencerCounts(other.m_InfluencerCounts) {
+      m_InfluencerCounts(other.m_InfluencerCounts), m_ResourceMonitor(other.m_ResourceMonitor) {
     if (!isForPersistence) {
         LOG_ABORT(<< "This constructor only creates clones for persistence");
     }
@@ -293,7 +294,7 @@ bool CBucketGatherer::addEventData(CEventData& data) {
             if (influence) {
                 const std::string& inf = *influence;
                 canonicalInfluences[i] = inf;
-                if (count > 0) {
+                if (count > 0 && m_ResourceMonitor && m_ResourceMonitor->get().areAllocationsAllowed()) {
                     influencerCounts[i]
                         .emplace(boost::unordered::piecewise_construct,
                                  boost::make_tuple(pidCid, inf),

lib/model/CEventRateBucketGatherer.cc

@@ -729,8 +729,7 @@ void registerMemoryCallbacks() {
 CEventRateBucketGatherer::CEventRateBucketGatherer(CDataGatherer& dataGatherer,
                                                    const CBucketGatherer::SBucketGathererInitData& initData)
     : CBucketGatherer(dataGatherer,
-                      initData.s_StartTime,
-                      initData.s_InfluenceFieldNames.size()),
+                      initData),
       m_BeginInfluencingFields(0), m_BeginValueField(0), m_BeginSummaryFields(0) {
     this->initializeFieldNames(initData);
     this->initializeFeatureData();
@@ -739,7 +738,7 @@ CEventRateBucketGatherer::CEventRateBucketGatherer(CDataGatherer& dataGatherer,
 CEventRateBucketGatherer::CEventRateBucketGatherer(CDataGatherer& dataGatherer,
                                                    const CBucketGatherer::SBucketGathererInitData& initData,
                                                    core::CStateRestoreTraverser& traverser)
-    : CBucketGatherer(dataGatherer, 0, initData.s_InfluenceFieldNames.size()),
+    : CBucketGatherer(dataGatherer, initData),
       m_BeginInfluencingFields(0), m_BeginValueField(0), m_BeginSummaryFields(0) {
     this->initializeFieldNames(initData);
     if (traverser.traverseSubLevel(std::bind(&CEventRateBucketGatherer::acceptRestoreTraverser,

lib/model/CMetricBucketGatherer.cc

@@ -927,8 +927,7 @@ struct SReleaseMemory {
 CMetricBucketGatherer::CMetricBucketGatherer(CDataGatherer& dataGatherer,
                                              const CBucketGatherer::SBucketGathererInitData& initData)
     : CBucketGatherer(dataGatherer,
-                      initData.s_StartTime,
-                      initData.s_InfluenceFieldNames.size()),
+                      initData),
       m_ValueFieldName(initData.s_ValueFieldName), m_BeginInfluencingFields(0),
       m_BeginValueFields(0) {
     this->initializeFieldNamesPart1(initData);
@@ -939,7 +938,7 @@ CMetricBucketGatherer::CMetricBucketGatherer(CDataGatherer& dataGatherer,
 CMetricBucketGatherer::CMetricBucketGatherer(CDataGatherer& dataGatherer,
                                              const CBucketGatherer::SBucketGathererInitData& initData,
                                              core::CStateRestoreTraverser& traverser)
-    : CBucketGatherer(dataGatherer, 0, initData.s_InfluenceFieldNames.size()),
+    : CBucketGatherer(dataGatherer, initData),
       m_ValueFieldName(initData.s_ValueFieldName), m_BeginValueFields(0) {
     this->initializeFieldNamesPart1(initData);
     if (traverser.traverseSubLevel(std::bind(&CMetricBucketGatherer::acceptRestoreTraverser,