Index: /trunk/FACT++/src/Fits.cc =================================================================== --- /trunk/FACT++/src/Fits.cc (revision 14232) +++ /trunk/FACT++/src/Fits.cc (revision 14233) @@ -60,8 +60,9 @@ //! @param out Message object to use for propagating messages // -void Fits::InitDataColumns(const vector &desc, const vector& dataFormat, void* dataPointer, MessageImp* out) +void Fits::InitDataColumns(const vector &desc, const vector& dataFormat, const void* dataPointer, MessageImp* out) { fDataFormats = dataFormat; - fDataPointer = dataPointer; +//FIXME I removed the static assignment of the data pointer because it changes from event to event now. Remove the arg of this function +// fDataPointer = dataPointer; if ((desc.size() == 0) && (dataFormat.size() == 0)) @@ -314,5 +315,5 @@ //! @param conv the converter corresponding to the service being logged // -bool Fits::Write(const Converter &conv) +bool Fits::Write(const Converter &conv, const void* data) { //first copy the standard variables to the copy buffer @@ -328,5 +329,5 @@ { //now take care of the DIM data. The Converter is here for that purpose - conv.ToFits(fCopyBuffer.data()+shift, fDataPointer, fCopyBuffer.size()-shift); + conv.ToFits(fCopyBuffer.data()+shift, data, fCopyBuffer.size()-shift); } catch (const runtime_error &e) Index: /trunk/FACT++/src/Fits.h =================================================================== --- /trunk/FACT++/src/Fits.h (revision 14232) +++ /trunk/FACT++/src/Fits.h (revision 14233) @@ -39,5 +39,5 @@ ///the pointer to the contiguous memory location where the data is stored (i.e. the dim data pointer) - void* fDataPointer; +// void* fDataPointer; ///the copy buffer. Required to put the standard and data variable in contguous memory vector fCopyBuffer; @@ -61,5 +61,4 @@ Fits() : fFile(NULL), - fDataPointer(NULL), fEndMjD(0.0), fNumOpenFitsFiles(NULL), @@ -80,5 +79,5 @@ ///Adds columns specific to the service being logged. - void InitDataColumns(const vector &desc, const vector& dataFormat, void* dataPointer, MessageImp* out); + void InitDataColumns(const vector &desc, const vector& dataFormat, const void* dataPointer, MessageImp* out); ///Opens a FITS file @@ -86,5 +85,5 @@ ///Write one line of data. Use the given converter. - bool Write(const Converter &conv); + bool Write(const Converter &conv, const void* data); ///Close the currently opened file. Index: /trunk/FACT++/src/datalogger.cc =================================================================== --- /trunk/FACT++/src/datalogger.cc (revision 14232) +++ /trunk/FACT++/src/datalogger.cc (revision 14233) @@ -84,4 +84,5 @@ #endif +#include "DimState.h" //Dim structures @@ -115,4 +116,6 @@ } }; + +EventImp nullEventImp; ///Dim subscription type. Stores all the relevant info to handle a Dim subscription struct SubscriptionType @@ -137,7 +140,12 @@ /// that it is the first which is deleted -- and consequently none of /// the other members can still be in use in an infoHandler) - shared_ptr dimInfo; + //DIM_REPLACE + //shared_ptr dimInfo; + unsigned int index; + ///Dim info constructor - SubscriptionType(DimStampedInfo* info=NULL) + //DIM_REPLACE +// SubscriptionType(DimStampedInfo* info=NULL) + SubscriptionType() { fConv = shared_ptr(); @@ -145,8 +153,9 @@ lastReceivedEvent = Time::None; fitsBufferAllocated = false; - // Should be the last instantiated to make sure that all other // variables which might be used are already initialized - dimInfo = shared_ptr(info); + //DIM_REPLACE + //dimInfo = shared_ptr(info); + index = 0; } ///default destructor @@ -156,5 +165,7 @@ }; -class DataLogger : public StateMachineDim, DimServiceInfoListImp +class DataLogger : public StateMachineDim +//DIM_REPLACE +//, DimServiceInfoListImp { public: @@ -216,5 +227,5 @@ ***************************************************/ //overloading of DIM's infoHandler function - void infoHandler(); + int infoCallback(const EventImp& evt, unsigned int infoIndex); /*************************************************** @@ -222,5 +233,5 @@ ***************************************************/ ///Reporting method for the services info received - void Report(DimInfo* I, SubscriptionType& sub); + void Report(const EventImp& evt, SubscriptionType& sub); ///Configuration of the nightly file path @@ -229,5 +240,5 @@ int PrintState(const Event& evt); ///checks whether or not the current info being treated is a run number - void CheckForRunNumber(DimInfo* I); + void CheckForRunNumber(const EventImp& evt, unsigned int index); /// start transition int Start(); @@ -244,9 +255,9 @@ #ifdef HAVE_FITS ///Open fits files - void OpenFITSFiles(SubscriptionType& sub); + void OpenFITSFiles(SubscriptionType& sub, const EventImp& evt); ///Write data to FITS files - void WriteToFITS(SubscriptionType& sub); + void WriteToFITS(SubscriptionType& sub, const void* data); ///Allocate the buffers required for fits - void AllocateFITSBuffers(SubscriptionType& sub); + void AllocateFITSBuffers(SubscriptionType& sub, const EventImp& evt); #endif//has_fits @@ -314,5 +325,5 @@ bool ShouldSubscribe(const string& server, const string& service); ///Subscribe to a given server and service - DimStampedInfo* SubscribeTo(const string& server, const string& service); +// EventImp& SubscribeTo(const string& server, const string& service); ///Open a text file and checks for ofstream status bool OpenTextFile(ofstream& stream, const string& name); @@ -331,12 +342,18 @@ * INHERITED FROM DimServiceInfoList ***************************************************/ + ///Add a new server subscription + void AddServer(const string& server); ///Add a new service subscription - void AddService(const string&, const string&, const string&, bool); + void AddService(const Service& svc); ///Remove a given service subscription + //FIXME unused void RemoveService(const string, const string, bool); ///Remove all the services associated with a given server + //FIXME unused void RemoveAllServices(const string&); ///pointer to the dim's subscription that should distribute the run numbers. - DimInfo* fRunNumberService; + //DIM_REPLACE + //DimInfo* fRunNumberService; + unsigned int fRunNumberService; /*************************************************** * Overwritten from MessageImp @@ -350,4 +367,10 @@ int fCurrentDay; Time lastFlush; + + DimDnsServiceList fDimList; + vector fServerDescriptionsList; + + //counter for keeping tracker of services + unsigned int servicesCounter; public: int Write(const Time &time, const std::string &txt, int qos=kMessage); @@ -412,4 +435,17 @@ } + +void DataLogger::AddServer(const string& server) +{ + Info("Got request to add server " + server ); + if (server != "DIS_DNS") + { + DimDescriptions* d = new DimDescriptions(server); + d->Subscribe(*this); + fServerDescriptionsList.push_back(d); + } + +} + // -------------------------------------------------------------------------- // @@ -419,11 +455,15 @@ //! @param isCmd whether this is a Dim Command or not. Commands are not logged // -void DataLogger::AddService(const string& server, const string& service, const string&, bool isCmd) -{ - //dataLogger does not subscribe to commands +void DataLogger::AddService(const Service& svc) +{ + const string& server = svc.server; + const string& service = svc.service; + const bool isCmd = svc.iscmd; + + Info("Got request to add service: "+server+"/"+service); + //dataLogger does not subscribe to commands if (isCmd) return; - Info("Got request to add service: "+server+"/"+service); //check the given subscription against black and white lists @@ -438,12 +478,18 @@ return; } - - list[service].dimInfo.reset(SubscribeTo(server, service)); + //DIM_REPLACE +// list[service].dimInfo.reset(SubscribeTo(server, service)); + if (fDebugIsOn) + Debug("Subscribing to service "+server+"/"+service); + Subscribe(server + "/" + service) + (bind(&DataLogger::infoCallback, this, placeholders::_1, servicesCounter)); list[service].server = server; list[service].service = service; + list[service].index = servicesCounter; fNumSubAndFitsData.numSubscriptions++; //check if this is the run numbers service if ((server == "FAD_CONTROL") && (service == "START_RUN")) - fRunNumberService = list[service].dimInfo.get(); + fRunNumberService = servicesCounter; + servicesCounter++; Info("Added subscription to " + server + "/" + service); } @@ -457,7 +503,10 @@ void DataLogger::RemoveService(string server, string service, bool isCmd) { + Info("Got request to remove service: "+server+"/"+service); if (fDestructing)//this function is called by the super class, after the destructor has deleted its own subscriptions return; +//FIXME unused + return; if (isCmd) @@ -482,5 +531,5 @@ if ((server == "FAD_CONTROL") && (service == "START_RUN")) - fRunNumberService = NULL; + fRunNumberService = 0; Info("Removed subscription to " + server + "/" + service); @@ -499,5 +548,6 @@ return; } - +//FIXME unused + return; fNumSubAndFitsData.numSubscriptions -= fServiceSubscriptions[server].size(); @@ -506,5 +556,5 @@ if (server == "FAD_CONTROL") - fRunNumberService = NULL; + fRunNumberService = 0; if (fDebugIsOn) @@ -585,11 +635,13 @@ //! @param service the service name // -DimStampedInfo* DataLogger::SubscribeTo(const string& server, const string& service) -{ - if (fDebugIsOn) - Debug("Subscribing to service "+server+"/"+service); - - return new DimStampedInfo((server + "/" + service).c_str(), (void*)NULL, 0, this); -} +/*EventImp& DataLogger::SubscribeTo(const string& server, const string& service) +{ + + //DIM_REPLACE + //return new DimStampedInfo((server + "/" + service).c_str(), (void*)NULL, 0, this); + EventImp& newSubscription = Subscribe(server + "/" + service); + newSubscription.bind(&infoHandler, this, placeholders::_1); + return newSubscription; +}*/ // -------------------------------------------------------------------------- // @@ -703,6 +755,13 @@ { shouldBackLog = true; + + servicesCounter=1; + //initialize member data fFilePath = "."; + + fDimList.Subscribe(*this); + fDimList.SetCallbackServerAdd(bind(&DataLogger::AddServer, this, placeholders::_1)); + fDimList.SetCallbackServiceAdd(bind(&DataLogger::AddService, this, placeholders::_1)); //calculate time "centered" around noon instead of midnight @@ -809,7 +868,10 @@ NotifyOpenedFile("", 0, fOpenedRunFiles); - fRunNumberService = NULL; + fRunNumberService = 0; + fShouldAutoStart = false; fAutoStarted = false; + + if(fDebugIsOn) { @@ -855,4 +917,7 @@ } + for (auto it=fServerDescriptionsList.begin(); it!= fServerDescriptionsList.end(); it++) + delete *it; + if (fDebugIsOn) Debug("DataLogger desctruction ends"); @@ -880,6 +945,12 @@ //! Inherited from DimInfo. Handles all the Infos to which we subscribed, and log them // -void DataLogger::infoHandler() -{ +int DataLogger::infoCallback(const EventImp& evt, unsigned int subIndex) +{ +// if (fDebugIsOn) +// { +// ostringstream str; +// str << "Got infoCallback called with service index= " << subIndex; +// Debug(str.str()); +// } if ((GetCurrentState() == kSM_Ready) && (!fAutoStarted) && fShouldAutoStart) { @@ -892,8 +963,5 @@ fAutoStarted = true; } - DimInfo* I = getInfo(); - - if (I==NULL) - return; + //check if the service pointer corresponds to something that we subscribed to @@ -904,6 +972,7 @@ for (x=fServiceSubscriptions.begin(); x != fServiceSubscriptions.end(); x++) {//find current service is subscriptions + //Edit: this should be useless now... remove it sometimes ? for (y=x->second.begin(); y!=x->second.end();y++) - if ((y->second.dimInfo).get() == I) + if (y->second.index == subIndex) { found = true; @@ -914,24 +983,11 @@ } if (!found) - return; - - if (I->getSize() <= 0 || I->getData()==NULL) - { - return; - } - if (strlen(I->getFormat()) == 0) - { - ostringstream str; - str << "Format of " << I->getName() << " is empty (ptr=" << I->getData() << ", size=" << I->getSize() << ")... ignoring it."; - Warn(str); - return; - } - // Make sure that getTimestampMillisecs is NEVER called before - // getTimestamp is properly called - // check that the message has been updated by something, i.e. must be different from its initial value - if (I->getTimestamp() == 0) - { - return; - } + return GetCurrentState(); + + if (evt.GetSize() == 0) + return GetCurrentState(); + if (evt.GetFormat() == "") + return GetCurrentState(); + // cout.precision(20); // cout << "Orig timestamp: " << Time(I->getTimestamp(), I->getTimestampMillisecs()*1000).Mjd() << endl; @@ -941,10 +997,12 @@ // subscribe to this service anyway and hence we have the pointer // (no need to check for the name) - CheckForRunNumber(I); - - Report(I, y->second); + CheckForRunNumber(evt, subIndex); + + Report(evt, y->second); //remove old run numbers TrimOldRunNumbers(); + + return GetCurrentState(); } @@ -1002,10 +1060,10 @@ //! the current DimInfo // -void DataLogger::CheckForRunNumber(DimInfo* I) -{ - if (I != fRunNumberService) +void DataLogger::CheckForRunNumber(const EventImp& evt, unsigned int index) +{ + if (index != fRunNumberService) return; - - AddNewRunNumber(I->getLonglong(), Time(I->getTimestamp(), I->getTimestampMillisecs()*1000)); +// int64_t newRun = reinterpret_cast(evt.GetData())[0]; + AddNewRunNumber(evt.GetXtra(), evt.GetTime()); } @@ -1018,7 +1076,7 @@ //! The dataLogger's subscription corresponding to this DimInfo // -void DataLogger::Report(DimInfo* I, SubscriptionType& sub) -{ - const string fmt(I->getFormat()); +void DataLogger::Report(const EventImp& evt, SubscriptionType& sub) +{ + const string fmt(evt.GetFormat()); const bool isItaReport = fmt!="C"; @@ -1027,8 +1085,8 @@ return; - if (fDebugIsOn && string(I->getName())!="DATA_LOGGER/MESSAGE") + if (fDebugIsOn && string(evt.GetName())!="DATA_LOGGER/MESSAGE") { ostringstream str; - str << "Logging " << I->getName() << " [" << I->getFormat() << "] (" << I->getSize() << ")"; + str << "Logging " << evt.GetName() << " [" << evt.GetFormat() << "] (" << evt.GetSize() << ")"; Debug(str); } @@ -1105,9 +1163,9 @@ if (!sub.fConv) { - sub.fConv = shared_ptr(new Converter(Out(), I->getFormat())); + sub.fConv = shared_ptr(new Converter(Out(), evt.GetFormat())); if (!sub.fConv->valid()) { ostringstream str; - str << "Couldn't properly parse the format... service " << sub.dimInfo->getName() << " ignored."; + str << "Couldn't properly parse the format... service " << evt.GetName() << " ignored."; Error(str); return; @@ -1116,6 +1174,6 @@ //construct the header ostringstream header; - const Time cTime(I->getTimestamp(), I->getTimestampMillisecs()*1000); - fQuality = I->getQuality(); + const Time cTime(evt.GetTime()); + fQuality = evt.GetQoS(); //I had strange surprises with the quality from Dim before. Double check that the value is indeed valid. if (fQuality != kMessage && @@ -1132,18 +1190,18 @@ { //write text header - header << I->getName() << " " << fQuality << " "; + header << evt.GetName() << " " << fQuality << " "; header << cTime.Y() << " " << cTime.M() << " " << cTime.D() << " "; header << cTime.h() << " " << cTime.m() << " " << cTime.s() << " "; - header << cTime.ms() << " " << I->getTimestamp() << " "; + header << cTime.ms() << " " << evt.GetTime() << " "; string text; try { - text = sub.fConv->GetString(I->getData(), I->getSize()); + text = sub.fConv->GetString(evt.GetData(), evt.GetSize()); } catch (const runtime_error &e) { ostringstream str; - str << "Parsing service " << sub.dimInfo->getName(); + str << "Parsing service " << evt.GetName(); str << " failed: " << e.what() << " removing the subscription for now."; Error(str); @@ -1157,5 +1215,5 @@ { ostringstream str; - str << "Service " << sub.dimInfo->getName() << " sent an empty string"; + str << "Service " << evt.GetName() << " sent an empty string"; Info(str); return; @@ -1178,6 +1236,6 @@ if (!sub.nightlyFile.IsOpen()) if (GetCurrentState() != kSM_Ready) - OpenFITSFiles(sub); - WriteToFITS(sub); + OpenFITSFiles(sub, evt); + WriteToFITS(sub, evt.GetData()); #endif } @@ -1187,10 +1245,10 @@ try { - strings = sub.fConv->ToStrings(I->getData()); + strings = sub.fConv->ToStrings(evt.GetData()); } catch (const runtime_error &e) { ostringstream str; - str << "Parsing service " << sub.dimInfo->getName(); + str << "Parsing service " << evt.GetName(); str << " failed: " << e.what() << " removing the subscription for now."; Error(str); @@ -1203,9 +1261,9 @@ { ostringstream err; - err << "There was more than one string message in service " << I->getName() << " going to fatal error state"; + err << "There was more than one string message in service " << evt.GetName() << " going to fatal error state"; Error(err.str()); } ostringstream msg; - msg << I->getName() << ": " << strings[0]; + msg << evt.GetName() << ": " << strings[0]; if (fNightlyLogFile.is_open()) @@ -1219,6 +1277,6 @@ if (!sub.nightlyFile.IsOpen()) if (GetCurrentState() != kSM_Ready) - OpenFITSFiles(sub); - WriteToFITS(sub); + OpenFITSFiles(sub, evt); + WriteToFITS(sub, evt.GetData()); } @@ -1525,7 +1583,7 @@ //! @param sub //! the current DimInfo subscription being examined -void DataLogger::OpenFITSFiles(SubscriptionType& sub) -{ - string serviceName(sub.dimInfo->getName()); +void DataLogger::OpenFITSFiles(SubscriptionType& sub, const EventImp& evt) +{ + string serviceName(sub.server + "_" + sub.service);//evt.GetName()); for (unsigned int i=0;igetData(), this); + sub.nightlyFile.InitDataColumns(Description::SplitDescription(evt.GetDescription()), dataFormatsLocal, evt.GetData(), this); sub.fitsBufferAllocated = true; @@ -1603,10 +1661,11 @@ //! write a dimInfo data to its corresponding FITS files // -void DataLogger::WriteToFITS(SubscriptionType& sub) +//FIXME: DO I REALLY NEED THE EVENT IMP HERE ??? +void DataLogger::WriteToFITS(SubscriptionType& sub, const void* data) { //nightly File status (open or not) already checked if (sub.nightlyFile.IsOpen()) { - if (!sub.nightlyFile.Write(*sub.fConv.get())) + if (!sub.nightlyFile.Write(*sub.fConv.get(), data)) { RemoveService(sub.server, sub.service, false); @@ -1976,5 +2035,5 @@ int RunShell(Configuration &conf) { - return Main::execute(conf, true); + return Main::execute(conf);//, true); }