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

PIIODevice registration dramatically optimization

Browse Source
This commit is contained in:
Пелипенко Иван
2022-04-30 11:21:57 +03:00
parent 19e4eee222
commit 2bbdbc3ac9
29 changed files with 138 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.0)
cmake_policy(SET CMP0017 NEW) # need include() with .cmake cmake_policy(SET CMP0017 NEW) # need include() with .cmake
project(pip) project(pip)
set(pip_MAJOR 2) set(pip_MAJOR 2)
set(pip_MINOR 37) set(pip_MINOR 38)
set(pip_REVISION 0) set(pip_REVISION 0)
set(pip_SUFFIX ) set(pip_SUFFIX )
set(pip_COMPANY SHS) set(pip_COMPANY SHS)

5
doc/examples/piiodevice.cpp
View File

@@ -3,7 +3,7 @@ void _() {
//! [0] //! [0]
class SomeIO: public PIIODevice { class SomeIO: public PIIODevice {
PIIODEVICE(SomeIO) PIIODEVICE(SomeIO, "myio")
public: public:
SomeIO(): PIIODevice() {} SomeIO(): PIIODevice() {}
protected: protected:
@@ -19,9 +19,8 @@ protected:
// write to your device here // write to your device here
return written_bytes; return written_bytes;
} }
PIString fullPathPrefix() const {return "myio";}
void configureFromFullPath(const PIString & full_path) { void configureFromFullPath(const PIString & full_path) {
// parse full_path and configure device there // parse full_path and configure device here
} }
}; };
REGISTER_DEVICE(SomeIO) REGISTER_DEVICE(SomeIO)

2
libs/main/cloud/picloudclient.h
View File

