SHS/pip
4
3
Fork 0
Code Issues 67 Pull Requests 1 Actions Releases Wiki Activity

more literals, use some in PIP, small refactor PIThread::start (clang-format mistakes)

Browse Source
This commit is contained in:
Пелипенко Иван
2023-07-02 14:02:10 +03:00
parent 54d0ba1876
commit ccae1a7311
15 changed files with 530 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libs/main/io_devices/pibinarylog.cpp
View File

@@ -20,6 +20,7 @@
#include "pibinarylog.h"
#include "pidir.h"
#include "piliterals.h"
#include "pipropertystorage.h"
#define PIBINARYLOG_VERSION_OLD 0x31
@@ -57,7 +58,7 @@ PIBinaryLog::PIBinaryLog() {
#ifdef MICRO_PIP
setThreadedReadBufferSize(512);
#else
setThreadedReadBufferSize(65536);
setThreadedReadBufferSize(64_KiB);
#endif
is_started = is_indexed = is_pause = false;
create_index_on_fly = false;
@@ -67,9 +68,9 @@ PIBinaryLog::PIBinaryLog() {
setPlaySpeed(1.);
setDefaultID(1);
setPlaySpeed(1.0);
setPlayDelay(PISystemTime::fromSeconds(1.0));
setPlayDelay(1_s);
setPlayRealTime();
setSplitTime(PISystemTime(600, 0));
setSplitTime(600_s);
setSplitRecordCount(1000);
setSplitFileSize(0xFFFFFF);
setSplitMode(SplitNone);

9
libs/main/io_devices/piethernet.cpp
View File

@@ -21,6 +21,7 @@
#include "piconfig.h"
#include "piconstchars.h"
#include "piincludes_p.h"
#include "piliterals.h"
#include "pipropertystorage.h"
#include "pisysteminfo.h"
// clang-format off
@@ -167,11 +168,11 @@ void PIEthernet::construct() {
setTTL(64);
setMulticastTTL(1);
server_thread_.setData(this);
server_thread_.setName("__S__server_thread");
server_thread_.setName("__S__server_thread"_a);
#ifdef MICRO_PIP
setThreadedReadBufferSize(512);
#else
setThreadedReadBufferSize(65536);
setThreadedReadBufferSize(64_KiB);
#endif
// setPriority(piHigh);
}
@@ -305,7 +306,7 @@ bool PIEthernet::closeDevice() {
server_thread_.stop();
PRIVATE->event.interrupt();
if (server_thread_.isRunning()) {
if (!server_thread_.waitForFinish(1000)) server_thread_.terminate();
if (!server_thread_.waitForFinish(1_s)) server_thread_.terminate();
}
PRIVATE->event.destroy();
if (sock_s == sock) sock_s = -1;
@@ -487,7 +488,7 @@ bool PIEthernet::listen(bool threaded) {
if (server_thread_.isRunning()) {
if (!server_bounded) return true;
server_thread_.stop();
if (!server_thread_.waitForFinish(100)) server_thread_.terminate();
if (!server_thread_.waitForFinish(100_ms)) server_thread_.terminate();
}
listen_threaded = true;
server_bounded = false;

3
libs/main/io_devices/pigpio.cpp
View File

@@ -28,6 +28,7 @@
# include <fcntl.h>
# include <unistd.h>
#endif
#include "piliterals.h"
//! \class PIGPIO pigpio.h
@@ -71,7 +72,7 @@ PIGPIO::PIGPIO(): PIThread() {}
PIGPIO::~PIGPIO() {
stop();
waitForFinish(100);
waitForFinish(100_ms);
PIMutexLocker ml(mutex);
#ifdef GPIO_SYS_CLASS
PIVector<int> ids = gpio_.keys();

43
libs/main/io_devices/piiodevice.cpp
View File

@@ -21,6 +21,7 @@
#include "piconfig.h"
#include "piconnection.h"
#include "piliterals.h"
#include "pipropertystorage.h"
@@ -311,7 +312,7 @@ void PIIODevice::_init() {
#ifdef MICRO_PIP
threaded_read_buffer_size = 512;
#else
threaded_read_buffer_size = 4096;
threaded_read_buffer_size = 4_KiB;
#endif
read_thread.setName("__S__.PIIODevice.read_thread");
write_thread.setName("__S__.PIIODevice.write_thread");
@@ -471,7 +472,7 @@ bool PIIODevice::configure(const PIString & config_file, const PIString & sectio
PIString PIIODevice::constructFullPath() const {
return fullPathPrefix().toString() + PIStringAscii("://") + constructFullPathDevice() + fullPathOptions();
return fullPathPrefix().toString() + "://"_a + constructFullPathDevice() + fullPathOptions();
}
@@ -511,18 +512,12 @@ void PIIODevice::splitFullPath(PIString fpwm, PIString * full_path, DeviceMode *
PIStringList opts(dms.split(","));
piForeachC(PIString & o, opts) {
// piCout << dms;
if (o == PIStringAscii("r") || o == PIStringAscii("ro") || o == PIStringAscii("read") || o == PIStringAscii("readonly"))
dm |= ReadOnly;
if (o == PIStringAscii("w") || o == PIStringAscii("wo") || o == PIStringAscii("write") || o == PIStringAscii("writeonly"))
dm |= WriteOnly;
if (o == PIStringAscii("br") || o == PIStringAscii("blockr") || o == PIStringAscii("blockread") ||
o == PIStringAscii("blockingread"))
op |= BlockingRead;
if (o == PIStringAscii("bw") || o == PIStringAscii("blockw") || o == PIStringAscii("blockwrite") ||
o == PIStringAscii("blockingwrite"))
op |= BlockingWrite;
if (o == PIStringAscii("brw") || o == PIStringAscii("bwr") || o == PIStringAscii("blockrw") || o == PIStringAscii("blockwr") ||
o == PIStringAscii("blockreadrite") || o == PIStringAscii("blockingreadwrite"))
if (o == "r"_a || o == "ro"_a || o == "read"_a || o == "readonly"_a) dm |= ReadOnly;
if (o == "w"_a || o == "wo"_a || o == "write"_a || o == "writeonly"_a) dm |= WriteOnly;
if (o == "br"_a || o == "blockr"_a || o == "blockread"_a || o == "blockingread"_a) op |= BlockingRead;
if (o == "bw"_a || o == "blockw"_a || o == "blockwrite"_a || o == "blockingwrite"_a) op |= BlockingWrite;
if (o == "brw"_a || o == "bwr"_a || o == "blockrw"_a || o == "blockwr"_a || o == "blockreadrite"_a ||
o == "blockingreadwrite"_a)
op |= BlockingRead | BlockingWrite;
}
fpwm.cutRight(fpwm.length() - fpwm.findLast('(')).trim();
@@ -565,29 +560,29 @@ void PIIODevice::registerDevice(PIConstChars prefix, PIConstChars classname, PII
PIString PIIODevice::fullPathOptions() const {
if (mode_ == ReadWrite && options_ == 0) return PIString();
PIString ret(" (");
PIString ret(" ("_a);
bool f = true;
if (mode_ == ReadOnly) {
if (!f) ret += ",";
if (!f) ret += ","_a;
f = false;
ret += "ro";
ret += "ro"_a;
}
if (mode_ == WriteOnly) {
if (!f) ret += ",";
if (!f) ret += ","_a;
f = false;
ret += "wo";
ret += "wo"_a;
}
if (options_[BlockingRead]) {
if (!f) ret += ",";
if (!f) ret += ","_a;
f = false;
ret += "br";
ret += "br"_a;
}
if (options_[BlockingWrite]) {
if (!f) ret += ",";
if (!f) ret += ","_a;
f = false;
ret += "bw";
ret += "bw"_a;
}
return ret + ")";
return ret + ")"_a;
}

3
libs/main/io_devices/pisharedmemory.cpp
View File

@@ -20,6 +20,7 @@
#include "pisharedmemory.h"
#include "piincludes_p.h"
#include "piliterals.h"
#include "pipropertystorage.h"
#if defined(LINUX) || defined(MAC_OS)
# define SHM_POSIX
@@ -77,7 +78,7 @@ PRIVATE_DEFINITION_END(PISharedMemory)
PISharedMemory::PISharedMemory(): PIIODevice() {
initPrivate();
dsize = 65536;
dsize = 64_KiB;
}