No commit message (d34ac17d) · Commits · INAF / DISCOS

Common/Servers/FitsWriter/include/DataCollection.h

+53 −14

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@
		#include <list>
		#include <Definitions.h>
		#include <Site.h>
		#include <FastQueue.h>
		#include <acsContainerServices.h>
		//#include "FitsWriter.h"
		#include "Configuration.h"
		@@ -76,7 +77,7 @@ void getTsysFromBuffer(char & buffer,const DWORD& channels ,double tsys);
		*/
		class CDumpCollection {
		public:
		CDumpCollection() { };
		CDumpCollection(): m_collection(DUMP_CACHE_SIZE) { };
		/**
		* Destructor. It clears all the dumps that eventually are still there.
		*/
		@@ -84,20 +85,37 @@ public:
		flushAll();
		};
		void flushAll() {
		std::list<TRecord *>::iterator i;
		TRecord *rec;
		while (m_collection.popFront(rec)) {
		delete [] rec->memory;
		delete rec;
		}
		/std::list<TRecord >::iterator i;
		for (i=m_collection.begin();i!=m_collection.end();i++) {
		TRecord rec=i;
		delete [] (rec->memory);
		delete rec;
		}
		m_collection.clear();
		m_collection.clear();*/
		}
		/**
		* Adds a new dump in the back of the stack (FIFO). If the stack reached its maximum size a false
		* is returned and the dump is discarded
		*/
		bool pushDump(const ACS::Time& time,bool calOn,char memory,char buffer,bool tracking,const long& buffSize) {
		if (m_collection.size()>DUMP_CACHE_SIZE) return false;
		TRecord *rec=new TRecord;
		rec->calOn=calOn;
		rec->time=time;
		rec->buffer=buffer;
		rec->memory=memory;
		rec->tracking=tracking;
		rec->buffSize=buffSize;
		if (!m_collection.pushBack(rec)) {
		delete rec;
		return false;
		}
		return true;
		/*if (m_collection.size()>DUMP_CACHE_SIZE) return false;
		TRecord *rec=new TRecord;
		rec->calOn=calOn;
		rec->time=time;
		@@ -107,14 +125,25 @@ public:
		//memcpy(rec->buffer,buffer,buffSize);
		rec->buffSize=buffSize;
		m_collection.push_back(rec);
		return true;
		return true;*/
		}
		/**
		* Pops the first dump of the stack. (FIFO). The returned buffer must be freed by the caller.
		* @return true if the dump could be returned, otherwise if the stack is empty it returns false
		*/
		bool popDump(ACS::Time& time,bool& calOn,char &memory,char & buffer,bool& tracking,long& buffSize) {
		if (m_collection.empty()) return false;
		TRecord *rec;
		if (!m_collection.popFront(rec)) return false;
		time=rec->time;
		calOn=rec->calOn;
		buffer=rec->buffer;
		memory=rec->memory;
		buffSize=rec->buffSize;
		tracking=rec->tracking;
		delete rec;
		return true;

		/*if (m_collection.empty()) return false;
		TRecord *rec=m_collection.front(); //get the first element
		time=rec->time;
		calOn=rec->calOn;
		@@ -124,14 +153,14 @@ public:
		tracking=rec->tracking;
		delete rec;
		m_collection.pop_front(); // deletes the first element
		return true;
		return true;*/
		}
		/**
		* @return the time of the first element (first to come out) of the list. If the list is empty
		* it returns a 0;
		*/
		ACS::Time getFirstTime() {
		if (m_collection.empty()) {
		if (m_collection.isEmpty()) {
		return 0;
		}
		else {
		@@ -142,19 +171,23 @@ public:
		/**
		* @return the time of the last element (last to come out) of the list. if the list is empty it returns 0
		*/
		ACS::Time getLastTime() {
		if (m_collection.empty()) {
		//ACS::Time getLastTime() {
		/*if (m_collection.empty()) {
		return 0;
		}
		else {
		TRecord *rec=m_collection.back();
		return rec->time;
		}
		}
		} */
		//}
		/**
		* @return true if the stack is empty
		*/
		bool isEmpty() { return m_collection.empty(); }
		bool isEmpty() const { return m_collection.isEmpty(); }
		/**
		* return the size of the the dump collection
		*/
		long getCollectionSize() const { return m_collection.size(); }
		private:
		typedef struct {
		ACS::Time time;
		@@ -164,7 +197,8 @@ private:
		long buffSize;
		bool tracking;
		} TRecord;
		std::list<TRecord *>m_collection;
		//std::list<TRecord *>m_collection;
		IRA::CFastQueue<TRecord *>m_collection;
		CDumpCollection(const CDumpCollection& src);
		void operator=(const CDumpCollection&src);
		};
		@@ -346,6 +380,11 @@ public:
		*/
		bool getFakeDump(ACS::Time& time,bool& calOn,char & memory,char & buffer,bool& tracking,long& buffSize);

		/**
		* return the size of the dump buffer
		*/
		long getDumpCollectionSize();

		/**
		* @return the reference to the main header.
		*/

Common/Servers/FitsWriter/src/DataCollection.cpp

+5 −0

Original line number	Diff line number	Diff line
		@@ -219,6 +219,11 @@ bool CDataCollection::getDump(ACS::Time& time,bool& calOn,char & memory,char &
		return m_dumpCollection.popDump(time,calOn,memory,buffer,tracking,buffSize);
		}

		long CDataCollection::getDumpCollectionSize()
		{
		return m_dumpCollection.getCollectionSize();
		}

		bool CDataCollection::getFakeDump(ACS::Time& time,bool& calOn,char & memory,char & buffer,bool& tracking,long& buffSize)
		{
		long size=0;

Common/Servers/FitsWriter/src/EngineThread.cpp

+13 −5

Original line number	Diff line number	Diff line
		@@ -114,6 +114,7 @@ bool CEngineThread::processData()
		else {
		if (!m_data->getDump(time,calOn,bufferCopy,buffer,tracking,buffSize)) return false;
		}

		TIMEVALUE tS;
		tS.value(time);
		#ifdef FW_DEBUG
		@@ -398,10 +399,11 @@ bool CEngineThread::processData()

		void CEngineThread::runLoop()
		{
		TIMEVALUE now;
		TIMEVALUE nowEpoch;
		IRA::CString filePath,fileName;
		//CSecAreaResourceWrapper<CDataCollection> data=m_dataWrapper->Get();
		IRA::CIRATools::getTime(now); // it marks the start of the activity job
		IRA::CIRATools::getTime(nowEpoch); // it marks the start of the activity job
		//cout << "inizio : " << nowEpoch.value().value << endl;
		if (m_summaryOpened && m_data->isWriteSummary()) {
		if ((!m_summary->write()) \|\| (!m_summary->close())) {
		_EXCPT(ManagementErrors::FitsCreationErrorExImpl,impl,"CEngineThread::runLoop()");
		@@ -860,7 +862,9 @@ void CEngineThread::runLoop()
		ACS_LOG(LM_FULL_INFO, "CEngineThread::runLoop()",(LM_DEBUG,"STOPPING" ));
		//save all the data in the buffer an then finalize the file
		if (m_fileOpened) {
		//cout << "Stopping, cached dumps: " << m_data->getDumpCollectionSize() << endl;
		while (processData());

		#ifdef FW_DEBUG
		m_file.close();
		#else
		@@ -890,7 +894,11 @@ void CEngineThread::runLoop()
		// until there is something to process and
		// there is still time available.......
		if (m_fileOpened) {
		while (checkTime(now.value().value) && checkTimeSlot(now.value().value) && processData());
		//cout << "cached before dumps: " << m_data->getDumpCollectionSize() << endl;
		while (checkTime(nowEpoch.value().value) && checkTimeSlot(nowEpoch.value().value) && processData());
		//cout << "cached after dumps: " << m_data->getDumpCollectionSize() << endl;
		//IRA::CIRATools::getTime(nowEpoch);
		//cout << "fine :" << nowEpoch.value().value << endl;
		}
		}
		}