Add more debug logging of object lifetimes

[user/henk/code/inspircd.git] / src / inspircd.cpp

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index a932b95e10fe9aeabf4bd162527bd12d32d31370..862aa31d093f26276d92e7db82d6c691c8616980 100644 (file)
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -83,11 +83,9 @@ const char* ExitCodes[] =
 
 template<typename T> static void DeleteZero(T*&n)
 {
-       if (n != NULL)
-       {
-               delete n;
-               n = NULL;
-       }
+       T* t = n;
+       n = NULL;
+       delete t;
 }
 
 void InspIRCd::Cleanup()
@@ -111,22 +109,8 @@ void InspIRCd::Cleanup()
                Users->QuitUser(u, "Server shutdown");
        }
 
-       /* We do this more than once, so that any service providers get a
-        * chance to be unhooked by the modules using them, but then get
-        * a chance to be removed themsleves.
-        *
-        * XXX there may be a better way to do this
-        */
-       for (int tries = 0; tries < 4; tries++)
-       {
-               std::vector<std::string> module_names = Modules->GetAllModuleNames(0);
-               for (std::vector<std::string>::iterator k = module_names.begin(); k != module_names.end(); ++k)
-               {
-                       /* Unload all modules, so they get a chance to clean up their listeners */
-                       this->Modules->Unload(k->c_str());
-               }
-               GlobalCulls.Apply();
-       }
+       GlobalCulls.Apply();
+       Modules->UnloadAll();
 
        /* Delete objects dynamically allocated in constructor (destructor would be more appropriate, but we're likely exiting) */
        /* Must be deleted before modes as it decrements modelines */
@@ -273,12 +257,10 @@ bool InspIRCd::DaemonSeed()
                this->Logs->Log("STARTUP",DEFAULT,"Failed to getrlimit()!");
                return false;
        }
-       else
-       {
-               rl.rlim_cur = rl.rlim_max;
-               if (setrlimit(RLIMIT_CORE, &rl) == -1)
+       rl.rlim_cur = rl.rlim_max;
+
+       if (setrlimit(RLIMIT_CORE, &rl) == -1)
                        this->Logs->Log("STARTUP",DEFAULT,"setrlimit() failed, cannot increase coredump size.");
-       }
 
        return true;
 #endif
@@ -286,18 +268,9 @@ bool InspIRCd::DaemonSeed()
 
 void InspIRCd::WritePID(const std::string &filename)
 {
-       std::string fname = (filename.empty() ? "inspircd.pid" : filename);
-       std::replace(fname.begin(), fname.end(), '\\', '/');
-       if ((fname[0] != '/') && (!Config->StartsWithWindowsDriveLetter(filename)))
-       {
-               std::string::size_type pos;
-               std::string confpath = this->ConfigFileName;
-               if ((pos = confpath.rfind("/")) != std::string::npos)
-               {
-                       /* Leaves us with just the path */
-                       fname = confpath.substr(0, pos) + std::string("/") + fname;
-               }
-       }
+       std::string fname(filename);
+       if (fname.empty())
+               fname = "data/inspircd.pid";
        std::ofstream outfile(fname.c_str());
        if (outfile.is_open())
        {
@@ -339,8 +312,8 @@ InspIRCd::InspIRCd(int argc, char** argv) :
 
        ServerInstance = this;
 
-       Extensible::Register(&NICKForced);
-       Extensible::Register(&OperQuit);
+       Extensions.Register(&NICKForced);
+       Extensions.Register(&OperQuit);
 
        FailedPortList pl;
        int do_version = 0, do_nofork = 0, do_debug = 0,
@@ -470,7 +443,6 @@ InspIRCd::InspIRCd(int argc, char** argv) :
        WSAStartup(MAKEWORD(2,0), &wsadata);
        ChangeWindowsSpecificPointers();
 #endif
-       Config->MyExecutable = argv[0];
 
        /* Set the finished argument values */
        Config->nofork = do_nofork;
@@ -800,7 +772,8 @@ int InspIRCd::Run()
                this->SE->DispatchEvents();
 
                /* if any users were quit, take them out */
-               this->GlobalCulls.Apply();
+               GlobalCulls.Apply();
+               AtomicActions.Run();
 
                if (this->s_signal)
                {