Moved timer stuff from OnBackgroundTimer to InspTimer derivative

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@3305 e03df62e-2008-0410-955e-edbf42e46eb7

diff --git a/include/timer.h b/include/timer.h
index 143ff4d9701d58d5b8b8f9bd3a3540a5eaa335d6..1538fbfb15a7d41670afcf6717c76c87aeeeac5e 100644 (file)
--- a/include/timer.h
+++ b/include/timer.h
@@ -1,15 +1,36 @@
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
+ *                       E-mail:
+ *                <brain@chatspike.net>
+ *                <Craig@chatspike.net>
+ *
+ * Written by Craig Edwards, Craig McLure, and others.
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+
 class InspTimer
 {
  private:
        time_t trigger;
  public:
-       InspTimer(long secs_from_now) : trigger(time(NULL) + secs_from_now) { }
+       InspTimer(long secs_from_now,time_t now)
+       {
+               trigger = now + secs_from_now;
+       }
        virtual ~InspTimer() { }
        virtual time_t GetTimer()
        {
                return trigger;
        }
-       virtual void Tick(time_t TIME) {}
+       virtual void Tick(time_t TIME)
+       {
+       }
 };
 
 void TickTimers(time_t TIME);

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index acd8a4d85ae259f25b339cded8d4901c9ce3b3cd..72a02d3bc2602df95122cdd1d46200cad548ae5c 100644 (file)
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -659,7 +659,6 @@ int InspIRCd::Run()
                        /*
                         * Trigger all InspTimers that are pending
                         */
-                       TickTimers(TIME);
                }
 
                /* Process timeouts on module sockets each time around
@@ -669,6 +668,8 @@ int InspIRCd::Run()
                 */
                DoSocketTimeouts(TIME);
 
+               TickTimers(TIME);
+
                /* Call the socket engine to wait on the active
                 * file descriptors. The socket engine has everything's
                 * descriptors in its list... dns, modules, users,

diff --git a/src/modules/m_safelist.cpp b/src/modules/m_safelist.cpp
index 06c7ef34806bd9b1042dbe6e02978df5829a0ad6..b89cbec02dcdb76fa0e62618e7108166f8666958 100644 (file)
--- a/src/modules/m_safelist.cpp
+++ b/src/modules/m_safelist.cpp
@@ -45,13 +45,72 @@ class ListTimer : public InspTimer
  private:
        Server* Srv;
  public:
-       ListTimer(long interval, Server* Me) : InspTimer(interval), Srv(Me)
+       ListTimer(long interval, Server* Me) : InspTimer(interval,TIME), Srv(Me)
        {
        }
 
        virtual void Tick(time_t TIME)
        {
                log(DEBUG,"*** Timer tick!");
+
+                bool go_again = true;
+                chanrec *chan;
+                char buffer[MAXBUF];
+
+                while (go_again)
+                {
+                        go_again = false;
+                        for (UserList::iterator iter = listusers.begin(); iter != listusers.end(); iter++)
+                        {
+                                /*
+                                 * What we do here:
+                                 *  - Get where they are up to
+                                 *  - If it's > GetChannelCount, erase them from the iterator, set go_again to true
+                                 *  - If not, spool the next 20 channels
+                                 */
+                                userrec* u = (userrec*)(*iter);
+                                ListData* ld = (ListData*)u->GetExt("safelist_cache");
+                                if (ld->list_position > Srv->GetChannelCount())
+                                {
+                                        u->Shrink("safelist_cache");
+                                        delete ld;
+                                        listusers.erase(iter);
+                                        go_again = true;
+                                        break;
+                                }
+
+                                log(DEBUG, "m_safelist.so: resuming spool of list to client %s at channel %ld", u->nick, ld->list_position);
+                                chan = NULL;
+                                /* Attempt to fill up to half the user's sendq with /LIST output */
+                                long amount_sent = 0;
+                                do
+                                {
+                                        log(DEBUG,"Channel %ld",ld->list_position);
+                                        chan = Srv->GetChannelIndex(ld->list_position);
+                                        /* spool details */
+                                        if (chan)
+                                        {
+                                                /* Increment total plus linefeed */
+                                                int counter = snprintf(buffer,MAXBUF,"322 %s %s %d :[+%s] %s",u->nick,chan->name,usercount_i(chan),chanmodes(chan,has_channel(u,chan)),chan->topic);
+                                                amount_sent += counter + 4 + Srv->GetServerName().length();
+                                                log(DEBUG,"m_safelist.so: Sent %ld of safe %ld / 2",amount_sent,u->sendqmax);
+                                                WriteServ_NoFormat(u->fd,buffer);
+                                        }
+                                        else
+                                        {
+                                                if (!ld->list_ended)
+                                                {
+                                                        ld->list_ended = true;
+                                                        WriteServ(u->fd,"323 %s :End of channel list.",u->nick);
+                                                }
+                                        }
+
+                                        ld->list_position++;
+                                }
+                                while ((chan != NULL) && (amount_sent < (u->sendqmax / 2)));
+                        }
+                }
+
                ListTimer* MyTimer = new ListTimer(1,Srv);
                Srv->AddTimer(MyTimer);
        }
