ArchiveSpaceManager Fixes

Apra-Labs · Aug 1, 2024 · a690609 · a690609
1 parent c2c4810
commit a690609
Show file tree

Hide file tree

Showing 2 changed files with 166 additions and 153 deletions.
diff --git a/base/include/ArchiveSpaceManager.h b/base/include/ArchiveSpaceManager.h
@@ -2,89 +2,89 @@
 #include "Module.h"
 #include "AIPExceptions.h"
 
-class ArchiveSpaceManagerProps : public ModuleProps
+class ArchiveSpaceManagerProps : public ModuleProps 
 {
 public:
-	ArchiveSpaceManagerProps(uint32_t _lowerWaterMark, uint32_t _upperWaterMark, string _pathToWatch, int _samplingFreq)
-	{
-		lowerWaterMark = _lowerWaterMark;
-		upperWaterMark = _upperWaterMark;
-		pathToWatch = _pathToWatch; 
-		samplingFreq = _samplingFreq;
-		fps = 0.001;
-  
-		auto totalSpace = boost::filesystem::space(pathToWatch);
-		if ((lowerWaterMark > upperWaterMark) || (upperWaterMark > totalSpace.capacity))
-		{
-			LOG_ERROR << "Please enter correct properties!";
+  ArchiveSpaceManagerProps(uint64_t _lowerWaterMark, uint64_t _upperWaterMark,  string _pathToWatch, int _samplingFreq) 
+  {
+    lowerWaterMark = _lowerWaterMark;
+    upperWaterMark = _upperWaterMark;
+    pathToWatch = _pathToWatch;
+    samplingFreq = _samplingFreq;
+    fps = 0.001;
+
+    auto totalSpace = boost::filesystem::space(pathToWatch);
+    if ((lowerWaterMark > upperWaterMark) || (upperWaterMark > totalSpace.capacity)) 
+    {
+      LOG_ERROR << "Please enter correct properties!";
 			std::string errorMsg = "Incorrect properties set for Archive Manager. TotalDiskCapacity <" + std::to_string(totalSpace.capacity) + ">lowerWaterMark<" + std::to_string(lowerWaterMark) + "> UpperWaterMark<" + std::to_string(upperWaterMark) + ">";
-			throw AIPException(AIP_FATAL, errorMsg);
-		}
-	}
+      throw AIPException(AIP_FATAL, errorMsg);
+    }
+  }
 
-	ArchiveSpaceManagerProps(uint32_t maxSizeAllowed, string _pathToWatch, int _samplingFreq)
-	{
-		lowerWaterMark = maxSizeAllowed - (maxSizeAllowed / 10);
-		upperWaterMark = maxSizeAllowed;
-		pathToWatch = _pathToWatch;
-		samplingFreq = _samplingFreq;
-		fps = 0.001;
+  ArchiveSpaceManagerProps(uint64_t maxSizeAllowed, string _pathToWatch, int _samplingFreq) 
+  {
+    lowerWaterMark = maxSizeAllowed - (maxSizeAllowed / 10);
+    upperWaterMark = maxSizeAllowed;
+    pathToWatch = _pathToWatch;
+    samplingFreq = _samplingFreq;
+    fps = 0.001;
 
-		auto totalSpace = boost::filesystem::space(pathToWatch);
-		if ((lowerWaterMark > upperWaterMark) || (upperWaterMark > totalSpace.capacity))
-		{
-			LOG_ERROR << "Please enter correct properties!";
+    auto totalSpace = boost::filesystem::space(pathToWatch);
+    if ((lowerWaterMark > upperWaterMark) || (upperWaterMark > totalSpace.capacity)) 
+    {
+      LOG_ERROR << "Please enter correct properties!";
 			std::string errorMsg = "Incorrect properties set for Archive Manager. TotalDiskCapacity <" + std::to_string(totalSpace.capacity) + ">lowerWaterMark<" + std::to_string(lowerWaterMark) + "> UpperWaterMark<" + std::to_string(upperWaterMark) + ">";
-			throw AIPException(AIP_FATAL, errorMsg);
-		}
-	}
+      throw AIPException(AIP_FATAL, errorMsg);
+    }
+  }
 
-
-	uint32_t lowerWaterMark; // Lower disk space
-	uint32_t upperWaterMark; // Higher disk space
-	std::string pathToWatch;
-	int samplingFreq;
-	size_t getSerializeSize()
-	{
+  
+  uint64_t lowerWaterMark; // Lower disk space
+  uint64_t upperWaterMark; // Higher disk space
+  std::string pathToWatch;
+  int samplingFreq;
+  size_t getSerializeSize() 
+  {
 		return ModuleProps::getSerializeSize() + sizeof(lowerWaterMark) + sizeof(upperWaterMark) + sizeof(pathToWatch) + sizeof(samplingFreq);
-	}
+  }
 private:
-	friend class boost::serialization::access;
+  friend class boost::serialization::access;
 
-	template <class Archive>
+  template <class Archive>
 	void serialize(Archive& ar, const unsigned int version)
 	{
 		ar& boost::serialization::base_object<ModuleProps>(*this);
 		ar& lowerWaterMark;
 		ar& upperWaterMark;
 		ar& pathToWatch;
 		ar& samplingFreq;
-	}
+  }
 };
 
 
 class ArchiveSpaceManager : public Module {
 public:
-	ArchiveSpaceManager(ArchiveSpaceManagerProps _props);
+  ArchiveSpaceManager(ArchiveSpaceManagerProps _props);
 
 	virtual ~ArchiveSpaceManager() {
 	}
-	bool init();
-	bool term();
-	uint32_t finalArchiveSpace = 0;
-	void setProps(ArchiveSpaceManagerProps& props);
-	ArchiveSpaceManagerProps getProps();
+  bool init();
+  bool term();
+  uint64_t finalArchiveSpace = 0;
+  void setProps(ArchiveSpaceManagerProps &props);
+  ArchiveSpaceManagerProps getProps();
 
 protected:
-	bool process();
-	bool validateInputPins();
-	bool validateOutputPins();
-	bool validateInputOutputPins();
+  bool produce();
+  bool validateInputPins();
+  bool validateOutputPins();
+  bool validateInputOutputPins();
 	void addInputPin(framemetadata_sp& metadata, string& pinId);
 	bool handlePropsChange(frame_sp& frame);
 private:
 
-	class Detail;
-	boost::shared_ptr<Detail> mDetail;
-	bool checkDirectory = true;
+  class Detail;
+  boost::shared_ptr<Detail> mDetail;
+  bool checkDirectory = true;
 };