diff options
author | danieldg <danieldg@e03df62e-2008-0410-955e-edbf42e46eb7> | 2009-03-23 18:48:32 +0000 |
---|---|---|
committer | danieldg <danieldg@e03df62e-2008-0410-955e-edbf42e46eb7> | 2009-03-23 18:48:32 +0000 |
commit | 7b6eae36661bc798f69b22393b85a4f06d533cf6 (patch) | |
tree | 60ac8fd2eb4f3e09530b3b634fce4ad5ce76e21f /src/configreader.cpp | |
parent | 7f318a332523869a1abb7125c9fe9d09cc048409 (diff) |
ThreadEngine: remove excessive mutex use on thread creation
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11249 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'src/configreader.cpp')
-rw-r--r-- | src/configreader.cpp | 31 |
1 files changed, 14 insertions, 17 deletions
diff --git a/src/configreader.cpp b/src/configreader.cpp index eb5edbb09..6444ee211 100644 --- a/src/configreader.cpp +++ b/src/configreader.cpp @@ -1006,7 +1006,7 @@ void ServerConfig::Read(bool bail, const std::string &useruid) if (!Values[Index].validation_function(this, Values[Index].tag, Values[Index].value, vi)) throw CoreException("One or more values in your configuration file failed to validate. Please see your ircd.log for more information."); - ServerInstance->Threads->Lock(); + // XXX: ServerInstance->Threads->Lock(); switch (dt) { case DT_NOSPACES: @@ -1035,7 +1035,7 @@ void ServerConfig::Read(bool bail, const std::string &useruid) ValueContainerChar* vcc = (ValueContainerChar*)Values[Index].val; if (*(vi.GetString()) && !ServerInstance->IsChannel(vi.GetString(), MAXBUF)) { - ServerInstance->Threads->Unlock(); + // XXX: ServerInstance->Threads->Unlock(); throw CoreException("The value of <"+std::string(Values[Index].tag)+":"+Values[Index].value+"> is not a valid channel name"); } vcc->Set(vi.GetString(), strlen(vi.GetString()) + 1); @@ -1068,7 +1068,7 @@ void ServerConfig::Read(bool bail, const std::string &useruid) } /* We're done with this now */ delete Values[Index].val; - ServerInstance->Threads->Unlock(); + // XXX: ServerInstance->Threads->Unlock(); } /* Read the multiple-tag items (class tags, connect tags, etc) @@ -1077,9 +1077,9 @@ void ServerConfig::Read(bool bail, const std::string &useruid) */ for (int Index = 0; MultiValues[Index].tag; ++Index) { - ServerInstance->Threads->Lock(); + // XXX: ServerInstance->Threads->Lock(); MultiValues[Index].init_function(this, MultiValues[Index].tag); - ServerInstance->Threads->Unlock(); + // XXX: ServerInstance->Threads->Unlock(); int number_of_tags = ConfValueEnum(newconfig, MultiValues[Index].tag); @@ -1094,7 +1094,7 @@ void ServerConfig::Read(bool bail, const std::string &useruid) dt &= ~DT_ALLOW_NEWLINE; dt &= ~DT_ALLOW_WILD; - ServerInstance->Threads->Lock(); + // XXX: ServerInstance->Threads->Lock(); /* We catch and rethrow any exception here just so we can free our mutex */ try @@ -1173,10 +1173,10 @@ void ServerConfig::Read(bool bail, const std::string &useruid) } catch (CoreException &e) { - ServerInstance->Threads->Unlock(); + // XXX: ServerInstance->Threads->Unlock(); throw e; } - ServerInstance->Threads->Unlock(); + // XXX: ServerInstance->Threads->Unlock(); } MultiValues[Index].validation_function(this, MultiValues[Index].tag, (char**)MultiValues[Index].items, vl, MultiValues[Index].datatype); } @@ -1196,7 +1196,7 @@ void ServerConfig::Read(bool bail, const std::string &useruid) return; } - ServerInstance->Threads->Lock(); + // XXX: ServerInstance->Threads->Lock(); for (int i = 0; i < ConfValueEnum(newconfig, "type"); ++i) { char item[MAXBUF], classn[MAXBUF], classes[MAXBUF]; @@ -1239,7 +1239,7 @@ void ServerConfig::Read(bool bail, const std::string &useruid) /* If we succeeded, set the ircd config to the new one */ this->config_data = newconfig; - ServerInstance->Threads->Unlock(); + // XXX: ServerInstance->Threads->Unlock(); // write once here, to try it out and make sure its ok ServerInstance->WritePID(this->PID); @@ -1254,7 +1254,7 @@ void ServerConfig::Read(bool bail, const std::string &useruid) if (pl.size() && !useruid.empty()) { - ServerInstance->Threads->Lock(); + // XXX: ServerInstance->Threads->Lock(); User* user = ServerInstance->FindNick(useruid); if (user) { @@ -1266,10 +1266,10 @@ void ServerConfig::Read(bool bail, const std::string &useruid) user->WriteServ("NOTICE %s :*** %d. Address: %s Reason: %s", user->nick.c_str(), j, i->first.empty() ? "<all>" : i->first.c_str(), i->second.c_str()); } } - ServerInstance->Threads->Unlock(); + // XXX: ServerInstance->Threads->Unlock(); } - ServerInstance->Threads->Lock(); + // XXX: ServerInstance->Threads->Lock(); if (!removed_modules.empty()) { for (std::vector<std::string>::iterator removing = removed_modules.begin(); removing != removed_modules.end(); removing++) @@ -1334,7 +1334,7 @@ void ServerConfig::Read(bool bail, const std::string &useruid) } } } - ServerInstance->Threads->Unlock(); + // XXX: ServerInstance->Threads->Unlock(); } @@ -2372,7 +2372,4 @@ bool DoneELine(ServerConfig* conf, const char* tag) void ConfigReaderThread::Run() { ServerInstance->Config->Read(do_bail, TheUserUID); - ServerInstance->Threads->Lock(); - this->SetExitFlag(); - ServerInstance->Threads->Unlock(); } |