@@ -83,7 +142,7 @@ class ModuleSafeList : public Module
  
        void Implements(char* List)
        {
-               List[I_OnPreCommand] = List[I_OnBackgroundTimer] = List[I_OnCleanup] = List[I_OnUserQuit] = List[I_On005Numeric] = 1;
+               List[I_OnPreCommand] List[I_OnCleanup] = List[I_OnUserQuit] = List[I_On005Numeric] = 1;
        }
 
        /*
@@ -103,71 +162,6 @@ class ModuleSafeList : public Module
                return 0;
        }
        
-       /*
-        * OnBackgroundTimer()
-        *   Spool off safelist information to users currently doing /list.
-        */
-       virtual void OnBackgroundTimer(time_t curtime)
-       {
-               bool go_again = true;
-               chanrec *chan;
-               char buffer[MAXBUF];
- 
-               while (go_again)
-               {
-                       go_again = false;
-                       for (UserList::iterator iter = listusers.begin(); iter != listusers.end(); iter++)
-                       {
-                               /*
-                                * What we do here:
-                                *  - Get where they are up to
-                                *  - If it's > GetChannelCount, erase them from the iterator, set go_again to true
-                                *  - If not, spool the next 20 channels
-                                */
-                               userrec* u = (userrec*)(*iter);
-                               ListData* ld = (ListData*)u->GetExt("safelist_cache");
-                               if (ld->list_position > Srv->GetChannelCount())
-                               {
-                                       u->Shrink("safelist_cache");
-                                       delete ld;
-                                       listusers.erase(iter);
-                                       go_again = true;
-                                       break;
-                               }
-        
-                               log(DEBUG, "m_safelist.so: resuming spool of list to client %s at channel %ld", u->nick, ld->list_position);
-                               chan = NULL;
-                               /* Attempt to fill up to half the user's sendq with /LIST output */
-                               long amount_sent = 0;
-                               do
-                               {
-                                       log(DEBUG,"Channel %ld",ld->list_position);
-                                       chan = Srv->GetChannelIndex(ld->list_position);
-                                       /* spool details */
-                                       if (chan)
-                                       {
-                                               /* Increment total plus linefeed */
-                                               int counter = snprintf(buffer,MAXBUF,"322 %s %s %d :[+%s] %s",u->nick,chan->name,usercount_i(chan),chanmodes(chan,has_channel(u,chan)),chan->topic);
-                                               amount_sent += counter + 4 + Srv->GetServerName().length();
-                                               log(DEBUG,"m_safelist.so: Sent %ld of safe %ld / 2",amount_sent,u->sendqmax);
-                                               WriteServ_NoFormat(u->fd,buffer);
-                                       }
-                                       else
-                                       {
-                                               if (!ld->list_ended)
-                                               {
-                                                       ld->list_ended = true;
-                                                       WriteServ(u->fd,"323 %s :End of channel list.",u->nick);
-                                               }
-                                       }
-
-                                       ld->list_position++;
-                               }
-                               while ((chan != NULL) && (amount_sent < (u->sendqmax / 2)));
-                       }
-               }
-       }
- 
        /*
         * HandleList()
         *   Handle (override) the LIST command.

diff --git a/src/timer.cpp b/src/timer.cpp
index 31c2c6a1397b1270c4f46dc08e94df15648eb1de..b804920e523fe057b2632e976354bcac067e0179 100644 (file)
--- a/src/timer.cpp
+++ b/src/timer.cpp
@@ -30,7 +30,6 @@ using namespace std;
 #include <iostream>
 #include <fstream>
 #include <stdexcept>
-#include "timer.h"
 #include "inspircd.h"
 #include "inspircd_io.h"
 #include "inspstring.h"
@@ -50,21 +49,17 @@ void TickTimers(time_t TIME)
 
        if (found != Timers.end())
        {
-               log(DEBUG,"timer.cpp: There are timers to trigger");
                timergroup* x = found->second;
                /*
                 * There are pending timers to trigger
                 */
                for (timergroup::iterator y = x->begin(); y != x->end(); y++)
                {
-                       log(DEBUG,"timer.cpp: Triggering a timer");
                        InspTimer* n = (InspTimer*)*y;
                        n->Tick(TIME);
-                       log(DEBUG,"timer.cpp: TICK!");
                        delete n;
                }
 
-               log(DEBUG,"timer.cpp: Done triggering timers, tidying up");
                Timers.erase(found);
                delete x;
        }
@@ -72,20 +67,16 @@ void TickTimers(time_t TIME)
 
 void AddTimer(InspTimer* T)
 {
-       log(DEBUG,"timer.cpp: Adding timer");
-       
        timergroup* x = NULL;
 
        timerlist::iterator found = Timers.find(T->GetTimer());
        
        if (found != Timers.end())
        {
-               log(DEBUG,"timer.cpp: Add timer to existing group");
                x = found->second;
        }
        else
        {
-               log(DEBUG,"timer.cpp: Add timer to new group");
                x = new timergroup;
                Timers[T->GetTimer()] = x;
        }