some fixes

This commit is contained in:
2024-09-16 23:32:01 +03:00
parent 43bd1d8550
commit 97aad47a21
3 changed files with 9 additions and 3 deletions

View File

@@ -75,11 +75,15 @@ option(INTROSPECTION "Build with introspection" OFF)
option(TESTS "Build tests and perform their before install step" ${PIP_BUILD_DEBUG}) option(TESTS "Build tests and perform their before install step" ${PIP_BUILD_DEBUG})
option(COVERAGE "Build project with coverage info" OFF) option(COVERAGE "Build project with coverage info" OFF)
set(PIP_UTILS 1) set(PIP_UTILS 1)
set(BUILDING_pip 1 PARENT_SCOPE)
set(pip_ROOT_SRC "${CMAKE_CURRENT_SOURCE_DIR}" PARENT_SCOPE)
set(CMAKE_CXX_STANDARD_REQUIRED TRUE) set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD 11)
shstk_is_parent_exists(_pe)
if (_pe)
set(BUILDING_pip 1 PARENT_SCOPE)
set(pip_ROOT_SRC "${CMAKE_CURRENT_SOURCE_DIR}" PARENT_SCOPE)
endif()
# Basic # Basic
set(PIP_MODULES) set(PIP_MODULES)

View File

@@ -80,8 +80,9 @@ void PIClientServer::ClientBase::init() {
void PIClientServer::ClientBase::destroy() { void PIClientServer::ClientBase::destroy() {
can_write = false;
write_mutex.lock(); write_mutex.lock();
close();
piDeleteSafety(tcp); piDeleteSafety(tcp);
write_mutex.unlock();
// piCout << "Destroyed"; // piCout << "Destroyed";
} }

View File

@@ -120,6 +120,7 @@ void PIStreamPacker::send(const PIByteArray & data) {
void PIStreamPacker::received(const uchar * readed, ssize_t size) { void PIStreamPacker::received(const uchar * readed, ssize_t size) {
if (size <= 0) return;
received(PIByteArray(readed, size)); received(PIByteArray(readed, size));
} }