added creation time to archive files and tape file locations

common/dataStructures/AdminUser.hpp

@@ -24,7 +24,6 @@
 #include <string>
 
 #include "common/dataStructures/EntryLog.hpp"
-#include "common/dataStructures/UserIdentity.hpp"
 
 namespace cta {
 namespace common {

common/dataStructures/ArchiveFile.cpp

@@ -25,6 +25,7 @@
 //------------------------------------------------------------------------------
 cta::common::dataStructures::ArchiveFile::ArchiveFile():
   archiveFileID(0),
+  creationTime(0),
   fileSize(0) {}
 
 //------------------------------------------------------------------------------
@@ -34,6 +35,7 @@ bool cta::common::dataStructures::ArchiveFile::operator==(const ArchiveFile &rhs
   return archiveFileID==rhs.archiveFileID
       && checksumType==rhs.checksumType
       && checksumValue==rhs.checksumValue
+      && creationTime==rhs.creationTime
       && drData==rhs.drData
       && eosFileID==rhs.eosFileID
       && fileSize==rhs.fileSize
@@ -55,6 +57,7 @@ std::ostream &operator<<(std::ostream &os, const cta::common::dataStructures::Ar
   os << "(archiveFileID=" << obj.archiveFileID
      << " checksumType=" << obj.checksumType
      << " checksumValue=" << obj.checksumValue
+     << " creationTime=" << obj.creationTime
      << " drData=" << obj.drData
      << " eosFileID=" << obj.eosFileID
      << " fileSize=" << obj.fileSize

common/dataStructures/ArchiveFile.hpp

@@ -41,6 +41,7 @@ struct ArchiveFile {
   uint64_t archiveFileID;
   std::string checksumType;
   std::string checksumValue;
+  time_t creationTime;
   cta::common::dataStructures::DRData drData;
   std::string eosFileID;
   uint64_t fileSize;

common/dataStructures/DriveState.cpp

@@ -25,9 +25,11 @@
 //------------------------------------------------------------------------------
 cta::common::dataStructures::DriveState::DriveState():
   bytesTransferedInSession(0),
+  currentStateStartTime(0),
   filesTransferedInSession(0),
   latestBandwidth(0),
-  sessionId(0) {}
+  sessionId(0),
+  sessionStartTime(0) {}
 
 //------------------------------------------------------------------------------
 // operator==

common/dataStructures/EntryLog.cpp

@@ -23,7 +23,8 @@
 //------------------------------------------------------------------------------
 // constructor
 //------------------------------------------------------------------------------
-cta::common::dataStructures::EntryLog::EntryLog() {}
+cta::common::dataStructures::EntryLog::EntryLog():
+  time(0) {}
 
 //------------------------------------------------------------------------------
 // operator==

common/dataStructures/TapeFileLocation.cpp

@@ -25,6 +25,7 @@
 //------------------------------------------------------------------------------
 cta::common::dataStructures::TapeFileLocation::TapeFileLocation():
   blockId(0),
+  creationTime(0),
   fSeq(0) {}
 
 //------------------------------------------------------------------------------
@@ -32,6 +33,7 @@ cta::common::dataStructures::TapeFileLocation::TapeFileLocation():
 //------------------------------------------------------------------------------
 bool cta::common::dataStructures::TapeFileLocation::operator==(const TapeFileLocation &rhs) const {
   return blockId==rhs.blockId
+      && creationTime==rhs.creationTime
       && fSeq==rhs.fSeq
       && vid==rhs.vid;
 }
@@ -48,6 +50,7 @@ bool cta::common::dataStructures::TapeFileLocation::operator!=(const TapeFileLoc
 //------------------------------------------------------------------------------
 std::ostream &operator<<(std::ostream &os, const cta::common::dataStructures::TapeFileLocation &obj) {
   os << "(blockId=" << obj.blockId
+     << " creationTime=" << obj.creationTime
      << " fSeq=" << obj.fSeq
      << " vid=" << obj.vid << ")";
   return os;

common/dataStructures/TapeFileLocation.hpp

@@ -37,6 +37,7 @@ struct TapeFileLocation {
   bool operator!=(const TapeFileLocation &rhs) const;
 
   uint64_t blockId;
+  time_t creationTime;
   uint64_t fSeq;
   std::string vid;
 

common/dataStructures/TapeLog.cpp

@@ -23,7 +23,8 @@
 //------------------------------------------------------------------------------
 // constructor
 //------------------------------------------------------------------------------
-cta::common::dataStructures::TapeLog::TapeLog() {}
+cta::common::dataStructures::TapeLog::TapeLog():
+  time(0) {}
 
 //------------------------------------------------------------------------------
 // operator==