Blinker

@@ -19,6 +19,7 @@

 #include "InStreamFile.h"

 #include "IoCallee.h"

 #include "Module.h"

+#include "ListTracker.h"

 #include "Protocol.h"

 #include "ProtocolFile.h"

 #include "SettingFile.h"

@@ -41,15 +42,8 @@ protected:

   /// static destination

   class Dest;

-  /// static destination list entry

-  struct DestEntry {

-    std::string m_name;   ///< name of static destination

-    Dest        *m_pDest; ///< static destination object

-    DestEntry(const std::string &name); ///< constructor

-  };

-

-  /// static destinations

-  typedef std::list<DestEntry> DestList;

+  /// static destination list tracker

+  typedef ListTracker<Sender, Dest, Directory> DestListTracker;

   /// dynamic destinations: address -> time of last request

   typedef std::map<ADDR, Time> DynDests;

@@ -109,18 +103,6 @@ protected:

   /// destroy socket

   void destroySock();

-  /**

-   * @brief light update of static destinations,

-   *        i.e. stat all files in current static destination directory

-   */

-  void updateDestsLight();

-

-  /**

-   * @brief full update of static destinations,

-   *        i.e. scan files in playlist directory

-   */

-  void updateDestsFull();

-

   /// remove timed-out dynamic destinations

   void removeTimedOutDynDests();

@@ -157,9 +139,8 @@ protected:

   InStreamFile    m_fileInStream;    ///< input stream name file

   AddrFile        m_fileBind;        ///< bind address file

   ProtocolFile    m_fileProtocol;    ///< protocol file

-  Directory    m_dirDests;     ///< static destinations directory

   SOCK            *m_pSock;          ///< socket to use for sending streams

-  DestList     m_destList;     ///< static destinations

+  DestListTracker m_destListTracker; ///< static destinations tracker

   DynDests        m_dynDests;        ///< dynamic destinations

   std::string     m_noFrameData;     ///< "no frame" protocol data (empty if unknown)

   std::string     m_data;            ///< current protocol data (empty if unknown)

@@ -24,12 +24,10 @@ public:

   /**

    * @brief constructor

    * @param[in] sender owning sender object

+   * @param[in] name destination name

    * @param[in] dirBase base directory

-   * @param[in] pNoFrameData protocol data for "no frame" packet

-   *                         (empty if unknown)

    */

-  Dest(Sender &sender, const Directory &dirBase,

-       const std::string *pNoFrameData);

+  Dest(Sender &sender, const std::string &name, const Directory &dirBase);

   /// destructor

   ~Dest();

@@ -63,8 +61,8 @@ protected:

 protected:

   Sender            &m_sender;  ///< owning sender object

+  std::string       m_name;     ///< destination name

   AddrFile          m_fileAddr; ///< address file

-  const std::string *m_pNoFrameData; ///< protocol data for "no frame" packet

   const std::string *m_pData;   ///< protocol data to send to address

 }; // class Sender<ADDr, SOCK>::Dest

