void InspIRCd::Rehash(int status)
{
SI->WriteOpers("Rehashing config file %s due to SIGHUP",ServerConfig::CleanFilename(CONFIG_FILE));
- fclose(SI->Config->log_file);
+ SI->CloseLog();
SI->OpenLog(NULL,0);
+ SI->RehashUsersAndChans();
+ FOREACH_MOD_I(SI, I_OnGarbageCollect, OnGarbageCollect());
SI->Config->Read(false,NULL);
FOREACH_MOD_I(SI,I_OnRehash,OnRehash(""));
}
+/** Because hash_map doesnt free its buckets when we delete items (this is a 'feature')
+ * we must occasionally rehash the hash (yes really).
+ * We do this by copying the entries from the old hash to a new hash, causing all
+ * empty buckets to be weeded out of the hash. We dont do this on a timer, as its
+ * very expensive, so instead we do it when the user types /REHASH and expects a
+ * short delay anyway.
+ */
+void InspIRCd::RehashUsersAndChans()
+{
+ user_hash* old_users = this->clientlist;
+ chan_hash* old_chans = this->chanlist;
+
+ this->clientlist = new user_hash();
+ this->chanlist = new chan_hash();
+
+ for (user_hash::const_iterator n = old_users->begin(); n != old_users->end(); n++)
+ this->clientlist->insert(*n);
+
+ delete old_users;
+
+ for (chan_hash::const_iterator n = old_chans->begin(); n != old_chans->end(); n++)
+ this->chanlist->insert(*n);
+
+ delete old_chans;
+}
+
+void InspIRCd::CloseLog()
+{
+ this->Logger->Close();
+}
+
void InspIRCd::SetSignals()
{
signal(SIGALRM, SIG_IGN);
modules.resize(255);
factory.resize(255);
-
+
+ this->clientlist = new user_hash();
+ this->chanlist = new chan_hash();
+
this->Config = new ServerConfig(this);
+
+ this->Config->argv = argv;
+ this->Config->argc = argc;
+
this->Config->opertypes.clear();
this->Config->operclass.clear();
this->SNO = new SnomaskManager(this);
return false;
}
/* Give the module a chance to tidy out all its metadata */
- for (chan_hash::iterator c = this->chanlist.begin(); c != this->chanlist.end(); c++)
+ for (chan_hash::iterator c = this->chanlist->begin(); c != this->chanlist->end(); c++)
{
modules[j]->OnCleanup(TYPE_CHANNEL,c->second);
}
- for (user_hash::iterator u = this->clientlist.begin(); u != this->clientlist.end(); u++)
+ for (user_hash::iterator u = this->clientlist->begin(); u != this->clientlist->end(); u++)
{
modules[j]->OnCleanup(TYPE_USER,u->second);
}
if ((TIME % 3600) == 0)
{
irc::whowas::MaintainWhoWas(this, TIME);
+ this->RehashUsersAndChans();
+ FOREACH_MOD_I(this, I_OnGarbageCollect, OnGarbageCollect());
}
Timers->TickTimers(TIME);
this->DoBackgroundUserStuff(TIME);
void FileLogger::HandleEvent(EventType et, int errornum)
{
this->WriteLogLine("");
- ServerInstance->SE->DelFd(this);
+ if (log)
+ ServerInstance->SE->DelFd(this);
}
void FileLogger::WriteLogLine(const std::string &line)
fcntl(fileno(log), F_SETFL, flags ^ O_NONBLOCK);
if (buffer.size())
fprintf(log,"%s",buffer.c_str());
+
+ ServerInstance->SE->DelFd(this);
+
fflush(log);
fclose(log);
}
+
buffer = "";
- ServerInstance->SE->DelFd(this);
}
FileLogger::FileLogger(InspIRCd* Instance, FILE* logfile) : ServerInstance(Instance), log(logfile), writeops(0)
{
- irc::sockets::NonBlocking(fileno(log));
- this->SetFd(fileno(log));
- buffer = "";
+ if (log)
+ {
+ irc::sockets::NonBlocking(fileno(log));
+ this->SetFd(fileno(log));
+ buffer = "";
+ }
}
FileLogger::~FileLogger()