From 1d791be465d6541fd82776032cb3ed1bc7f11072 Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Sat, 21 Oct 2017 19:05:21 +0200 Subject: [PATCH] [DEV] update to the new ETK allocator wrapper --- tools/gateway/appl/GateWay.cpp | 4 ++-- tools/gateway/appl/main-gateway.cpp | 11 ++++++++++- tools/launcher/appl/main-launcher.cpp | 6 ++++++ tools/player-video/appl/Main.cpp | 2 +- tools/router/appl/Router.cpp | 4 ++-- tools/router/appl/main-router.cpp | 6 ++++++ tools/server-remote/appl/Main.cpp | 2 +- zeus/WebServer.cpp | 4 ++-- zeus/message/Answer.cpp | 2 +- zeus/message/Call.cpp | 2 +- zeus/message/Data.cpp | 2 +- zeus/message/Event.cpp | 2 +- zeus/message/Flow.cpp | 2 +- zeus/message/Message.cpp | 2 +- 14 files changed, 36 insertions(+), 15 deletions(-) diff --git a/tools/gateway/appl/GateWay.cpp b/tools/gateway/appl/GateWay.cpp index 4e8fe02..8f5d234 100644 --- a/tools/gateway/appl/GateWay.cpp +++ b/tools/gateway/appl/GateWay.cpp @@ -35,7 +35,7 @@ namespace appl { m_interface.link(); m_threadRunning = true; APPL_INFO("Start waiting on " << _host << " " << _port); - m_thread = new ethread::Thread([&](){ threadCallback();}, "GatewayListening"); + m_thread = ETK_NEW(ethread::Thread, [&](){ threadCallback();}, "GatewayListening"); if (m_thread == nullptr) { m_threadRunning = false; APPL_ERROR("creating callback thread!"); @@ -49,7 +49,7 @@ namespace appl { m_interface.unlink(); if (m_thread != nullptr) { m_thread->join(); - delete m_thread; + ETK_DELETE(ethread::Thread, m_thread); m_thread = nullptr; } } diff --git a/tools/gateway/appl/main-gateway.cpp b/tools/gateway/appl/main-gateway.cpp index 587a1c9..1048c06 100644 --- a/tools/gateway/appl/main-gateway.cpp +++ b/tools/gateway/appl/main-gateway.cpp @@ -8,6 +8,7 @@ #include #include #include +#include #include @@ -246,7 +247,7 @@ int main(int _argc, const char *_argv[]) { } } #endif - + int32_t countMemeCheck = 0; APPL_INFO("=================================="); APPL_INFO("== ZEUS gateway start =="); APPL_INFO("=================================="); @@ -258,6 +259,10 @@ int main(int _argc, const char *_argv[]) { while (routerAlive == true) { ethread::sleepMilliSeconds((100)); basicGateway.cleanIO(); + if (countMemeCheck++ >= 200) { + countMemeCheck = 0; + ETK_MEM_SHOW_LOG(true); + } routerAlive = basicGateway.checkIsAlive(echrono::seconds(routerDisconnectionDelay)); if (routerAlive == false) { APPL_WARNING("Router is Dead or Timeout"); @@ -315,6 +320,10 @@ int main(int _argc, const char *_argv[]) { } else { elog::flush(); ethread::sleepMilliSeconds(1000); + if (countMemeCheck++ >= 20) { + countMemeCheck = 0; + ETK_MEM_SHOW_LOG(true); + } APPL_INFO("gateway in waiting ... " << iii << "/inf"); } iii++; diff --git a/tools/launcher/appl/main-launcher.cpp b/tools/launcher/appl/main-launcher.cpp index e93dadc..da9af82 100644 --- a/tools/launcher/appl/main-launcher.cpp +++ b/tools/launcher/appl/main-launcher.cpp @@ -5,6 +5,7 @@ */ #include +#include #include #include @@ -173,6 +174,7 @@ int main(int _argc, const char *_argv[]) { it->publish(m_client); } uint32_t iii = 0; + int32_t countMemeCheck = 0; while(m_client.isAlive() == true) { m_client.pingIsAlive(); m_client.displayConnectedObject(); @@ -181,6 +183,10 @@ int main(int _argc, const char *_argv[]) { it->peridic_call(); } ethread::sleepMilliSeconds(1000); + if (countMemeCheck++ >= 20) { + countMemeCheck = 0; + ETK_MEM_SHOW_LOG(true); + } APPL_INFO("service in waiting ... " << iii << "/inf"); iii++; } diff --git a/tools/player-video/appl/Main.cpp b/tools/player-video/appl/Main.cpp index e89bcbc..c5e9023 100644 --- a/tools/player-video/appl/Main.cpp +++ b/tools/player-video/appl/Main.cpp @@ -108,6 +108,6 @@ int main(int _argc, const char *_argv[]) { etk::init(_argc, _argv); audio::river::init(); zeus::init(_argc, _argv); - return ewol::run(new appl::MainApplication(), _argc, _argv); + return ewol::run(ETK_NEW(appl::MainApplication)(), _argc, _argv); } diff --git a/tools/router/appl/Router.cpp b/tools/router/appl/Router.cpp index 02d5b5d..d51fc7b 100644 --- a/tools/router/appl/Router.cpp +++ b/tools/router/appl/Router.cpp @@ -87,7 +87,7 @@ namespace appl { m_interface.setPort(_port); m_interface.link(); m_threadRunning = true; - m_thread = new ethread::Thread([&](){ threadCallback();}, "routerListener"); + m_thread = ETK_NEW(ethread::Thread, [&](){ threadCallback();}, "routerListener"); if (m_thread == nullptr) { m_threadRunning = false; ZEUS_ERROR("creating callback thread!"); @@ -101,7 +101,7 @@ namespace appl { m_interface.unlink(); if (m_thread != nullptr) { m_thread->join(); - delete m_thread; + ETK_DELETE(ethread::Thread, m_thread); m_thread = nullptr; } } diff --git a/tools/router/appl/main-router.cpp b/tools/router/appl/main-router.cpp index b9f7174..482564a 100644 --- a/tools/router/appl/main-router.cpp +++ b/tools/router/appl/main-router.cpp @@ -8,6 +8,7 @@ #include #include #include +#include #include @@ -57,9 +58,14 @@ int main(int _argc, const char *_argv[]) { APPL_INFO("== ZEUS router start =="); APPL_INFO("=================================="); basicRouter.start(); + int32_t countMemeCheck = 0; while (true) { ethread::sleepMilliSeconds((100)); basicRouter.cleanIO(); + if (countMemeCheck++ >= 200) { + countMemeCheck = 0; + ETK_MEM_SHOW_LOG(true); + } } basicRouter.stop(); APPL_INFO("=================================="); diff --git a/tools/server-remote/appl/Main.cpp b/tools/server-remote/appl/Main.cpp index 51b180f..85efd35 100644 --- a/tools/server-remote/appl/Main.cpp +++ b/tools/server-remote/appl/Main.cpp @@ -56,6 +56,6 @@ namespace appl { int main(int _argc, const char *_argv[]) { audio::river::init(); zeus::init(_argc, _argv); - return ewol::run(new appl::MainApplication(), _argc, _argv); + return ewol::run(ETK_NEW(appl::MainApplication)(), _argc, _argv); } diff --git a/zeus/WebServer.cpp b/zeus/WebServer.cpp index d4d710b..e35594b 100644 --- a/zeus/WebServer.cpp +++ b/zeus/WebServer.cpp @@ -183,7 +183,7 @@ bool zeus::WebServer::isActive() const { void zeus::WebServer::connect(bool _async){ ZEUS_DEBUG("connect [START]"); m_threadAsyncRunning = true; - m_threadAsync = new ethread::Thread([&](){ threadAsyncCallback();}, "webServerAsync"); + m_threadAsync = ETK_NEW(ethread::Thread, [&](){ threadAsyncCallback();}, "webServerAsync"); if (m_threadAsync == nullptr) { m_threadAsyncRunning = false; ZEUS_ERROR("creating async sender thread!"); @@ -211,7 +211,7 @@ void zeus::WebServer::disconnect(bool _inThreadStop){ m_connection.stop(_inThreadStop); if (m_threadAsync != nullptr) { m_threadAsync->join(); - delete m_threadAsync; + ETK_DELETE(ethread::Thread, m_threadAsync); m_threadAsync = nullptr; } ZEUS_DEBUG("disconnect [STOP]"); diff --git a/zeus/message/Answer.cpp b/zeus/message/Answer.cpp index 0ff22f3..b8632a5 100644 --- a/zeus/message/Answer.cpp +++ b/zeus/message/Answer.cpp @@ -89,6 +89,6 @@ void zeus::message::Answer::appendMessageData(ememory::SharedPtr zeus::message::Answer::create(ememory::SharedPtr _iface) { - return ememory::SharedPtr(new zeus::message::Answer(_iface)); + return ememory::SharedPtr(ETK_NEW(zeus::message::Answer, _iface)); } diff --git a/zeus/message/Call.cpp b/zeus/message/Call.cpp index 8fe5913..d2a2295 100644 --- a/zeus/message/Call.cpp +++ b/zeus/message/Call.cpp @@ -74,5 +74,5 @@ void zeus::message::Call::appendMessageData(ememory::SharedPtr zeus::message::Call::create(ememory::SharedPtr _iface) { - return ememory::SharedPtr(new zeus::message::Call(_iface)); + return ememory::SharedPtr(ETK_NEW(zeus::message::Call, _iface)); } diff --git a/zeus/message/Data.cpp b/zeus/message/Data.cpp index e3e6bdc..34092a7 100644 --- a/zeus/message/Data.cpp +++ b/zeus/message/Data.cpp @@ -71,5 +71,5 @@ void zeus::message::Data::composeWith(const uint8_t* _buffer, uint32_t _lenght) // ------------------------------------------------------------------------------------ ememory::SharedPtr zeus::message::Data::create(ememory::SharedPtr _iface) { - return ememory::SharedPtr(new zeus::message::Data(_iface)); + return ememory::SharedPtr(ETK_NEW(zeus::message::Data, _iface)); } diff --git a/zeus/message/Event.cpp b/zeus/message/Event.cpp index 813bbf3..1367102 100644 --- a/zeus/message/Event.cpp +++ b/zeus/message/Event.cpp @@ -44,6 +44,6 @@ void zeus::message::Event::composeWith(const uint8_t* _buffer, uint32_t _lenght) // ------------------------------------------------------------------------------------ ememory::SharedPtr zeus::message::Event::create(ememory::SharedPtr _iface) { - return ememory::SharedPtr(new zeus::message::Event(_iface)); + return ememory::SharedPtr(ETK_NEW(zeus::message::Event, _iface)); } diff --git a/zeus/message/Flow.cpp b/zeus/message/Flow.cpp index 2f056d2..d89ad0b 100644 --- a/zeus/message/Flow.cpp +++ b/zeus/message/Flow.cpp @@ -16,7 +16,7 @@ // ------------------------------------------------------------------------------------ ememory::SharedPtr zeus::MessageFlow::create() { - return ememory::SharedPtr(new zeus::MessageFlow); + return ememory::SharedPtr(ETK_NEW(zeus::MessageFlow)); } */ diff --git a/zeus/message/Message.cpp b/zeus/message/Message.cpp index d2e195e..888ae81 100644 --- a/zeus/message/Message.cpp +++ b/zeus/message/Message.cpp @@ -190,7 +190,7 @@ enum zeus::message::type zeus::Message::getType() const { // -- Factory // ------------------------------------------------------------------------------------ ememory::SharedPtr zeus::Message::create(ememory::SharedPtr _iface) { - return ememory::SharedPtr(new zeus::Message(_iface)); + return ememory::SharedPtr(ETK_NEW(zeus::Message, _iface)); } ememory::SharedPtr zeus::Message::create(ememory::SharedPtr _iface, const etk::Vector& _buffer) {