@@ -20,17 +20,16 @@ namespace Blinker {

 /**

  * @brief constructor

  * @param[in] sender owning sender object

+ * @param[in] name destination name

  * @param[in] dirBase base directory

- * @param[in] pNoFrameData protocol data for "no frame" packet

- *                         (empty if unknown)

  */

 template<typename ADDR, typename SOCK>

-Sender<ADDR, SOCK>::Dest::Dest(Sender &sender, const Directory &dirBase,

-                               const std::string *pNoFrameData):

+Sender<ADDR, SOCK>::Dest::Dest(Sender &sender, const std::string &name,

+                               const Directory &dirBase):

   m_sender(sender),

+  m_name(name),

   m_fileAddr(dirBase.getFile("addr")),

-  m_pNoFrameData(pNoFrameData),

-  m_pData(pNoFrameData)

+  m_pData(&sender.m_noFrameData)

 {

   // set up

   getAddr();

@@ -41,7 +40,7 @@ template<typename ADDR, typename SOCK>

 Sender<ADDR, SOCK>::Dest::~Dest()

 {

   // send "no frame" protocol data to old address

-  send(m_pNoFrameData);

+  send(&m_sender.m_noFrameData);

 }

 /// check for update of configuration

@@ -74,7 +73,7 @@ void Sender<ADDR, SOCK>::Dest::getAddr()

   std::string strAddr;

   // send "no frame" protocol data to old address

-  send(m_pNoFrameData);

+  send(&m_sender.m_noFrameData);

   // get new address from file

   m_fileAddr.update();

@@ -18,6 +18,8 @@

 #include "File.h"

 #include "InStreamFile.h"

 #include "IoCallee.h"

+#include "ListTracker.h"

+#include "ListTracker_impl.h"

 #include "Module.h"

 #include "Protocol.h"

 #include "ProtocolFile.h"

@@ -45,8 +47,8 @@ Sender<ADDR, SOCK>::Sender(CallMgr &callMgr, StreamMgr &streamMgr,

   m_fileInStream(dirBase.getFile("instream"), streamMgr),

   m_fileBind(dirBase.getFile("bind")),

   m_fileProtocol(dirBase.getFile("protocol")),

-  m_dirDests(dirBase.getSubdir("destinations")),

-  m_pSock(NULL)

+  m_pSock(NULL),

+  m_destListTracker(*this, dirBase.getSubdir("destinations"))

 {

   // read protocol

   readProto();

@@ -57,7 +59,7 @@ Sender<ADDR, SOCK>::Sender(CallMgr &callMgr, StreamMgr &streamMgr,

   createSock();

   // load static destinations

-  updateDestsFull();

+  m_destListTracker.init();

 }

 /// virtual destructor

@@ -67,11 +69,8 @@ Sender<ADDR, SOCK>::~Sender()

   // send "no frame" to all destinations

   sendAllNoFrame();

-  // free static destination lists

-  while (!m_destList.empty()) {

-    delete m_destList.back().m_pDest;

-    m_destList.pop_back();

-  }

+  // free static destinations

+  m_destListTracker.clear();

   // destroy socket

   destroySock();

@@ -100,11 +99,7 @@ void Sender<ADDR, SOCK>::updateConfig()

     readProto();

   // static destinations update

-  // (directory modified -> full, otherwise -> light)

-  if (m_dirDests.checkModified())

-    updateDestsFull();

-  else

-    updateDestsLight();

+  m_destListTracker.updateConfig();

 }

 /**

@@ -237,70 +232,6 @@ void Sender<ADDR, SOCK>::destroySock()

   }

 }

-/**

- * @brief light update of static destinations,

- *        i.e. stat all files in current static destination directory

- */

-template<typename ADDR, typename SOCK>

-void Sender<ADDR, SOCK>::updateDestsLight()

-{

-  // walk through all files in static dest dir and check for modification

-  typename DestList::iterator itDest;

-  for (itDest = m_destList.begin(); itDest != m_destList.end(); ++itDest)

-    itDest->m_pDest->updateConfig();

-}

-

-/**

- * @brief full update of static destinations,

- *        i.e. scan files in playlist directory

- */

-template<typename ADDR, typename SOCK>

-void Sender<ADDR, SOCK>::updateDestsFull()

-{

-  // get list of subdirs in input directory

-  typedef std::list<std::string> Subdirlist;

-  Subdirlist curSubdirs;

-  m_dirDests.getEntries(Directory::TypeSubdir, curSubdirs);

-

-  // walk through current static destinations and subdir list simultaneously

-  Subdirlist::const_iterator  itSubdir = curSubdirs.begin();

-  typename DestList::iterator itDest   = m_destList.begin();

-  while (itSubdir != curSubdirs.end() || itDest != m_destList.end()) {

-

-    // new static destination inserted

-    if (itDest == m_destList.end() ||

-        (itSubdir != curSubdirs.end() && *itSubdir < itDest->m_name)) {

-      // create static destination object

-      DestEntry destEntry(*itSubdir);

-      destEntry.m_pDest = new Dest(*this, m_dirDests.getSubdir(*itSubdir),

-                                   &m_noFrameData);

-      if (destEntry.m_pDest)

-        // insert static destination entry

-        m_destList.insert(itDest, destEntry);

-      // advance to next subdir

-      ++itSubdir;

-    }

-

-    // static destination removed

-    else if (itSubdir == curSubdirs.end() || *itSubdir > itDest->m_name) {

-      // remove static destination

-      delete itDest->m_pDest;

-      itDest = m_destList.erase(itDest);

-      // do not advance to next subdir

-    }

-

-    // static sestination stayed in input list

-    else {

-      // check for update

-      itDest->m_pDest->updateConfig();

-      // advance to next file and next entry

-      ++itSubdir;

-      ++itDest;

-    }

-

-  } // while itSubdir itDest

-}

-

 /// remove timed-out dynamic destinations

 template<typename ADDR, typename SOCK>

 void Sender<ADDR, SOCK>::removeTimedOutDynDests()

@@ -354,9 +285,10 @@ template<typename ADDR, typename SOCK>

 void Sender<ADDR, SOCK>::sendDests(const std::string *pData)

 {

   // send data to static destinations

-  typename DestList::const_iterator itDest;

-  for (itDest = m_destList.begin(); itDest != m_destList.end(); ++itDest)

-    itDest->m_pDest->setProtoData(pData);

+  typename DestListTracker::ListIt itDest;

+  for (itDest = m_destListTracker.m_list.begin();

+       itDest != m_destListTracker.m_list.end(); ++itDest)

+    itDest->m_pObj->setProtoData(pData);

   // send data to all dynamic destinations

   typename DynDests::const_iterator itDyn;

@@ -450,18 +382,6 @@ void Sender<ADDR, SOCK>::receiveFromSock()

 }

-/* #####################

-   # Sender::DestEntry #

-   ##################### */

-

-/// constructor

-template<typename ADDR, typename SOCK>

-Sender<ADDR, SOCK>::DestEntry::DestEntry(const std::string &name):

-  m_name(name),

-  m_pDest(NULL)

-{

-}

-

 } // namespace Blinker

 #endif // #ifndef SENDER_H