From 46a9c1b51079cac7dad3bc9ae6c68affb36edcfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D1=8B=D1=87=D0=BA=D0=BE=D0=B2=20=D0=90=D0=BD=D0=B4?= =?UTF-8?q?=D1=80=D0=B5=D0=B9?= Date: Fri, 15 Feb 2019 14:45:32 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@489 a8b55f48-bf90-11e4-a774-851b48703e85 --- cd_utils/cdutils_core.cpp | 12 ++++++++++-- make_libs.bat | 2 +- make_libs_all.bat | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/cd_utils/cdutils_core.cpp b/cd_utils/cdutils_core.cpp index dfa3a53..39fde3e 100644 --- a/cd_utils/cdutils_core.cpp +++ b/cd_utils/cdutils_core.cpp @@ -59,6 +59,9 @@ __Core_Initializer__::~__Core_Initializer__() { CDCore::CDCore() { setName("CDCore"); + sendt.setName("CDCore_send_thread"); + datatr.setName("CDCore_datatransfer"); + x_timer.setName("CDCore_X_timer"); datatr.setPacketSize(960); CONNECTU(&connection, dataReceivedEvent, this, dataReceived); CONNECTU(PICout::Notifier::object(), finished, this, piCoutFinished); @@ -93,11 +96,16 @@ CDCore::CDCore() { CDCore::~CDCore() { + piCout << "~CDCore"; datatr.stop(); + piCout << "~datatr.stop()"; x_timer.stop(); - sendt.stop(); - sendt.waitForFinish(10); + piCout << "~x_timer.stop()"; + sendt.stop(true); + piCout << "~sendt.stop()"; +// sendt.waitForFinish(10); connection.stop(); + piCout << "~connection.stop()"; } diff --git a/make_libs.bat b/make_libs.bat index dd57e1a..6c56dbd 100644 --- a/make_libs.bat +++ b/make_libs.bat @@ -3,4 +3,4 @@ set ARCH=%~1 set PATH=%SDK_MINGW_DIR%%ARCH%\bin;%SDK_QT4_DIR%%ARCH%\bin;%SDK_CMAKE_DIR%\bin if defined SDK_QT5_DIR set Qt5_DIR=%SDK_QT5_DIR%%ARCH% mkdir ..\libs_build_win%ARCH% -cd ../libs_build_win%ARCH% && cmake_mgw -Wno-dev -DQGLVIEW=1 ../libs && make install -j4 && cd ../libs && pause +cd ../libs_build_win%ARCH% && cmake_mgw -Wno-dev -DQGLVIEW=1 ../libs && make install -j16 && cd ../libs && pause diff --git a/make_libs_all.bat b/make_libs_all.bat index b6bd18b..b7ce807 100644 --- a/make_libs_all.bat +++ b/make_libs_all.bat @@ -1,2 +1,2 @@ -start cmd /C make_libs32.bat +:start cmd /C make_libs32.bat start cmd /C make_libs64.bat