@@ -34,7 +34,7 @@
class PIP_CLOUD_EXPORT PICloudClient: public PIIODevice, public PICloudBase class PIP_CLOUD_EXPORT PICloudClient: public PIIODevice, public PICloudBase
{ {
PIIODEVICE(PICloudClient) PIIODEVICE(PICloudClient, "")
public: public:
explicit PICloudClient(const PIString & path = PIString(), PIIODevice::DeviceMode mode = PIIODevice::ReadWrite); explicit PICloudClient(const PIString & path = PIString(), PIIODevice::DeviceMode mode = PIIODevice::ReadWrite);
virtual ~PICloudClient(); virtual ~PICloudClient();

4
libs/main/cloud/picloudserver.h
View File

@@ -32,14 +32,14 @@
class PIP_CLOUD_EXPORT PICloudServer: public PIIODevice, public PICloudBase class PIP_CLOUD_EXPORT PICloudServer: public PIIODevice, public PICloudBase
{ {
PIIODEVICE(PICloudServer) PIIODEVICE(PICloudServer, "")
public: public:
//! PICloudServer //! PICloudServer
explicit PICloudServer(const PIString & path = PIString(), PIIODevice::DeviceMode mode = PIIODevice::ReadWrite); explicit PICloudServer(const PIString & path = PIString(), PIIODevice::DeviceMode mode = PIIODevice::ReadWrite);
virtual ~PICloudServer(); virtual ~PICloudServer();
class Client : public PIIODevice { class Client : public PIIODevice {
PIIODEVICE(PICloudServer::Client) PIIODEVICE(PICloudServer::Client, "")
friend class PICloudServer; friend class PICloudServer;
public: public:
Client(PICloudServer * srv = nullptr, uint id = 0); Client(PICloudServer * srv = nullptr, uint id = 0);

12
libs/main/core/piconstchars.cpp
View File

@@ -48,6 +48,18 @@
//! \} //! \}
bool PIConstChars::startsWith(const PIConstChars & str) const {
if (size() < str.size()) return false;
return str == left(str.size());
}
bool PIConstChars::endsWith(const PIConstChars & str) const {
if (size() < str.size()) return false;
return str == right(str.size());
}
PIConstChars PIConstChars::mid(const int start, const int len) const { PIConstChars PIConstChars::mid(const int start, const int len) const {
int s = start, l = len; int s = start, l = len;
if (l == 0 || s >= (int)size() || isEmpty()) return PIConstChars(""); if (l == 0 || s >= (int)size() || isEmpty()) return PIConstChars("");

8
libs/main/core/piconstchars.h
View File

@@ -94,6 +94,14 @@ public:
//! \~russian Возвращает длину строки в символах. //! \~russian Возвращает длину строки в символах.
inline ssize_t size_s() const {return len;} inline ssize_t size_s() const {return len;}
//! \~english Returns if string starts with "str".
//! \~russian Возвращает начинается ли строка со "str".
bool startsWith(const PIConstChars & str) const;
//! \~english Returns if string ends with "str".
//! \~russian Возвращает оканчивается ли строка на "str".
bool endsWith(const PIConstChars & str) const;
//! \~english Returns part of string from character at index "start" and maximum length "len". //! \~english Returns part of string from character at index "start" and maximum length "len".
//! \~russian Возвращает подстроку от символа "start" и максимальной длиной "len". //! \~russian Возвращает подстроку от символа "start" и максимальной длиной "len".
//! \~\sa \a left(), \a right() //! \~\sa \a left(), \a right()

14
libs/main/core/piobject.cpp
View File

@@ -250,7 +250,7 @@ PIStringList PIObject::scopeList() const {
PIMutexLocker ml(__meta_mutex()); PIMutexLocker ml(__meta_mutex());
const PIVector<const char *> & scope(__meta_data()[classNameID()].scope_list); const PIVector<const char *> & scope(__meta_data()[classNameID()].scope_list);
for (const char * c: scope) for (const char * c: scope)
ret = PIStringAscii(c); ret << PIStringAscii(c);
return ret; return ret;
} }
@@ -727,7 +727,7 @@ void PIObject::dump(const PIString & line_prefix) const {
#ifndef MICRO_PIP #ifndef MICRO_PIP
void dumpApplication() { void dumpApplication(bool with_objects) {
PIMutexLocker _ml(PIObject::mutexObjects()); PIMutexLocker _ml(PIObject::mutexObjects());
//printf("dump application ...\n"); //printf("dump application ...\n");
PIDateTime cd = PIDateTime::current(); PIDateTime cd = PIDateTime::current();
@@ -745,22 +745,24 @@ void dumpApplication() {
PICout(PICoutManipulators::AddNewLine) << " uptime: " << PITime::fromSystemTime(cd.toSystemTime() - pi->execDateTime.toSystemTime()).toString(); PICout(PICoutManipulators::AddNewLine) << " uptime: " << PITime::fromSystemTime(cd.toSystemTime() - pi->execDateTime.toSystemTime()).toString();
PICout(PICoutManipulators::AddNewLine) << " PIObjects {"; PICout(PICoutManipulators::AddNewLine) << " PIObjects {";
PICout(PICoutManipulators::AddNewLine) << " count: " << PIObject::objects().size_s(); PICout(PICoutManipulators::AddNewLine) << " count: " << PIObject::objects().size_s();
piForeachC (PIObject * o, PIObject::objects()) if (with_objects) {
o->dump(" "); for (const PIObject * o: PIObject::objects())
o->dump(" ");
}
PICout(PICoutManipulators::AddNewLine) << " }"; PICout(PICoutManipulators::AddNewLine) << " }";
PICout(PICoutManipulators::AddNewLine) << "}"; PICout(PICoutManipulators::AddNewLine) << "}";
//printf("dump application done\n"); //printf("dump application done\n");
} }
bool dumpApplicationToFile(const PIString & path) { bool dumpApplicationToFile(const PIString & path, bool with_objects) {
PIFile f(path + "_tmp"); PIFile f(path + "_tmp");
f.setName("__S__DumpFile"); f.setName("__S__DumpFile");
f.clear(); f.clear();
if (!f.open(PIIODevice::WriteOnly)) return false; if (!f.open(PIIODevice::WriteOnly)) return false;
bool ba = PICout::isBufferActive(); bool ba = PICout::isBufferActive();
PICout::setBufferActive(true, true); PICout::setBufferActive(true, true);
dumpApplication(); dumpApplication(with_objects);
f << PICout::buffer(); f << PICout::buffer();
f.close(); f.close();
PICout::setBufferActive(ba, true); PICout::setBufferActive(ba, true);

6
libs/main/core/piobject.h
View File

@@ -39,7 +39,7 @@ typedef void (*Handler)(void * );
class PIP_EXPORT PIObject { class PIP_EXPORT PIObject {
#ifndef MICRO_PIP #ifndef MICRO_PIP
friend class PIObjectManager; friend class PIObjectManager;
friend void dumpApplication(); friend void dumpApplication(bool);
friend class PIIntrospection; friend class PIIntrospection;
#endif #endif
typedef PIObject __PIObject__; typedef PIObject __PIObject__;
@@ -587,8 +587,8 @@ private:
}; };
#ifndef MICRO_PIP #ifndef MICRO_PIP
PIP_EXPORT void dumpApplication(); PIP_EXPORT void dumpApplication(bool with_objects = true);
PIP_EXPORT bool dumpApplicationToFile(const PIString & path); PIP_EXPORT bool dumpApplicationToFile(const PIString & path, bool with_objects = true);
#endif #endif
#endif // PIOBJECT_H #endif // PIOBJECT_H

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

@@ -791,7 +791,7 @@ void PIBinaryLog::configureFromVariantDevice(const PIPropertyStorage & d) {
} }
void PIBinaryLog::propertyChanged(const PIString &s) { void PIBinaryLog::propertyChanged(const char * s) {
default_id = property("defaultID").toInt(); default_id = property("defaultID").toInt();
rapid_start = property("rapidStart").toBool(); rapid_start = property("rapidStart").toBool();
play_mode = (PlayMode)property("playMode").toInt(); play_mode = (PlayMode)property("playMode").toInt();

5
libs/main/io_devices/pibinarylog.h
View File

@@ -31,7 +31,7 @@
class PIP_EXPORT PIBinaryLog: public PIIODevice class PIP_EXPORT PIBinaryLog: public PIIODevice
{ {
PIIODEVICE(PIBinaryLog) PIIODEVICE(PIBinaryLog, "binlog")
public: public:
explicit PIBinaryLog(); explicit PIBinaryLog();
virtual ~PIBinaryLog(); virtual ~PIBinaryLog();
@@ -288,7 +288,6 @@ public:
static bool cutBinLog(const BinLogInfo & src, const PIString & dst, int from, int to); static bool cutBinLog(const BinLogInfo & src, const PIString & dst, int from, int to);
protected: protected:
PIString fullPathPrefix() const {return PIStringAscii("binlog");}
PIString constructFullPathDevice() const; PIString constructFullPathDevice() const;
void configureFromFullPathDevice(const PIString & full_path); void configureFromFullPathDevice(const PIString & full_path);
PIPropertyStorage constructVariantDevice() const; PIPropertyStorage constructVariantDevice() const;
@@ -297,7 +296,7 @@ protected:
int writeDevice(const void * data, int size) {return writeBinLog(default_id, data, size);} int writeDevice(const void * data, int size) {return writeBinLog(default_id, data, size);}
bool openDevice(); bool openDevice();
bool closeDevice(); bool closeDevice();
void propertyChanged(const PIString &); void propertyChanged(const char * s);
bool threadedRead(uchar *readed, int size); bool threadedRead(uchar *readed, int size);
void threadedReadTerminated() {pausemutex.unlock();} void threadedReadTerminated() {pausemutex.unlock();}
DeviceInfoFlags deviceInfoFlags() const {return PIIODevice::Reliable;} DeviceInfoFlags deviceInfoFlags() const {return PIIODevice::Reliable;}

3
libs/main/io_devices/pican.h
View File

@@ -31,7 +31,7 @@
class PIP_EXPORT PICAN: public PIIODevice class PIP_EXPORT PICAN: public PIIODevice
{ {
PIIODEVICE(PICAN) PIIODEVICE(PICAN, "can")
public: public:
explicit PICAN(const PIString & path = PIString(), PIIODevice::DeviceMode mode = PIIODevice::ReadWrite); explicit PICAN(const PIString & path = PIString(), PIIODevice::DeviceMode mode = PIIODevice::ReadWrite);
virtual ~PICAN(); virtual ~PICAN();
@@ -45,7 +45,6 @@ protected:
bool closeDevice(); bool closeDevice();
int readDevice(void * read_to, int max_size); int readDevice(void * read_to, int max_size);
int writeDevice(const void * data, int max_size); int writeDevice(const void * data, int max_size);
PIString fullPathPrefix() const {return PIStringAscii("can");}
PIString constructFullPathDevice() const; PIString constructFullPathDevice() const;
void configureFromFullPathDevice(const PIString & full_path); void configureFromFullPathDevice(const PIString & full_path);
PIPropertyStorage constructVariantDevice() const; PIPropertyStorage constructVariantDevice() const;

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

@@ -21,6 +21,7 @@
#include "piconfig.h" #include "piconfig.h"
#include "pisysteminfo.h" #include "pisysteminfo.h"
#include "pipropertystorage.h" #include "pipropertystorage.h"
#include "piconstchars.h"
#ifdef QNX #ifdef QNX
# include <net/if.h> # include <net/if.h>
# include <net/if_dl.h> # include <net/if_dl.h>
@@ -919,10 +920,11 @@ bool PIEthernet::configureDevice(const void * e_main, const void * e_parent) {
} }
void PIEthernet::propertyChanged(const PIString & name) { void PIEthernet::propertyChanged(const char * name) {
if (name.endsWith("Timeout")) applyTimeouts(); PIConstChars pn(name);
if (name == "TTL") applyOptInt(IPPROTO_IP, IP_TTL, TTL()); if (pn.endsWith("Timeout")) applyTimeouts();
if (name == "MulticastTTL") applyOptInt(IPPROTO_IP, IP_MULTICAST_TTL, multicastTTL()); if (pn == "TTL") applyOptInt(IPPROTO_IP, IP_TTL, TTL());
if (pn == "MulticastTTL") applyOptInt(IPPROTO_IP, IP_MULTICAST_TTL, multicastTTL());
} }

5
libs/main/io_devices/piethernet.h
View File

@@ -38,7 +38,7 @@ class
class PIP_EXPORT PIEthernet: public PIIODevice class PIP_EXPORT PIEthernet: public PIIODevice
{ {
PIIODEVICE(PIEthernet) PIIODEVICE(PIEthernet, "eth")
friend class PIPeer; friend class PIPeer;
public: public:
@@ -462,9 +462,8 @@ public:
protected: protected:
explicit PIEthernet(int sock, PIString ip_port); explicit PIEthernet(int sock, PIString ip_port);
void propertyChanged(const PIString & name); void propertyChanged(const char * name);
PIString fullPathPrefix() const {return PIStringAscii("eth");}
PIString constructFullPathDevice() const; PIString constructFullPathDevice() const;
void configureFromFullPathDevice(const PIString & full_path); void configureFromFullPathDevice(const PIString & full_path);
PIPropertyStorage constructVariantDevice() const; PIPropertyStorage constructVariantDevice() const;

3
libs/main/io_devices/pifile.h
View File

@@ -32,7 +32,7 @@
class PIP_EXPORT PIFile: public PIIODevice class PIP_EXPORT PIFile: public PIIODevice
{ {
PIIODEVICE(PIFile) PIIODEVICE(PIFile, "file")
public: public:
//! Constructs an empty file //! Constructs an empty file
@@ -289,7 +289,6 @@ public:
//! \} //! \}
protected: protected:
PIString fullPathPrefix() const {return PIStringAscii("file");}
PIString constructFullPathDevice() const; PIString constructFullPathDevice() const;
void configureFromFullPathDevice(const PIString & full_path); void configureFromFullPathDevice(const PIString & full_path);
PIPropertyStorage constructVariantDevice() const; PIPropertyStorage constructVariantDevice() const;

2
libs/main/io_devices/piiobytearray.h
View File

@@ -31,7 +31,7 @@
class PIP_EXPORT PIIOByteArray: public PIIODevice class PIP_EXPORT PIIOByteArray: public PIIODevice
{ {
PIIODEVICE(PIIOByteArray) PIIODEVICE(PIIOByteArray, "")
public: public:
//! Contructs %PIIOByteArray with \"buffer\" content and \"mode\" open mode //! Contructs %PIIOByteArray with \"buffer\" content and \"mode\" open mode

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

@@ -84,7 +84,6 @@
//! //!
//! \section PIIODevice_sec7 Creating devices by unambiguous string //! \section PIIODevice_sec7 Creating devices by unambiguous string
//! There are some virtual functions to describe child class without its declaration. //! There are some virtual functions to describe child class without its declaration.
//! \n \a fullPathPrefix() should returns unique prefix of device
//! \n \a constructFullPath() should returns full unambiguous string, contains prefix and all device parameters //! \n \a constructFullPath() should returns full unambiguous string, contains prefix and all device parameters
//! \n \a configureFromFullPath() provide configuring device from full unambiguous string without prefix and "://" //! \n \a configureFromFullPath() provide configuring device from full unambiguous string without prefix and "://"
//! \n Macro PIIODEVICE should be used instead of PIOBJECT //! \n Macro PIIODEVICE should be used instead of PIOBJECT
@@ -265,15 +264,14 @@ void PIIODevice::write_func() {
} }
PIIODevice * PIIODevice::newDeviceByPrefix(const PIString & prefix) { PIIODevice * PIIODevice::newDeviceByPrefix(const char * prefix) {
if (prefix.isEmpty()) return 0; if (!prefix) return nullptr;
PIVector<const PIObject * > rd(PICollection::groupElements("__PIIODevices__")); PIConstChars p(prefix);
piForeachC (PIObject * d, rd) { for (const auto & i: fabrics()) {
if (prefix == ((const PIIODevice * )d)->fullPathPrefix()) { if (i.first == p)
return ((const PIIODevice * )d)->copy(); return i.second();
}
} }
return 0; return nullptr;
} }
@@ -427,7 +425,7 @@ bool PIIODevice::configure(const PIString & config_file, const PIString & sectio
PIString PIIODevice::constructFullPath() const { PIString PIIODevice::constructFullPath() const {
return fullPathPrefix() + "://" + constructFullPathDevice() + fullPathOptions(); return PIStringAscii(fullPathPrefix()) + PIStringAscii("://") + constructFullPathDevice() + fullPathOptions();
} }
@@ -489,14 +487,21 @@ void PIIODevice::splitFullPath(PIString fpwm, PIString * full_path, DeviceMode *
PIStringList PIIODevice::availablePrefixes() { PIStringList PIIODevice::availablePrefixes() {
PIStringList ret; PIStringList ret;
PIVector<const PIObject * > rd(PICollection::groupElements("__PIIODevices__")); for (const auto & i: fabrics())
piForeachC (PIObject * d, rd) { ret << i.first.toString();
ret << ((const PIIODevice * )d)->fullPathPrefix();
}
return ret; return ret;
} }
void PIIODevice::registerDevice(const char * prefix, PIIODevice * (*fabric)()) {
PIConstChars p(prefix);
if (p.isEmpty()) return;
//printf("registerDevice %s %d %d\n", prefix, p.isEmpty(), fabrics().size());
if (!fabrics().contains(p))
fabrics()[p] = fabric;
}
PIString PIIODevice::fullPathOptions() const { PIString PIIODevice::fullPathOptions() const {
if (mode_ == ReadWrite && options_ == 0) return PIString(); if (mode_ == ReadWrite && options_ == 0) return PIString();
PIString ret(" ("); PIString ret(" (");
@@ -511,8 +516,8 @@ PIString PIIODevice::fullPathOptions() const {
PIIODevice * PIIODevice::createFromFullPath(const PIString & full_path) { PIIODevice * PIIODevice::createFromFullPath(const PIString & full_path) {
PIString prefix = full_path.left(full_path.find(":")); PIString prefix = full_path.left(full_path.find(":"));
PIIODevice * nd = newDeviceByPrefix(prefix); PIIODevice * nd = newDeviceByPrefix(prefix.dataAscii());
if (!nd) return 0; if (!nd) return nullptr;
nd->configureFromFullPath(full_path.mid(prefix.length() + 3)); nd->configureFromFullPath(full_path.mid(prefix.length() + 3));
cacheFullPath(full_path, nd); cacheFullPath(full_path, nd);
return nd; return nd;
@@ -520,8 +525,8 @@ PIIODevice * PIIODevice::createFromFullPath(const PIString & full_path) {
PIIODevice * PIIODevice::createFromVariant(const PIVariantTypes::IODevice & d) { PIIODevice * PIIODevice::createFromVariant(const PIVariantTypes::IODevice & d) {
PIIODevice * nd = newDeviceByPrefix(d.prefix); PIIODevice * nd = newDeviceByPrefix(d.prefix.dataAscii());
if (!nd) return 0; if (!nd) return nullptr;
nd->configureFromVariant(d); nd->configureFromVariant(d);
return nd; return nd;
} }
@@ -550,6 +555,12 @@ void PIIODevice::cacheFullPath(const PIString & full_path, const PIIODevice * d)
} }
PIMap<PIConstChars, PIIODevice * (*)()> & PIIODevice::fabrics() {
static PIMap<PIConstChars, PIIODevice * (*)()> ret;
return ret;
}
bool PIIODevice::threadedRead(uchar *readed, int size) { bool PIIODevice::threadedRead(uchar *readed, int size) {
// piCout << "iodevice threaded read"; // piCout << "iodevice threaded read";
if (ret_func_ != 0) return ret_func_(ret_data_, readed, size); if (ret_func_ != 0) return ret_func_(ret_data_, readed, size);

30
libs/main/io_devices/piiodevice.h
View File

@@ -27,7 +27,6 @@
#define PIIODEVICE_H #define PIIODEVICE_H
#include "piinit.h" #include "piinit.h"
#include "picollection.h"
#include "pitimer.h" #include "pitimer.h"
#include "piqueue.h" #include "piqueue.h"
@@ -42,16 +41,26 @@ typedef bool (*ReadRetFunc)(void * , uchar * , int );
# define REGISTER_DEVICE(class) # define REGISTER_DEVICE(class)
//! \relatesalso PIIODevice \brief Use this macro instead of PIOBJECT when describe your own PIIODevice //! \relatesalso PIIODevice \brief Use this macro instead of PIOBJECT when describe your own PIIODevice
# define PIIODEVICE(class) # define PIIODEVICE(class, "prefix")
#else #else
# define REGISTER_DEVICE(name) ADD_NEW_TO_COLLECTION_WITH_NAME(__PIIODevices__, name, __S__collection_##name##__) # define REGISTER_DEVICE(name) \
# define PIIODEVICE(name) PIOBJECT_SUBCLASS(name, PIIODevice) PIIODevice * copy() const {return new name();} STATIC_INITIALIZER_BEGIN \
PIIODevice::registerDevice(name::fullPathPrefixS(), []()->PIIODevice*{return new name();});\
STATIC_INITIALIZER_END
# define PIIODEVICE(name, prefix) \
PIOBJECT_SUBCLASS(name, PIIODevice) \
PIIODevice * copy() const {return new name();} \
public: \
virtual const char * fullPathPrefix() const {return prefix;} \
static const char * fullPathPrefixS() {return prefix;} \
private:
#endif #endif
class PIP_EXPORT PIIODevice: public PIThread class PIP_EXPORT PIIODevice: public PIThread
{ {
PIOBJECT_SUBCLASS(PIIODevice, PIThread) PIOBJECT_SUBCLASS(PIIODevice, PIThread)
@@ -228,8 +237,10 @@ public:
bool configure(const PIString & config_file, const PIString & section, bool parent_section = false); bool configure(const PIString & config_file, const PIString & section, bool parent_section = false);
//! Reimplement to construct full unambiguous string prefix. \ref PIIODevice_sec7 //! Returns full unambiguous string prefix. \ref PIIODevice_sec7
virtual PIString fullPathPrefix() const {return PIString();} virtual const char * fullPathPrefix() const {return "";}
static const char * fullPathPrefixS() {return "";}
//! Returns full unambiguous string, describes this device, \a fullPathPrefix() + "://" //! Returns full unambiguous string, describes this device, \a fullPathPrefix() + "://"
PIString constructFullPath() const; PIString constructFullPath() const;
@@ -260,6 +271,8 @@ public:
//! Returns fullPath prefixes of all registered devices //! Returns fullPath prefixes of all registered devices
static PIStringList availablePrefixes(); static PIStringList availablePrefixes();
static void registerDevice(const char * prefix, PIIODevice*(*fabric)());
EVENT_HANDLER(bool, open); EVENT_HANDLER(bool, open);
EVENT_HANDLER1(bool, open, const PIString &, _path); EVENT_HANDLER1(bool, open, const PIString &, _path);
@@ -386,7 +399,7 @@ protected:
//! Invoked after hard write thread stop //! Invoked after hard write thread stop
virtual void threadedWriteTerminated() {;} virtual void threadedWriteTerminated() {;}
static PIIODevice * newDeviceByPrefix(const PIString & prefix); static PIIODevice * newDeviceByPrefix(const char * prefix);
void terminate(); void terminate();
@@ -408,6 +421,7 @@ private:
void run(); void run();
void end() {terminate();} void end() {terminate();}
static void cacheFullPath(const PIString & full_path, const PIIODevice * d); static void cacheFullPath(const PIString & full_path, const PIIODevice * d);
static PIMap<PIConstChars, PIIODevice*(*)()> & fabrics();
PITimer timer; PITimer timer;
PITimeMeasurer tm; PITimeMeasurer tm;

2
libs/main/io_devices/piiostring.h
View File

@@ -31,7 +31,7 @@
class PIP_EXPORT PIIOString: public PIIODevice class PIP_EXPORT PIIOString: public PIIODevice
{ {
PIIODEVICE(PIIOString) PIIODEVICE(PIIOString, "")
public: public:
//! Contructs %PIIOString with \"string\" content and \"mode\" open mode //! Contructs %PIIOString with \"string\" content and \"mode\" open mode

3
libs/main/io_devices/pipeer.h
View File

@@ -31,7 +31,7 @@
class PIP_EXPORT PIPeer: public PIIODevice class PIP_EXPORT PIPeer: public PIIODevice
{ {
PIIODEVICE(PIPeer) PIIODEVICE(PIPeer, "peer")
private: private:
class PeerData; class PeerData;
@@ -168,7 +168,6 @@ private:
bool openDevice(); bool openDevice();
bool closeDevice(); bool closeDevice();
PIString fullPathPrefix() const {return PIStringAscii("peer");}
PIString constructFullPathDevice() const; PIString constructFullPathDevice() const;
void configureFromFullPathDevice(const PIString &full_path); void configureFromFullPathDevice(const PIString &full_path);
PIPropertyStorage constructVariantDevice() const; PIPropertyStorage constructVariantDevice() const;

3
libs/main/io_devices/piserial.h
View File

@@ -31,7 +31,7 @@
class PIP_EXPORT PISerial: public PIIODevice class PIP_EXPORT PISerial: public PIIODevice
{ {
PIIODEVICE(PISerial) PIIODEVICE(PISerial, "ser")
public: public:
//! Contructs an empty %PISerial //! Contructs an empty %PISerial
@@ -231,7 +231,6 @@ public:
//! \} //! \}
protected: protected:
PIString fullPathPrefix() const {return PIStringAscii("ser");}
PIString constructFullPathDevice() const; PIString constructFullPathDevice() const;
void configureFromFullPathDevice(const PIString & full_path); void configureFromFullPathDevice(const PIString & full_path);
PIPropertyStorage constructVariantDevice() const; PIPropertyStorage constructVariantDevice() const;

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

@@ -31,7 +31,7 @@
class PIP_EXPORT PISharedMemory: public PIIODevice class PIP_EXPORT PISharedMemory: public PIIODevice
{ {
PIIODEVICE(PISharedMemory) PIIODEVICE(PISharedMemory, "shm")
public: public:
explicit PISharedMemory(); explicit PISharedMemory();
@@ -76,7 +76,6 @@ public:
protected: protected:
bool openDevice(); bool openDevice();
bool closeDevice(); bool closeDevice();
PIString fullPathPrefix() const {return PIStringAscii("shm");}
PIString constructFullPathDevice() const; PIString constructFullPathDevice() const;
void configureFromFullPathDevice(const PIString & full_path); void configureFromFullPathDevice(const PIString & full_path);
PIPropertyStorage constructVariantDevice() const; PIPropertyStorage constructVariantDevice() const;

3
libs/main/io_devices/pispi.h
View File

@@ -31,7 +31,7 @@
class PIP_EXPORT PISPI: public PIIODevice class PIP_EXPORT PISPI: public PIIODevice
{ {
PIIODEVICE(PISPI) PIIODEVICE(PISPI, "spi")
public: public:
explicit PISPI(const PIString & path = PIString(), uint speed_hz = 1000000, PIIODevice::DeviceMode mode = PIIODevice::ReadWrite); explicit PISPI(const PIString & path = PIString(), uint speed_hz = 1000000, PIIODevice::DeviceMode mode = PIIODevice::ReadWrite);
virtual ~PISPI(); virtual ~PISPI();
@@ -67,7 +67,6 @@ protected:
int readDevice(void * read_to, int max_size); int readDevice(void * read_to, int max_size);
int writeDevice(const void * data, int max_size); int writeDevice(const void * data, int max_size);
PIString fullPathPrefix() const {return PIStringAscii("spi");}
PIString constructFullPathDevice() const; PIString constructFullPathDevice() const;
void configureFromFullPathDevice(const PIString & full_path); void configureFromFullPathDevice(const PIString & full_path);
PIPropertyStorage constructVariantDevice() const; PIPropertyStorage constructVariantDevice() const;

3
libs/main/io_devices/pitransparentdevice.h
View File

@@ -31,7 +31,7 @@
class PIP_EXPORT PITransparentDevice: public PIIODevice class PIP_EXPORT PITransparentDevice: public PIIODevice
{ {
PIIODEVICE(PITransparentDevice) PIIODEVICE(PITransparentDevice, "tr")
public: public:
//! Contructs empty %PITransparentDevice //! Contructs empty %PITransparentDevice
@@ -44,7 +44,6 @@ protected:
bool closeDevice(); bool closeDevice();
int readDevice(void * read_to, int max_size); int readDevice(void * read_to, int max_size);
int writeDevice(const void * data, int max_size); int writeDevice(const void * data, int max_size);
PIString fullPathPrefix() const {return PIStringAscii("tr");}
DeviceInfoFlags deviceInfoFlags() const {return PIIODevice::Reliable;} DeviceInfoFlags deviceInfoFlags() const {return PIIODevice::Reliable;}
PIMutex que_mutex; PIMutex que_mutex;

3
libs/main/io_devices/piusb.h
View File

@@ -63,7 +63,7 @@ struct usb_dev_handle;
class PIP_EXPORT PIUSB: public PIIODevice class PIP_EXPORT PIUSB: public PIIODevice
{ {
PIIODEVICE(PIUSB) PIIODEVICE(PIUSB, "usb")
public: public:
explicit PIUSB(ushort vid = 0, ushort pid = 0); explicit PIUSB(ushort vid = 0, ushort pid = 0);
virtual ~PIUSB(); virtual ~PIUSB();
@@ -160,7 +160,6 @@ public:
void flush(); void flush();
protected: protected:
PIString fullPathPrefix() const {return PIStringAscii("usb");}
bool configureDevice(const void * e_main, const void * e_parent = 0); bool configureDevice(const void * e_main, const void * e_parent = 0);
PIString constructFullPathDevice() const; PIString constructFullPathDevice() const;
void configureFromFullPathDevice(const PIString & full_path); void configureFromFullPathDevice(const PIString & full_path);

2
libs/main/io_utils/pidiagnostics.cpp
View File

@@ -225,7 +225,7 @@ PIDiagnostics::Entry PIDiagnostics::calcHistory(PIQueue<Entry> & hist, int & cnt
} }
void PIDiagnostics::propertyChanged(const PIString &) { void PIDiagnostics::propertyChanged(const char *) {
float disct = property("disconnectTimeout").toFloat(); float disct = property("disconnectTimeout").toFloat();
changeDisconnectTimeout(disct); changeDisconnectTimeout(disct);
} }

2
libs/main/io_utils/pidiagnostics.h
View File

@@ -140,7 +140,7 @@ private:
void tick(void *, int); void tick(void *, int);
Entry calcHistory(PIQueue<Entry> & hist, int & cnt); Entry calcHistory(PIQueue<Entry> & hist, int & cnt);
void propertyChanged(const PIString &); void propertyChanged(const char *);
void changeDisconnectTimeout(float disct); void changeDisconnectTimeout(float disct);
PIQueue<Entry> history_rec, history_send; PIQueue<Entry> history_rec, history_send;

2
libs/main/io_utils/pipacketextractor.cpp
View File

@@ -107,7 +107,7 @@ void PIPacketExtractor::construct() {
} }
void PIPacketExtractor::propertyChanged(const PIString &) { void PIPacketExtractor::propertyChanged(const char *) {
packetSize_ = property("packetSize").toInt(); packetSize_ = property("packetSize").toInt();
mode_ = (SplitMode)(property("splitMode").toInt()); mode_ = (SplitMode)(property("splitMode").toInt());
dataSize = property("payloadSize").toInt(); dataSize = property("payloadSize").toInt();

5
libs/main/io_utils/pipacketextractor.h
View File

@@ -33,7 +33,7 @@ typedef bool (*PacketExtractorCheckFunc)(void * , uchar * , uchar * , int );
class PIP_EXPORT PIPacketExtractor: public PIIODevice class PIP_EXPORT PIPacketExtractor: public PIIODevice
{ {
PIIODEVICE(PIPacketExtractor) PIIODEVICE(PIPacketExtractor, "pckext")
friend class PIConnection; friend class PIConnection;
public: public:
@@ -161,11 +161,10 @@ protected:
private: private:
void construct(); void construct();
void propertyChanged(const PIString & ); void propertyChanged(const char *);
int readDevice(void * read_to, int max_size) {if (dev == 0) return -1; return dev->read(read_to, max_size);} int readDevice(void * read_to, int max_size) {if (dev == 0) return -1; return dev->read(read_to, max_size);}
int writeDevice(const void * data, int max_size) {if (dev == 0) return -1; return dev->write(data, max_size);} int writeDevice(const void * data, int max_size) {if (dev == 0) return -1; return dev->write(data, max_size);}
bool threadedRead(uchar * readed, int size); bool threadedRead(uchar * readed, int size);
PIString fullPathPrefix() const {return PIStringAscii("pckext");}
PIString constructFullPathDevice() const; PIString constructFullPathDevice() const;
bool openDevice() {if (dev == 0) return false; return dev->open();} bool openDevice() {if (dev == 0) return false; return dev->open();}
bool closeDevice() {if (dev == 0) return false; return dev->close();} bool closeDevice() {if (dev == 0) return false; return dev->close();}

25
main.cpp
View File

@@ -38,15 +38,38 @@ int main(int argc, char * argv[]) {
cmp(PIConstChars("1a"), PIConstChars("1b")); cmp(PIConstChars("1a"), PIConstChars("1b"));
cmp(PIConstChars("1c"), PIConstChars("1b"));*/ cmp(PIConstChars("1c"), PIConstChars("1b"));*/
PIMap<PIConstChars, int> map; /*PIMap<PIConstChars, int> map;
map[PIConstChars()] = 0; map[PIConstChars()] = 0;
map[PIConstChars()] = -1; map[PIConstChars()] = -1;
map["_2"] = 22; map["_2"] = 22;
map["1"] = 11; map["1"] = 11;
map["__3"] = 33; map["__3"] = 33;
map["10"] = 10; map["10"] = 10;
map[""] = 999;
piCout << map; piCout << map;
piCout << PIConstChars().toString();
piCout << PIConstChars("").toString();
piCout << PIConstChars("str").toString();
PIConstChars s = " 1 2 \t";
piCout << "trim:";
PICout(DefaultControls | AddQuotes) << s.trimmed();
PICout(DefaultControls | AddQuotes) << s;
PICout(DefaultControls | AddQuotes) << s.isEmpty();*/
/*piCout << PIIODevice::availablePrefixes();
auto * d = PIIODevice::createFromFullPath("ser://COM1");
piCout << "";
piCout << d;
d->dump();
d = PIIODevice::createFromFullPath("eth://udp:127.0.0.1:5000");
piCout << "";
piCout << d;
d->dump();*/
piCout << "";
dumpApplication();
return 0; return 0;
auto rstr = PIString::fromUTF8("ascii русский!"); auto rstr = PIString::fromUTF8("ascii русский!");