Revert "refactor: App use Uniqueprt for SocketMultiplexer"
This reverts commit 4d738b4784.
This commit is contained in:
@ -11,7 +11,6 @@
|
||||
#include "base/Log.h"
|
||||
#include "common/Common.h"
|
||||
#include "deskflow/IApp.h"
|
||||
#include "net/SocketMultiplexer.h"
|
||||
|
||||
#if SYSAPI_WIN32
|
||||
#include "deskflow/win32/AppUtilWindows.h"
|
||||
@ -19,7 +18,6 @@
|
||||
#include "deskflow/unix/AppUtilUnix.h"
|
||||
#endif
|
||||
|
||||
#include <memory>
|
||||
#include <stdexcept>
|
||||
|
||||
namespace deskflow {
|
||||
@ -93,14 +91,14 @@ public:
|
||||
{
|
||||
m_events = &events;
|
||||
}
|
||||
void setSocketMultiplexer(std::unique_ptr<SocketMultiplexer> &&sm)
|
||||
void setSocketMultiplexer(SocketMultiplexer *sm)
|
||||
{
|
||||
m_socketMultiplexer = std::move(sm);
|
||||
m_socketMultiplexer = sm;
|
||||
}
|
||||
|
||||
SocketMultiplexer *getSocketMultiplexer() const
|
||||
{
|
||||
return m_socketMultiplexer.get();
|
||||
return m_socketMultiplexer;
|
||||
}
|
||||
|
||||
static App &instance()
|
||||
@ -121,7 +119,7 @@ private:
|
||||
static App *s_instance;
|
||||
FileLogOutputter *m_fileLog = nullptr;
|
||||
ARCH_APP_UTIL m_appUtil;
|
||||
std::unique_ptr<SocketMultiplexer> m_socketMultiplexer;
|
||||
SocketMultiplexer *m_socketMultiplexer = nullptr;
|
||||
};
|
||||
|
||||
#if WINAPI_MSWINDOWS
|
||||
|
||||
@ -372,7 +372,8 @@ int ClientApp::mainLoop()
|
||||
{
|
||||
// create socket multiplexer. this must happen after daemonization
|
||||
// on unix because threads evaporate across a fork().
|
||||
setSocketMultiplexer(std::make_unique<SocketMultiplexer>());
|
||||
SocketMultiplexer multiplexer;
|
||||
setSocketMultiplexer(&multiplexer);
|
||||
|
||||
// start client, etc
|
||||
appUtil().startNode();
|
||||
|
||||
@ -574,7 +574,8 @@ int ServerApp::mainLoop()
|
||||
{
|
||||
// create socket multiplexer. this must happen after daemonization
|
||||
// on unix because threads evaporate across a fork().
|
||||
setSocketMultiplexer(std::make_unique<SocketMultiplexer>());
|
||||
SocketMultiplexer multiplexer;
|
||||
setSocketMultiplexer(&multiplexer);
|
||||
|
||||
// if configuration has no screens then add this system
|
||||
// as the default
|
||||
|
||||
Reference in New Issue
Block a user