Changeset 17017

Timestamp:

08/19/13 13:05:59 (11 years ago)

Author:

ogrimm

Message:

Fixed bug in History server caausing excessive memory allocation (signed instead of unsigned integers were compared)

File:

• fact/Evidence/History.cc (modified) (2 diffs)

fact/Evidence/History.cc

@@ -31 +31 @@
 const int MIN_SIZE_KB = 50;                                     // Min and max buffersize in kByte (> 3*sizeof(int) !)
 const string DEFAULT_MAX_SIZE_KB = "2000";
-const string DEFAULT_NUM_ENTRIES = "1000";      // Number of entries in each history buffer
+const string DEFAULT_NUM_ENTRIES = "1000";              // Number of entries in each history buffer
 const double MIN_SAVE_PERDIOD = 0.5;                    // Minimum period between saving history buffers in hours
 
@@ -172 +172 @@
 
   // Resize buffer if necessary
-  int NEntries = atoi(GetConfig("numentries").c_str());
-  if (Map[Service].Buffer.size() < NEntries*I->getSize()) {
-        if (NEntries*I->getSize() < atoi(GetConfig("maxsize_kb").c_str())*1024) {
-          Map[Service].Buffer.resize(NEntries*I->getSize());
-        }
+  unsigned long TargetSize = atoi(GetConfig("numentries").c_str()) * I->getSize();
+
+  if (Map[Service].Buffer.size() < TargetSize && TargetSize < atoi(GetConfig("maxsize_kb").c_str())*1024) {
+          Map[Service].Buffer.resize(TargetSize);
   }