InspIRCd* SI = NULL;
int* mysig = NULL;
+/** Seperate from the other casemap tables so that code *can* still exclusively rely on RFC casemapping
+ * if it must.
+ *
+ * This is provided as a pointer so that modules can change it to their custom mapping tables,
+ * e.g. for national character support.
+ */
+unsigned const char *national_case_insensitive_map = rfc_case_insensitive_map;
+
/* Moved from exitcodes.h -- due to duplicate symbols -- Burlex
* XXX this is a bit ugly. -- w00t
"CreateEvent failed" /* 19 */
};
+template<typename T> void DeleteZero(T* n)
+{
+ if (n != NULL)
+ {
+ delete n;
+ n = NULL;
+ }
+}
+
void InspIRCd::Cleanup()
{
if (Config)
for(servernamelist::iterator itr = servernames.begin(); itr != servernames.end(); ++itr)
delete (*itr);
- /* 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
- if (this->Users)
- {
- delete this->Users;
- this->Users = 0;
- }
-
- if (this->Modes)
- {
- delete this->Modes;
- this->Modes = 0;
- }
-
- if (this->XLines)
- {
- delete this->XLines;
- this->XLines = 0;
- }
-
- if (this->Parser)
- {
- delete this->Parser;
- this->Parser = 0;
-
- if (this->stats)
- {
- delete this->stats;
- this->stats = 0;
- }
-
- if (this->Modules)
- {
- delete this->Modules;
- this->Modules = 0;
- }
-
- if (this->BanCache)
- delete this->BanCache;
- this->BanCache = 0;
- }
-
- if (this->SNO)
- {
- delete this->SNO;
- this->SNO = 0;
- }
-
- if (this->Config)
- {
- delete this->Config;
- this->Config = 0;
- }
-
- if (this->Res)
- {
- delete this->Res;
- this->Res = 0;
- }
-
- if (this->chanlist)
- {
- delete chanlist;
- chanlist = 0;
- }
-
- if (this->PI)
- {
- delete this->PI;
- this->PI = 0;
- }
-
- if (this->Threads)
- {
- delete this->Threads;
- this->Threads = 0;
- }
-
- /* Needs to be deleted after Res, DNS has a timer */
- if (this->Timers)
- {
- delete this->Timers;
- this->Timers = 0;
- }
-
+ /* 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 */
+ DeleteZero(this->Users);
+ DeleteZero(this->Modes);
+ DeleteZero(this->XLines);
+ DeleteZero(this->Parser);
+ DeleteZero(this->stats);
+ DeleteZero(this->Modules);
+ DeleteZero(this->BanCache);
+ DeleteZero(this->SNO);
+ DeleteZero(this->Config);
+ DeleteZero(this->Res);
+ DeleteZero(this->chanlist);
+ DeleteZero(this->PI);
+ DeleteZero(this->Threads);
+ DeleteZero(this->Timers);
/* Close logging */
this->Logs->CloseLogs();
+ DeleteZero(this->Logs);
- if (this->Logs)
- {
- delete this->Logs;
- this->Logs = 0;
- }
+ delete RehashFinishMutex;
}
void InspIRCd::Restart(const std::string &reason)
if (!ServerConfig::FileExists(this->ConfigFileName))
{
- printf("ERROR: Cannot open config file: %s\nExiting...\n", this->ConfigFileName);
- this->Logs->Log("STARTUP",DEFAULT,"Unable to open config file %s", this->ConfigFileName);
- Exit(EXIT_STATUS_CONFIG);
+#ifdef WIN32
+ /* Windows can (and defaults to) hide file extensions, so let's play a bit nice for windows users. */
+ if (ServerConfig::FileExists(this->ConfigFileName + ".txt"))
+ {
+ strlcat(this->ConfigFileName, ".txt", MAXBUF);
+ }
+ else
+#endif
+ {
+ printf("ERROR: Cannot open config file: %s\nExiting...\n", this->ConfigFileName);
+ this->Logs->Log("STARTUP",DEFAULT,"Unable to open config file %s", this->ConfigFileName);
+ Exit(EXIT_STATUS_CONFIG);
+ }
}
printf_c("\033[1;32mInspire Internet Relay Chat Server, compiled %s at %s\n",__DATE__,__TIME__);
ConfigThread->Run();
delete ConfigThread;
this->ConfigThread = NULL;
+ /* Switch over logfiles */
+ Logs->OpenFileLogs();
+
+ /** Note: This is safe, the method checks for user == NULL */
+ this->Parser->SetupCommandTable();
this->Res = new DNS(this);
Exit(0);
}
+ RehashFinishMutex = Mutexes->CreateMutex();
+
while (true)
{
#ifndef WIN32
#endif
/* Check if there is a config thread which has finished executing but has not yet been freed */
+ RehashFinishMutex->Lock();
if (this->ConfigThread && this->ConfigThread->GetExitFlag())
{
/* Rehash has completed */
- this->Logs->Log("CONFIG",DEBUG,"Detected ConfigThread exiting, tidying up...");
- /* IMPORTANT: This delete may hang if you fuck up your thread syncronization.
- * It will hang waiting for the ConfigThread to 'join' to avoid race conditons,
- * until the other thread is completed.
- */
- delete ConfigThread;
- ConfigThread = NULL;
+ /* Switch over logfiles */
+ Logs->CloseLogs();
+ Logs->OpenFileLogs();
+
+ this->Logs->Log("CONFIG",DEBUG,"Detected ConfigThread exiting, tidying up...");
/* These are currently not known to be threadsafe, so they are executed outside
* of the thread. It would be pretty simple to move them to the thread Run method
- * once they are known threadsafe with all the correct mutexes in place.
+ * once they are known threadsafe with all the correct mutexes in place. This might
+ * not be worth the effort however as these functions execute relatively quickly
+ * and would not benefit from being within the config read thread.
*
* XXX: The order of these is IMPORTANT, do not reorder them without testing
* thoroughly!!!
User* user = !Config->RehashUserUID.empty() ? FindNick(Config->RehashUserUID) : NULL;
FOREACH_MOD_I(this, I_OnRehash, OnRehash(user, Config->RehashParameter));
this->BuildISupport();
+
+ /* IMPORTANT: This delete may hang if you fuck up your thread syncronization.
+ * It will hang waiting for the ConfigThread to 'join' to avoid race conditons,
+ * until the other thread is completed.
+ */
+ delete ConfigThread;
+ ConfigThread = NULL;
}
+ RehashFinishMutex->Unlock();
/* time() seems to be a pretty expensive syscall, so avoid calling it too much.
* Once per loop iteration is pleanty.
projects / user / henk / code / inspircd.git / blobdiff