mirror of
https://github.com/inspircd/inspircd.git
synced 2025-03-10 02:59:01 -04:00
-Fix x64 builds for Windows. Now all configurations compile. -Remove the non-working rebase stuff. -Remove the Windows fork hack and instead use FreeConsole() to emulate the behavior. This directly allows us to compile with ASLR, which is turned on now. -Remove the old IPC mechanism for the removed GUI. This is not needed anymore as the GUI wasn't ever supported on anything newer than 1.2 -Remove the WIN32/WINDOWS macros. _WIN32 is supported on all x86-based VC++ targets, so that's what we need. -Enable optimizations for release builds. -De-duplicate printf_c(), it was previously copy-pasted into colors.h for configure -Add the VC++ specific bad files in .gitignore -Disable PID writing on Windows. This is only making sense for *nix builds. -Replace the CPU usage retrieval with an algorithm analogous to the *nix behavior. Also supports separated now/total values. (Tested with a dummy busy loop - seems working) -Removed certain unused functions and variables -Remove stdint defines from the windows wrapper -Remove CRT debug alloc. This is a bad idea as it would define a macro to replace free which breaks builds. -Re-evaluated the warnings list, commented it. -Moved inspircd_config/_version to include/ to match *nix -Removed the creation of inspircd_se_config, as it isn't used at all. -Made non-git builds show as "r0" instead of "r" (thanks to @SaberUK for pointing this out) -Fixed up m_spanningtree's project paths. Now all configurations (debug/release x86/x64) have been tested and build properly. -Moved FindDNS out of the wrapper and matched its log behavior with *nix. (It's pointless having it in the wrapper after the recent slimming down) -Replaced random/srandom wrappers with a mechanism that tries to use Windows' Random API first is no SSL module is loaded. -Removed more old junk from support for compilers older than VC++ 2010 (we don't have project files for these, so compiling them would be hard anyways) -Removed the unused ClearConsole() -Removed unused includes from the wrapper. Also, do not include psapi.h here if we don't link psapi.lib. This should be done where appropriate. -Made inet_aton an inline function for increased performance -C4800, performance warning about bool forcing, resolved at all occurrences. -C4701, uninitialized variable 'cached', resolved at all occurrences. -dlerror() was migrated out of the wrapper for more thread safety (no global buffer being shared) and increased performance. -Removed the wrong CRT debug flags. This drains a lot of performance. -Removed the clock_gettime/gettimeofday wrappers -Replaced all TCHAR/ANSI mix-ups of functions with the correct respective function. -Added a block of C4355 for < VS2012 -Update project files for c870714
178 lines
3.6 KiB
C++
178 lines
3.6 KiB
C++
/*
|
|
* InspIRCd -- Internet Relay Chat Daemon
|
|
*
|
|
* Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
|
|
* Copyright (C) 2008 Craig Edwards <craigedwards@brainbox.cc>
|
|
*
|
|
* This file is part of InspIRCd. InspIRCd is free software: you can
|
|
* redistribute it and/or modify it under the terms of the GNU General Public
|
|
* License as published by the Free Software Foundation, version 2.
|
|
*
|
|
* This program is distributed in the hope that it will be useful, but WITHOUT
|
|
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
|
|
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
|
|
* details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
|
|
#ifndef THREADENGINE_H
|
|
#define THREADENGINE_H
|
|
|
|
#include <vector>
|
|
#include <string>
|
|
#include <map>
|
|
#include "inspircd_config.h"
|
|
#include "base.h"
|
|
|
|
class ThreadData;
|
|
|
|
/** Derive from this class to implement your own threaded sections of
|
|
* code. Be sure to keep your code thread-safe and not prone to deadlocks
|
|
* and race conditions if you MUST use threading!
|
|
*/
|
|
class CoreExport Thread
|
|
{
|
|
private:
|
|
/** Set to true when the thread is to exit
|
|
*/
|
|
bool ExitFlag;
|
|
protected:
|
|
/** Get thread's current exit status.
|
|
* (are we being asked to exit?)
|
|
*/
|
|
bool GetExitFlag()
|
|
{
|
|
return ExitFlag;
|
|
}
|
|
public:
|
|
/** Opaque thread state managed by threading engine
|
|
*/
|
|
ThreadData* state;
|
|
|
|
/** Set Creator to NULL at this point
|
|
*/
|
|
Thread() : ExitFlag(false), state(NULL)
|
|
{
|
|
}
|
|
|
|
/* If the thread is running, you MUST join BEFORE deletion */
|
|
virtual ~Thread();
|
|
|
|
/** Override this method to put your actual
|
|
* threaded code here.
|
|
*/
|
|
virtual void Run() = 0;
|
|
|
|
/** Signal the thread to exit gracefully.
|
|
*/
|
|
virtual void SetExitFlag();
|
|
|
|
/** Join the thread (calls SetExitFlag and waits for exit)
|
|
*/
|
|
void join();
|
|
};
|
|
|
|
|
|
class CoreExport QueuedThread : public Thread
|
|
{
|
|
ThreadQueueData queue;
|
|
protected:
|
|
/** Waits for an enqueue operation to complete
|
|
* You MUST hold the queue lock when you call this.
|
|
* It will be unlocked while you wait, and will be relocked
|
|
* before the function returns
|
|
*/
|
|
void WaitForQueue()
|
|
{
|
|
queue.Wait();
|
|
}
|
|
public:
|
|
/** Lock queue.
|
|
*/
|
|
void LockQueue()
|
|
{
|
|
queue.Lock();
|
|
}
|
|
/** Unlock queue.
|
|
*/
|
|
void UnlockQueue()
|
|
{
|
|
queue.Unlock();
|
|
}
|
|
/** Unlock queue and wake up worker
|
|
*/
|
|
void UnlockQueueWakeup()
|
|
{
|
|
queue.Wakeup();
|
|
queue.Unlock();
|
|
}
|
|
virtual void SetExitFlag()
|
|
{
|
|
queue.Lock();
|
|
Thread::SetExitFlag();
|
|
queue.Wakeup();
|
|
queue.Unlock();
|
|
}
|
|
};
|
|
|
|
class CoreExport SocketThread : public Thread
|
|
{
|
|
ThreadQueueData queue;
|
|
ThreadSignalData signal;
|
|
protected:
|
|
/** Waits for an enqueue operation to complete
|
|
* You MUST hold the queue lock when you call this.
|
|
* It will be unlocked while you wait, and will be relocked
|
|
* before the function returns
|
|
*/
|
|
void WaitForQueue()
|
|
{
|
|
queue.Wait();
|
|
}
|
|
public:
|
|
/** Notifies parent by making the SignalFD ready to read
|
|
* No requirements on locking
|
|
*/
|
|
void NotifyParent();
|
|
SocketThread();
|
|
virtual ~SocketThread();
|
|
/** Lock queue.
|
|
*/
|
|
void LockQueue()
|
|
{
|
|
queue.Lock();
|
|
}
|
|
/** Unlock queue.
|
|
*/
|
|
void UnlockQueue()
|
|
{
|
|
queue.Unlock();
|
|
}
|
|
/** Unlock queue and send wakeup to worker
|
|
*/
|
|
void UnlockQueueWakeup()
|
|
{
|
|
queue.Wakeup();
|
|
queue.Unlock();
|
|
}
|
|
virtual void SetExitFlag()
|
|
{
|
|
queue.Lock();
|
|
Thread::SetExitFlag();
|
|
queue.Wakeup();
|
|
queue.Unlock();
|
|
}
|
|
|
|
/**
|
|
* Called in the context of the parent thread after a notification
|
|
* has passed through the socket
|
|
*/
|
|
virtual void OnNotify() = 0;
|
|
};
|
|
|
|
#endif
|
|
|