edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-09-20 09:34:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

fifoconsole cleanup

Browse source
This commit is contained in:
def 2014-08-29 19:42:34 +02:00
parent 1cf476c1f6
commit 9f4ac93d90
4 changed files with 17 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/engine/client/client.cpp
View file

@ -68,8 +68,6 @@
#undef main #undef main
#endif #endif
bool IsClient = true;
void CGraph::Init(float Min, float Max) void CGraph::Init(float Min, float Max)
{ {
m_Min = Min; m_Min = Min;
@ -3129,7 +3127,7 @@ int main(int argc, const char **argv) // ignore_convention
pClient->Engine()->InitLogfile(); pClient->Engine()->InitLogfile();
#if defined(CONF_FAMILY_UNIX) #if defined(CONF_FAMILY_UNIX)
FifoConsole *fifoConsole = new FifoConsole(pConsole); FifoConsole *fifoConsole = new FifoConsole(pConsole, g_Config.m_ClInputFifo, CFGFLAG_CLIENT);
#endif #endif
// run the client // run the client

4
src/engine/server/server.cpp
View file

@ -42,8 +42,6 @@
#include <windows.h> #include <windows.h>
#endif #endif
bool IsClient = false;
static const char *StrLtrim(const char *pStr) static const char *StrLtrim(const char *pStr)
{ {
while(*pStr) while(*pStr)
@ -2032,7 +2030,7 @@ int main(int argc, const char **argv) // ignore_convention
pEngine->InitLogfile(); pEngine->InitLogfile();
#if defined(CONF_FAMILY_UNIX) #if defined(CONF_FAMILY_UNIX)
FifoConsole *fifoConsole = new FifoConsole(pConsole); FifoConsole *fifoConsole = new FifoConsole(pConsole, g_Config.m_SvInputFifo, CFGFLAG_SERVER);
#endif #endif
// run the server // run the server

32
src/engine/shared/fifoconsole.cpp
View file

@ -10,31 +10,26 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
extern bool IsClient; FifoConsole::FifoConsole(IConsole *pConsole, char *pFifoFile, int flag)
FifoConsole::FifoConsole(IConsole *pConsole)
{ {
void *m_pFifoThread = thread_create(ListenFifoThread, pConsole); void *m_pFifoThread = thread_create(ListenFifoThread, this);
m_pConsole = pConsole;
m_pFifoFile = pFifoFile;
m_flag = flag;
pthread_detach((pthread_t)m_pFifoThread); pthread_detach((pthread_t)m_pFifoThread);
} }
void FifoConsole::ListenFifoThread(void *pUser) void FifoConsole::ListenFifoThread(void *pUser)
{ {
IConsole *pConsole = (IConsole *)pUser; FifoConsole *pData = (FifoConsole *)pUser;
char *fifofile; if (str_comp(pData->m_pFifoFile, "") == 0)
if (IsClient)
fifofile = g_Config.m_ClInputFifo;
else
fifofile = g_Config.m_SvInputFifo;
if (str_comp(fifofile, "") == 0)
return; return;
mkfifo(fifofile, 0600); mkfifo(pData->m_pFifoFile, 0600);
struct stat attribute; struct stat attribute;
stat(fifofile, &attribute); stat(pData->m_pFifoFile, &attribute);
if(!S_ISFIFO(attribute.st_mode)) if(!S_ISFIFO(attribute.st_mode))
return; return;
@ -44,14 +39,9 @@ void FifoConsole::ListenFifoThread(void *pUser)
while (true) while (true)
{ {
f.open(fifofile); f.open(pData->m_pFifoFile);
while (f.getline(aBuf, sizeof(aBuf))) while (f.getline(aBuf, sizeof(aBuf)))
{ pData->m_pConsole->ExecuteLineFlag(aBuf, pData->m_flag, -1);
if (IsClient)
pConsole->ExecuteLineFlag(aBuf, CFGFLAG_CLIENT, -1);
else
pConsole->ExecuteLineFlag(aBuf, CFGFLAG_SERVER, -1);
}
f.close(); f.close();
} }
} }

5
src/engine/shared/fifoconsole.h
View file

@ -8,10 +8,13 @@
class FifoConsole class FifoConsole
{ {
static void ListenFifoThread(void *pUser); static void ListenFifoThread(void *pUser);
IConsole *m_pConsole;
void *m_pFifoThread; void *m_pFifoThread;
char *m_pFifoFile;
int m_flag;
public: public:
FifoConsole(IConsole *pConsole); FifoConsole(IConsole *pConsole, char *pFifoFile, int flag);
}; };
#endif #endif