Remove excessive gettimeofday system calls

[user/henk/code/inspircd.git] / src / modules / m_spanningtree / treeserver.h

diff --git a/src/modules/m_spanningtree/treeserver.h b/src/modules/m_spanningtree/treeserver.h
index 874f78750e50279e221fb7d52b7447ab7c271444..079b6535e8051617212ffc278f156f792fe51afe 100644 (file)
--- a/src/modules/m_spanningtree/treeserver.h
+++ b/src/modules/m_spanningtree/treeserver.h
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -30,7 +30,6 @@
  */
 class TreeServer : public classbase
 {
-       InspIRCd* ServerInstance;               /* Creator */
        TreeServer* Parent;                     /* Parent entry */
        TreeServer* Route;                      /* Route entry */
        std::vector<TreeServer*> Children;      /* List of child objects */
@@ -44,7 +43,6 @@ class TreeServer : public classbase
        bool LastPingWasGood;                   /* True if the server responded to the last PING with a PONG */
        SpanningTreeUtilities* Utils;           /* Utility class */
        std::string sid;                        /* Server ID */
-       bool DupError;                          /* True if the server ID is duplicated (!) */
 
        /** Set server ID
         * @param id Server ID
@@ -53,26 +51,23 @@ class TreeServer : public classbase
        void SetID(const std::string &id);
 
  public:
+       FakeUser* const ServerUser;             /* User representing this server */
+       time_t age;
 
        bool Warned;                            /* True if we've warned opers about high latency on this server */
        bool bursting;                          /* whether or not this server is bursting */
-       
-       /** We don't use this constructor. Its a dummy, and won't cause any insertion
-        * of the TreeServer into the hash_map. See below for the two we DO use.
-        */
-       TreeServer(SpanningTreeUtilities* Util, InspIRCd* Instance, const std::string &id);
 
        /** We use this constructor only to create the 'root' item, Utils->TreeRoot, which
         * represents our own server. Therefore, it has no route, no parent, and
         * no socket associated with it. Its version string is our own local version.
         */
-       TreeServer(SpanningTreeUtilities* Util, InspIRCd* Instance, std::string Name, std::string Desc, const std::string &id);
-       
+       TreeServer(SpanningTreeUtilities* Util, std::string Name, std::string Desc, const std::string &id);
+
        /** When we create a new server, we call this constructor to initialize it.
         * This constructor initializes the server's Route and Parent, and sets up
         * its ping counters so that it will be pinged one minute from now.
         */
-       TreeServer(SpanningTreeUtilities* Util, InspIRCd* Instance, std::string Name, std::string Desc, const std::string &id, TreeServer* Above, TreeSocket* Sock, bool Hide);
+       TreeServer(SpanningTreeUtilities* Util, std::string Name, std::string Desc, const std::string &id, TreeServer* Above, TreeSocket* Sock, bool Hide);
 
        int QuitUsers(const std::string &reason);
 
@@ -114,14 +109,14 @@ class TreeServer : public classbase
         */
        time_t NextPingTime();
 
-       /** Last ping time in microseconds, used to calculate round trip time
+       /** Last ping time in milliseconds, used to calculate round trip time
         */
        unsigned long LastPingMsec;
 
        /** Round trip time of last ping
         */
        unsigned long rtt;
-       
+
        /** When we recieved BURST from this server, used to calculate total burst time at ENDBURST.
         */
        unsigned long StartBurst;
@@ -194,18 +189,16 @@ class TreeServer : public classbase
         */
        std::string& GetID();
 
-       /** True on duplicate server ID (server not usable)
-        */
-       bool DuplicateID();
-
        /** Marks a server as having finished bursting and performs appropriate actions.
         */
        void FinishBurst();
+       /** Recursive call for child servers */
+       void FinishBurstInternal();
 
+       CullResult cull();
        /** Destructor
         */
        ~TreeServer();
-
 };
 
 #endif