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

complex macros with ;

Browse Source
This commit is contained in:
Пелипенко Иван
2022-07-25 11:18:09 +03:00
parent a1b9b7e1d6
commit a4882dc054
49 changed files with 137 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
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();
@@ -43,8 +43,8 @@ public:
void setKeepConnection(bool on); void setKeepConnection(bool on);
bool isConnected() const {return is_connected;} bool isConnected() const {return is_connected;}
EVENT(connected) EVENT(connected);
EVENT(disconnected) EVENT(disconnected);
protected: protected:
bool openDevice(); bool openDevice();

6
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);
@@ -65,7 +65,7 @@ public:
PIVector<PICloudServer::Client *> clients() const; PIVector<PICloudServer::Client *> clients() const;
EVENT1(newConnection, PICloudServer::Client * , client) EVENT1(newConnection, PICloudServer::Client * , client);
protected: protected:
bool openDevice(); bool openDevice();

8
libs/main/console/pikbdlistener.h
View File

@@ -33,7 +33,7 @@
class PIP_EXPORT PIKbdListener: public PIThread class PIP_EXPORT PIKbdListener: public PIThread
{ {
PIOBJECT_SUBCLASS(PIKbdListener, PIThread) PIOBJECT_SUBCLASS(PIKbdListener, PIThread);
friend class PIConsole; friend class PIConsole;
friend class PITerminal; friend class PITerminal;
public: public:
@@ -176,9 +176,9 @@ public:
EVENT_HANDLER(void, setActive) {setActive(true);} EVENT_HANDLER(void, setActive) {setActive(true);}
EVENT_HANDLER1(void, setActive, bool, yes); EVENT_HANDLER1(void, setActive, bool, yes);
EVENT2(keyPressed, PIKbdListener::KeyEvent, key, void * , data) EVENT2(keyPressed, PIKbdListener::KeyEvent, key, void * , data);
EVENT2(mouseEvent, PIKbdListener::MouseEvent, mouse, void * , data) EVENT2(mouseEvent, PIKbdListener::MouseEvent, mouse, void * , data);
EVENT2(wheelEvent, PIKbdListener::WheelEvent, wheel, void * , data) EVENT2(wheelEvent, PIKbdListener::WheelEvent, wheel, void * , data);
//! \handlers //! \handlers
//! \{ //! \{

6
libs/main/console/piscreen.h
View File

@@ -33,7 +33,7 @@
class PIP_CONSOLE_EXPORT PIScreen: public PIThread, public PIScreenTypes::PIScreenBase class PIP_CONSOLE_EXPORT PIScreen: public PIThread, public PIScreenTypes::PIScreenBase
{ {
PIOBJECT_SUBCLASS(PIScreen, PIThread) PIOBJECT_SUBCLASS(PIScreen, PIThread);
class SystemConsole; class SystemConsole;
public: public:
@@ -76,8 +76,8 @@ public:
EVENT_HANDLER0(void, stop) {stop(false);} EVENT_HANDLER0(void, stop) {stop(false);}
EVENT_HANDLER1(void, stop, bool, clear); EVENT_HANDLER1(void, stop, bool, clear);
EVENT2(keyPressed, PIKbdListener::KeyEvent, key, void * , data) EVENT2(keyPressed, PIKbdListener::KeyEvent, key, void * , data);
EVENT2(tileEvent, PIScreenTile * , tile, PIScreenTypes::TileEvent, e) EVENT2(tileEvent, PIScreenTile * , tile, PIScreenTypes::TileEvent, e);
//! \handlers //! \handlers
//! \{ //! \{

2
libs/main/console/piscreentile.h
View File

@@ -34,7 +34,7 @@ class PIScreenDrawer;
class PIP_CONSOLE_EXPORT PIScreenTile: public PIObject { class PIP_CONSOLE_EXPORT PIScreenTile: public PIObject {
friend class PIScreen; friend class PIScreen;
PIOBJECT_SUBCLASS(PIScreenTile, PIObject) PIOBJECT_SUBCLASS(PIScreenTile, PIObject);
public: public:
PIScreenTile(const PIString & n = PIString(), PIScreenTypes::Direction d = PIScreenTypes::Vertical, PIScreenTypes::SizePolicy p = PIScreenTypes::Preferred); PIScreenTile(const PIString & n = PIString(), PIScreenTypes::Direction d = PIScreenTypes::Vertical, PIScreenTypes::SizePolicy p = PIScreenTypes::Preferred);
virtual ~PIScreenTile(); virtual ~PIScreenTile();

18
libs/main/console/piscreentiles.h
View File

@@ -31,7 +31,7 @@
class PIP_CONSOLE_EXPORT TileSimple: public PIScreenTile { class PIP_CONSOLE_EXPORT TileSimple: public PIScreenTile {
PIOBJECT_SUBCLASS(TileSimple, PIScreenTile) PIOBJECT_SUBCLASS(TileSimple, PIScreenTile);
public: public:
typedef PIPair<PIString, PIScreenTypes::CellFormat> Row; typedef PIPair<PIString, PIScreenTypes::CellFormat> Row;
TileSimple(const PIString & n = PIString()); TileSimple(const PIString & n = PIString());
@@ -48,7 +48,7 @@ protected:
class TileList; class TileList;
class PIP_CONSOLE_EXPORT TileScrollBar: public PIScreenTile { class PIP_CONSOLE_EXPORT TileScrollBar: public PIScreenTile {
PIOBJECT_SUBCLASS(TileScrollBar, PIScreenTile) PIOBJECT_SUBCLASS(TileScrollBar, PIScreenTile);
friend class TileList; friend class TileList;
public: public:
TileScrollBar(const PIString & n = PIString()); TileScrollBar(const PIString & n = PIString());
@@ -71,7 +71,7 @@ protected:
class PIP_CONSOLE_EXPORT TileList: public PIScreenTile { class PIP_CONSOLE_EXPORT TileList: public PIScreenTile {
PIOBJECT_SUBCLASS(TileList, PIScreenTile) PIOBJECT_SUBCLASS(TileList, PIScreenTile);
public: public:
enum SelectionMode { enum SelectionMode {
NoSelection, NoSelection,
@@ -105,7 +105,7 @@ protected:
class PIP_CONSOLE_EXPORT TileButton: public PIScreenTile { class PIP_CONSOLE_EXPORT TileButton: public PIScreenTile {
PIOBJECT_SUBCLASS(TileButton, PIScreenTile) PIOBJECT_SUBCLASS(TileButton, PIScreenTile);
public: public:
TileButton(const PIString & n = PIString()); TileButton(const PIString & n = PIString());
virtual ~TileButton() {} virtual ~TileButton() {}
@@ -125,7 +125,7 @@ protected:
class PIP_CONSOLE_EXPORT TileButtons: public PIScreenTile { class PIP_CONSOLE_EXPORT TileButtons: public PIScreenTile {
PIOBJECT_SUBCLASS(TileButtons, PIScreenTile) PIOBJECT_SUBCLASS(TileButtons, PIScreenTile);
public: public:
TileButtons(const PIString & n = PIString()); TileButtons(const PIString & n = PIString());
virtual ~TileButtons() {} virtual ~TileButtons() {}
@@ -150,7 +150,7 @@ protected:
class PIP_CONSOLE_EXPORT TileCheck: public PIScreenTile { class PIP_CONSOLE_EXPORT TileCheck: public PIScreenTile {
PIOBJECT_SUBCLASS(TileCheck, PIScreenTile) PIOBJECT_SUBCLASS(TileCheck, PIScreenTile);
public: public:
TileCheck(const PIString & n = PIString()); TileCheck(const PIString & n = PIString());
virtual ~TileCheck() {} virtual ~TileCheck() {}
@@ -169,7 +169,7 @@ protected:
class PIP_CONSOLE_EXPORT TileProgress: public PIScreenTile { class PIP_CONSOLE_EXPORT TileProgress: public PIScreenTile {
PIOBJECT_SUBCLASS(TileProgress, PIScreenTile) PIOBJECT_SUBCLASS(TileProgress, PIScreenTile);
public: public:
TileProgress(const PIString & n = PIString()); TileProgress(const PIString & n = PIString());
virtual ~TileProgress() {} virtual ~TileProgress() {}
@@ -185,7 +185,7 @@ protected:
class PIP_CONSOLE_EXPORT TilePICout: public TileList { class PIP_CONSOLE_EXPORT TilePICout: public TileList {
PIOBJECT_SUBCLASS(TilePICout, PIScreenTile) PIOBJECT_SUBCLASS(TilePICout, PIScreenTile);
public: public:
TilePICout(const PIString & n = PIString()); TilePICout(const PIString & n = PIString());
virtual ~TilePICout() {} virtual ~TilePICout() {}
@@ -198,7 +198,7 @@ protected:
class PIP_CONSOLE_EXPORT TileInput: public PIScreenTile { class PIP_CONSOLE_EXPORT TileInput: public PIScreenTile {
PIOBJECT_SUBCLASS(TileInput, PIScreenTile) PIOBJECT_SUBCLASS(TileInput, PIScreenTile);
public: public:
TileInput(const PIString & n = PIString()); TileInput(const PIString & n = PIString());
virtual ~TileInput() {} virtual ~TileInput() {}

2
libs/main/console/piterminal.h
View File

@@ -33,7 +33,7 @@
class PIP_CONSOLE_EXPORT PITerminal: public PIThread class PIP_CONSOLE_EXPORT PITerminal: public PIThread
{ {
PIOBJECT_SUBCLASS(PITerminal, PIThread) PIOBJECT_SUBCLASS(PITerminal, PIThread);
public: public:
//! Constructs %PITerminal //! Constructs %PITerminal

2
libs/main/core/picout.cpp
View File

@@ -108,7 +108,7 @@ class NotifierObject: public PIObject {
PIOBJECT(NotifierObject) PIOBJECT(NotifierObject)
public: public:
NotifierObject() {} NotifierObject() {}
EVENT2(finished, int, id, PIString*, buffer) EVENT2(finished, int, id, PIString*, buffer);
}; };

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

@@ -49,7 +49,7 @@ class PIP_EXPORT PIObject {
typedef PIObject __PIObject__; typedef PIObject __PIObject__;
typedef void __Parent__; typedef void __Parent__;
public: public:
NO_COPY_CLASS(PIObject) NO_COPY_CLASS(PIObject);
//! \~english Contructs %PIObject with name "name" //! \~english Contructs %PIObject with name "name"
//! \~russian Создает %PIObject с именем "name" //! \~russian Создает %PIObject с именем "name"
@@ -518,7 +518,7 @@ protected:
//! \~russian Виртуальная функция, вызывается после изменения любого свойства. //! \~russian Виртуальная функция, вызывается после изменения любого свойства.
virtual void propertyChanged(const char * name) {} virtual void propertyChanged(const char * name) {}
EVENT1(deleted, PIObject *, o) EVENT1(deleted, PIObject *, o);
//! \events //! \events
//! \{ //! \{

2
libs/main/core/pistring.h
View File

@@ -40,7 +40,7 @@ class PIStringList;
//! \~russian Класс строки. //! \~russian Класс строки.
class PIP_EXPORT PIString class PIP_EXPORT PIString
{ {
BINARY_STREAM_FRIEND(PIString) BINARY_STREAM_FRIEND(PIString);
public: public:
typedef PIDeque<PIChar>::iterator iterator; typedef PIDeque<PIChar>::iterator iterator;
typedef PIDeque<PIChar>::const_iterator const_iterator; typedef PIDeque<PIChar>::const_iterator const_iterator;

2
libs/main/core/pivariant.h
View File

@@ -206,7 +206,7 @@ classname_to __PIVariantFunctions__<classname_from>::castVariant<classname_to>(c
//! \~english Variant type. //! \~english Variant type.
class PIP_EXPORT PIVariant { class PIP_EXPORT PIVariant {
friend PICout operator <<(PICout s, const PIVariant & v); friend PICout operator <<(PICout s, const PIVariant & v);
BINARY_STREAM_FRIEND(PIVariant) BINARY_STREAM_FRIEND(PIVariant);
public: public:
//! Type of %PIVariant content //! Type of %PIVariant content

10
libs/main/crypt/piauth.h
View File

@@ -76,19 +76,19 @@ public:
//! Disconneted event //! Disconneted event
EVENT1(disconnected, PIString, reason) EVENT1(disconnected, PIString, reason);
//! Conneted event //! Conneted event
EVENT1(connected, PIString, info) EVENT1(connected, PIString, info);
//! Client event for authorize new server //! Client event for authorize new server
EVENT2(authorize, PIByteArray, info, bool *, ok) EVENT2(authorize, PIByteArray, info, bool *, ok);
//! Client event for input server password //! Client event for input server password
EVENT1(passwordRequest, PIString *, pass) EVENT1(passwordRequest, PIString *, pass);
//! Server event on check client password //! Server event on check client password
EVENT1(passwordCheck, bool, result) EVENT1(passwordCheck, bool, result);
private: private:
enum Role {Client, Server}; enum Role {Client, Server};

4
libs/main/introspection/piintrospection_server.h
View File

@@ -46,7 +46,7 @@ class PISystemMonitor;
# define PIINTROSPECTION_START(name) PIINTROSPECTION_SERVER->start(#name); # define PIINTROSPECTION_START(name) PIINTROSPECTION_SERVER->start(#name);
class PIP_EXPORT PIIntrospectionServer: public PIPeer { class PIP_EXPORT PIIntrospectionServer: public PIPeer {
PIOBJECT_SUBCLASS(PIIntrospectionServer, PIPeer) PIOBJECT_SUBCLASS(PIIntrospectionServer, PIPeer);
public: public:
static PIIntrospectionServer * instance(); static PIIntrospectionServer * instance();
@@ -55,7 +55,7 @@ public:
private: private:
PIIntrospectionServer(); PIIntrospectionServer();
~PIIntrospectionServer(); ~PIIntrospectionServer();
NO_COPY_CLASS(PIIntrospectionServer) NO_COPY_CLASS(PIIntrospectionServer);
PIString genName(); PIString genName();
virtual void dataReceived(const PIString & from, const PIByteArray & data); virtual void dataReceived(const PIString & from, const PIByteArray & data);

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

@@ -34,7 +34,7 @@
//! \~russian Бинарный лог //! \~russian Бинарный лог
class PIP_EXPORT PIBinaryLog: public PIIODevice class PIP_EXPORT PIBinaryLog: public PIIODevice
{ {
PIIODEVICE(PIBinaryLog, "binlog") PIIODEVICE(PIBinaryLog, "binlog");
public: public:
explicit PIBinaryLog(); explicit PIBinaryLog();
virtual ~PIBinaryLog(); virtual ~PIBinaryLog();
@@ -286,10 +286,10 @@ public:
//! \} //! \}
EVENT_HANDLER(PIString, createNewFile); EVENT_HANDLER(PIString, createNewFile);
EVENT(fileEnd) EVENT(fileEnd);
EVENT(fileError) EVENT(fileError);
EVENT1(newFile, const PIString &, filename) EVENT1(newFile, const PIString &, filename);
EVENT1(posChanged, int, pos) EVENT1(posChanged, int, pos);
//! Get binlog info and statistic //! Get binlog info and statistic
static BinLogInfo getLogInfo(const PIString & path); static BinLogInfo getLogInfo(const PIString & path);

2
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, "can") 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();

8
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, "eth") PIIODEVICE(PIEthernet, "eth");
friend class PIPeer; friend class PIPeer;
public: public:
@@ -317,9 +317,9 @@ public:
int socket() const {return sock;} int socket() const {return sock;}
EVENT1(newConnection, PIEthernet * , client) EVENT1(newConnection, PIEthernet * , client);
EVENT0(connected) EVENT0(connected);
EVENT1(disconnected, bool, withError) EVENT1(disconnected, bool, withError);
//! Flags of network interface //! Flags of network interface

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

@@ -36,7 +36,7 @@
//! \~russian Локальный файл. //! \~russian Локальный файл.
class PIP_EXPORT PIFile: public PIIODevice class PIP_EXPORT PIFile: public PIIODevice
{ {
PIIODEVICE(PIFile, "file") PIIODEVICE(PIFile, "file");
public: public:
//! \~english Constructs file with empty path //! \~english Constructs file with empty path

6
libs/main/io_devices/pigpio.h
View File

@@ -35,7 +35,7 @@
//! \~russian Поддержка GPIO. //! \~russian Поддержка GPIO.
class PIP_EXPORT PIGPIO: public PIThread class PIP_EXPORT PIGPIO: public PIThread
{ {
PIOBJECT_SUBCLASS(PIGPIO, PIThread) PIOBJECT_SUBCLASS(PIGPIO, PIThread);
public: public:
//! \~english Work mode for pin //! \~english Work mode for pin
@@ -82,7 +82,7 @@ public:
//! \~russian Заканчивает наблюдение за всеми пинами //! \~russian Заканчивает наблюдение за всеми пинами
void clearWatch(); void clearWatch();
EVENT2(pinChanged, int, gpio_num, bool, new_value) EVENT2(pinChanged, int, gpio_num, bool, new_value);
//! \events //! \events
//! \{ //! \{
@@ -100,7 +100,7 @@ public:
private: private:
PIGPIO(); PIGPIO();
virtual ~PIGPIO(); virtual ~PIGPIO();
NO_COPY_CLASS(PIGPIO) NO_COPY_CLASS(PIGPIO);
struct PIP_EXPORT GPIOData { struct PIP_EXPORT GPIOData {
GPIOData() {dir = PIGPIO::In; num = fd = -1;} GPIOData() {dir = PIGPIO::In; num = fd = -1;}

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

@@ -35,7 +35,7 @@
//! \~russian Обёртка PIIODevice вокруг PIByteArray //! \~russian Обёртка PIIODevice вокруг PIByteArray
class PIP_EXPORT PIIOByteArray: public PIIODevice class PIP_EXPORT PIIOByteArray: public PIIODevice
{ {
PIIODEVICE(PIIOByteArray, "") PIIODEVICE(PIIOByteArray, "");
public: public:
//! \~english Contructs %PIIOByteArray with "buffer" content and "mode" open mode //! \~english Contructs %PIIOByteArray with "buffer" content and "mode" open mode

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

@@ -79,10 +79,10 @@ typedef bool (*ReadRetFunc)(void * , uchar * , int );
//! \~russian Базовый класс утройств ввода/вывода. //! \~russian Базовый класс утройств ввода/вывода.
class PIP_EXPORT PIIODevice: public PIThread class PIP_EXPORT PIIODevice: public PIThread
{ {
PIOBJECT_SUBCLASS(PIIODevice, PIThread) PIOBJECT_SUBCLASS(PIIODevice, PIThread);
friend void __DevicePool_threadReadDP(void * ddp); friend void __DevicePool_threadReadDP(void * ddp);
public: public:
NO_COPY_CLASS(PIIODevice) NO_COPY_CLASS(PIIODevice);
//! \~english Constructs a empty %PIIODevice //! \~english Constructs a empty %PIIODevice
//! \~russian Создает пустой %PIIODevice //! \~russian Создает пустой %PIIODevice
@@ -367,10 +367,10 @@ public:
EVENT_VHANDLER(void, flush) {;} EVENT_VHANDLER(void, flush) {;}
EVENT(opened) EVENT(opened);
EVENT(closed) EVENT(closed);
EVENT2(threadedReadEvent, uchar * , readed, int, size) EVENT2(threadedReadEvent, uchar * , readed, int, size);
EVENT2(threadedWriteEvent, ullong, id, int, written_size) EVENT2(threadedWriteEvent, ullong, id, int, written_size);
//! \handlers //! \handlers
//! \{ //! \{

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

@@ -35,7 +35,7 @@
//! \~russian Обёртка PIIODevice вокруг PIString. //! \~russian Обёртка PIIODevice вокруг PIString.
class PIP_EXPORT PIIOString: public PIIODevice class PIP_EXPORT PIIOString: public PIIODevice
{ {
PIIODEVICE(PIIOString, "") PIIODEVICE(PIIOString, "");
public: public:
//! \~english Contructs %PIIOString with "string" content and "mode" open mode //! \~english Contructs %PIIOString with "string" content and "mode" open mode

16
libs/main/io_devices/pipeer.cpp
View File

@@ -36,7 +36,7 @@
#define _PIPEER_PING_TIMEOUT 5.0 #define _PIPEER_PING_TIMEOUT 5.0
class PIPeer::PeerData: public PIObject { class PIPeer::PeerData: public PIObject {
PIOBJECT_SUBCLASS(PeerData, PIObject) PIOBJECT_SUBCLASS(PeerData, PIObject);
public: public:
PeerData(const PIString & n); PeerData(const PIString & n);
~PeerData(); ~PeerData();
@@ -45,8 +45,8 @@ public:
EVENT_HANDLER1(void, dtReceiveFinishedIn, bool, ok) {if (ok) received(name(), dt_in.data());} EVENT_HANDLER1(void, dtReceiveFinishedIn, bool, ok) {if (ok) received(name(), dt_in.data());}
EVENT_HANDLER1(void, dtReceiveFinishedOut, bool, ok) {if (ok) received(name(), dt_out.data());} EVENT_HANDLER1(void, dtReceiveFinishedOut, bool, ok) {if (ok) received(name(), dt_out.data());}
EVENT_HANDLER(void, dtThread); EVENT_HANDLER(void, dtThread);
EVENT2(received, const PIString &, from, const PIByteArray &, data) EVENT2(received, const PIString &, from, const PIByteArray &, data);
EVENT2(sendRequest, const PIString &, to, const PIByteArray &, data) EVENT2(sendRequest, const PIString &, to, const PIByteArray &, data);
bool send(const PIByteArray & d); bool send(const PIByteArray & d);
void receivedPacket(uchar type, const PIByteArray & d); void receivedPacket(uchar type, const PIByteArray & d);
void setDist(int dist); void setDist(int dist);
@@ -61,11 +61,11 @@ PIPeer::PeerData::PeerData(const PIString & n): PIObject(n) {
dt_out.setPacketSize(_PIPEER_MSG_SIZE); dt_out.setPacketSize(_PIPEER_MSG_SIZE);
dt_in.setCRCEnabled(false); dt_in.setCRCEnabled(false);
dt_out.setCRCEnabled(false); dt_out.setCRCEnabled(false);
CONNECTU(&dt_in, sendRequest, this, dtSendRequestIn) CONNECTU(&dt_in, sendRequest, this, dtSendRequestIn);
CONNECTU(&dt_out, sendRequest, this, dtSendRequestOut) CONNECTU(&dt_out, sendRequest, this, dtSendRequestOut);
CONNECTU(&dt_in, receiveFinished, this, dtReceiveFinishedIn) CONNECTU(&dt_in, receiveFinished, this, dtReceiveFinishedIn);
CONNECTU(&dt_out, receiveFinished, this, dtReceiveFinishedOut) CONNECTU(&dt_out, receiveFinished, this, dtReceiveFinishedOut);
CONNECTU(&t, started, this, dtThread) CONNECTU(&t, started, this, dtThread);
} }

12
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, "peer") PIIODEVICE(PIPeer, "peer");
private: private:
class PeerData; class PeerData;
@@ -41,7 +41,7 @@ public:
class PIP_EXPORT PeerInfo { class PIP_EXPORT PeerInfo {
friend class PIPeer; friend class PIPeer;
BINARY_STREAM_FRIEND(PeerInfo) BINARY_STREAM_FRIEND(PIPeer::PeerInfo);
public: public:
PeerInfo() {dist = sync = cnt = 0; trace = -1; was_update = false; _data = 0;} PeerInfo() {dist = sync = cnt = 0; trace = -1; was_update = false; _data = 0;}
~PeerInfo() {} ~PeerInfo() {}
@@ -80,7 +80,7 @@ public:
}; };
BINARY_STREAM_FRIEND(PIPeer::PeerInfo) BINARY_STREAM_FRIEND(PIPeer::PeerInfo);
bool send(const PIString & to, const PIByteArray & data) {return send(to, data.data(), data.size_s());} bool send(const PIString & to, const PIByteArray & data) {return send(to, data.data(), data.size_s());}
bool send(const PIString & to, const PIString & data) {return send(to, data.data(), data.size_s());} bool send(const PIString & to, const PIString & data) {return send(to, data.data(), data.size_s());}
@@ -117,9 +117,9 @@ public:
void setTcpServerIP(const PIString & ip) {server_ip = ip; tcpClientReconnect();} void setTcpServerIP(const PIString & ip) {server_ip = ip; tcpClientReconnect();}
EVENT2(dataReceivedEvent, const PIString &, from, const PIByteArray &, data) EVENT2(dataReceivedEvent, const PIString &, from, const PIByteArray &, data);
EVENT1(peerConnectedEvent, const PIString &, name) EVENT1(peerConnectedEvent, const PIString &, name);
EVENT1(peerDisconnectedEvent, const PIString &, name) EVENT1(peerDisconnectedEvent, const PIString &, name);
// bool lockedEth() const {return eth_mutex.isLocked();} // bool lockedEth() const {return eth_mutex.isLocked();}
// bool lockedPeers() const {return peers_mutex.isLocked();} // bool lockedPeers() const {return peers_mutex.isLocked();}

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

@@ -36,7 +36,7 @@
//! \~russian Последовательный порт. //! \~russian Последовательный порт.
class PIP_EXPORT PISerial: public PIIODevice class PIP_EXPORT PISerial: public PIIODevice
{ {
PIIODEVICE(PISerial, "ser") PIIODEVICE(PISerial, "ser");
public: public:
//! \~english Contructs an empty %PISerial //! \~english Contructs an empty %PISerial

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

@@ -35,7 +35,7 @@
//! \~russian Разделяемая память. //! \~russian Разделяемая память.
class PIP_EXPORT PISharedMemory: public PIIODevice class PIP_EXPORT PISharedMemory: public PIIODevice
{ {
PIIODEVICE(PISharedMemory, "shm") PIIODEVICE(PISharedMemory, "shm");
public: public:
//! \~english Constructs empty %PISharedMemory //! \~english Constructs empty %PISharedMemory

2
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, "spi") 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();

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

@@ -35,7 +35,7 @@
//! \~russian PIIODevice который транслирует запись на чтение. //! \~russian PIIODevice который транслирует запись на чтение.
class PIP_EXPORT PITransparentDevice: public PIIODevice class PIP_EXPORT PITransparentDevice: public PIIODevice
{ {
PIIODEVICE(PITransparentDevice, "tr") PIIODEVICE(PITransparentDevice, "tr");
public: public:
//! \~english Contructs empty %PITransparentDevice //! \~english Contructs empty %PITransparentDevice

2
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, "usb") 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();

18
libs/main/io_utils/pibasetransfer.h
View File

@@ -31,7 +31,7 @@
class PIP_EXPORT PIBaseTransfer: public PIObject class PIP_EXPORT PIBaseTransfer: public PIObject
{ {
PIOBJECT_SUBCLASS(PIBaseTransfer, PIObject) PIOBJECT_SUBCLASS(PIBaseTransfer, PIObject);
public: public:
PIBaseTransfer(); PIBaseTransfer();
~PIBaseTransfer(); ~PIBaseTransfer();
@@ -84,13 +84,13 @@ public:
EVENT_HANDLER(void, pause) {setPause(true);} EVENT_HANDLER(void, pause) {setPause(true);}
EVENT_HANDLER(void, resume) {setPause(false);} EVENT_HANDLER(void, resume) {setPause(false);}
EVENT(receiveStarted) EVENT(receiveStarted);
EVENT(paused) EVENT(paused);
EVENT(resumed) EVENT(resumed);
EVENT1(receiveFinished, bool, ok) EVENT1(receiveFinished, bool, ok);
EVENT(sendStarted) EVENT(sendStarted);
EVENT1(sendFinished, bool, ok) EVENT1(sendFinished, bool, ok);
EVENT1(sendRequest, PIByteArray &, data) EVENT1(sendRequest, PIByteArray &, data);
protected: protected:
void buildSession(PIVector<Part> parts); void buildSession(PIVector<Part> parts);
@@ -115,7 +115,7 @@ private:
}; };
# pragma pack(pop) # pragma pack(pop)
BINARY_STREAM_FRIEND(PIBaseTransfer::StartRequest) BINARY_STREAM_FRIEND(PIBaseTransfer::StartRequest);
void processData(int id, PIByteArray &data); void processData(int id, PIByteArray &data);
PIByteArray build_packet(int id); PIByteArray build_packet(int id);

4
libs/main/io_utils/pibroadcast.h
View File

@@ -32,7 +32,7 @@
class PIP_IO_UTILS_EXPORT PIBroadcast: public PIThread, public PIEthUtilBase { class PIP_IO_UTILS_EXPORT PIBroadcast: public PIThread, public PIEthUtilBase {
PIOBJECT_SUBCLASS(PIBroadcast, PIThread) PIOBJECT_SUBCLASS(PIBroadcast, PIThread);
public: public:
//! %PIBroadcast channels, can be used independently //! %PIBroadcast channels, can be used independently
@@ -114,7 +114,7 @@ public:
//! Send packet //! Send packet
void send(const PIByteArray & data); void send(const PIByteArray & data);
EVENT1(receiveEvent, PIByteArray, data) EVENT1(receiveEvent, PIByteArray, data);
//! \events //! \events
//! \{ //! \{

12
libs/main/io_utils/piconnection.h
View File

@@ -34,7 +34,7 @@ class PIConfig;
class PIP_EXPORT PIConnection: public PIObject class PIP_EXPORT PIConnection: public PIObject
{ {
PIOBJECT_SUBCLASS(PIConnection, PIObject) PIOBJECT_SUBCLASS(PIConnection, PIObject);
public: public:
//! Constructs connection with name "name", or with default name = "connection" //! Constructs connection with name "name", or with default name = "connection"
PIConnection(const PIString & name = PIStringAscii("connection")); PIConnection(const PIString & name = PIStringAscii("connection"));
@@ -279,7 +279,7 @@ public:
static bool isFakeMode(); static bool isFakeMode();
class PIP_EXPORT DevicePool: public PIThread { class PIP_EXPORT DevicePool: public PIThread {
PIOBJECT_SUBCLASS(DevicePool, PIThread) PIOBJECT_SUBCLASS(DevicePool, PIThread);
friend void __DevicePool_threadReadDP(void * ddp); friend void __DevicePool_threadReadDP(void * ddp);
friend class PIConnection; friend class PIConnection;
protected: protected:
@@ -317,9 +317,9 @@ public:
bool fake; bool fake;
}; };
EVENT2(dataReceivedEvent, const PIString &, from, const PIByteArray &, data) EVENT2(dataReceivedEvent, const PIString &, from, const PIByteArray &, data);
EVENT2(packetReceivedEvent, const PIString &, from, const PIByteArray &, data) EVENT2(packetReceivedEvent, const PIString &, from, const PIByteArray &, data);
EVENT3(qualityChanged, const PIIODevice * , dev, PIDiagnostics::Quality, new_quality, PIDiagnostics::Quality, old_quality) EVENT3(qualityChanged, const PIIODevice * , dev, PIDiagnostics::Quality, new_quality, PIDiagnostics::Quality, old_quality);
//! \events //! \events
//! \{ //! \{
@@ -377,7 +377,7 @@ private:
}; };
class PIP_EXPORT Sender: public PITimer { class PIP_EXPORT Sender: public PITimer {
PIOBJECT_SUBCLASS(Sender, PIObject) PIOBJECT_SUBCLASS(Sender, PIObject);
public: public:
Sender(PIConnection * parent_ = 0); Sender(PIConnection * parent_ = 0);
~Sender() {stop();} ~Sender() {stop();}

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

@@ -31,7 +31,7 @@
class PIP_EXPORT PIDataTransfer: public PIBaseTransfer class PIP_EXPORT PIDataTransfer: public PIBaseTransfer
{ {
PIOBJECT_SUBCLASS(PIDataTransfer, PIBaseTransfer) PIOBJECT_SUBCLASS(PIDataTransfer, PIBaseTransfer);
public: public:
PIDataTransfer() {;} PIDataTransfer() {;}
~PIDataTransfer() {;} ~PIDataTransfer() {;}

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

@@ -32,10 +32,10 @@
class PIP_EXPORT PIDiagnostics: public PITimer class PIP_EXPORT PIDiagnostics: public PITimer
{ {
PIOBJECT_SUBCLASS(PIDiagnostics, PITimer) PIOBJECT_SUBCLASS(PIDiagnostics, PITimer);
friend class PIConnection; friend class PIConnection;
public: public:
NO_COPY_CLASS(PIDiagnostics) NO_COPY_CLASS(PIDiagnostics);
//! Constructs an empty diagnostics and if "start_" start it //! Constructs an empty diagnostics and if "start_" start it
PIDiagnostics(bool start_ = true); PIDiagnostics(bool start_ = true);
@@ -99,7 +99,7 @@ public:
EVENT_HANDLER2(void, received, int, size, bool, correct); EVENT_HANDLER2(void, received, int, size, bool, correct);
EVENT_HANDLER1(void, sended, int, size); EVENT_HANDLER1(void, sended, int, size);
EVENT2(qualityChanged, PIDiagnostics::Quality, new_quality, PIDiagnostics::Quality, old_quality) EVENT2(qualityChanged, PIDiagnostics::Quality, new_quality, PIDiagnostics::Quality, old_quality);
//! \handlers //! \handlers
//! \{ //! \{

12
libs/main/io_utils/pifiletransfer.h
View File

@@ -33,7 +33,7 @@
class PIP_EXPORT PIFileTransfer: public PIBaseTransfer class PIP_EXPORT PIFileTransfer: public PIBaseTransfer
{ {
PIOBJECT_SUBCLASS(PIFileTransfer, PIBaseTransfer) PIOBJECT_SUBCLASS(PIFileTransfer, PIBaseTransfer);
public: public:
PIFileTransfer(); PIFileTransfer();
~PIFileTransfer(); ~PIFileTransfer();
@@ -82,11 +82,11 @@ public:
const llong * bytesFileAll_ptr() const {return &bytes_file_all;} const llong * bytesFileAll_ptr() const {return &bytes_file_all;}
const llong * bytesFileCur_ptr() const {return &bytes_file_cur;} const llong * bytesFileCur_ptr() const {return &bytes_file_cur;}
EVENT(receiveFilesStarted) EVENT(receiveFilesStarted);
EVENT1(receiveFilesFinished, bool, ok) EVENT1(receiveFilesFinished, bool, ok);
EVENT(sendFilesStarted) EVENT(sendFilesStarted);
EVENT1(sendFilesFinished, bool, ok) EVENT1(sendFilesFinished, bool, ok);
EVENT3(receiveFilesRequest, PIStringList, files, llong, total_bytes, bool *, ok) EVENT3(receiveFilesRequest, PIStringList, files, llong, total_bytes, bool *, ok);
private: private:
static const char sign[]; static const char sign[];

4
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, "pckext") PIIODEVICE(PIPacketExtractor, "pckext");
friend class PIConnection; friend class PIConnection;
public: public:
@@ -127,7 +127,7 @@ public:
//! Add data to extractor, raise \a packetReceived() if packet is ready //! Add data to extractor, raise \a packetReceived() if packet is ready
void appendData(const PIByteArray & data) {appendData(data.data(), data.size_s());} void appendData(const PIByteArray & data) {appendData(data.data(), data.size_s());}
EVENT2(packetReceived, uchar * , data, int, size) EVENT2(packetReceived, uchar * , data, int, size);
//! \events //! \events
//! \{ //! \{

4
libs/main/io_utils/pistreampacker.h
View File

@@ -86,8 +86,8 @@ public:
//! and \a sendRequest() event to \"dev\" \a PIIODevice::write() handler //! and \a sendRequest() event to \"dev\" \a PIIODevice::write() handler
void assignDevice(PIIODevice * dev); void assignDevice(PIIODevice * dev);
EVENT1(packetReceiveEvent, PIByteArray &, data) EVENT1(packetReceiveEvent, PIByteArray &, data);
EVENT1(sendRequest, PIByteArray, data) EVENT1(sendRequest, PIByteArray, data);
//! \handlers //! \handlers
//! \{ //! \{

2
libs/main/math/pievaluator.h
View File

@@ -96,7 +96,7 @@ namespace PIEvaluatorTypes {
class PIP_EXPORT PIEvaluatorContent class PIP_EXPORT PIEvaluatorContent
{ {
friend class PIEvaluator; friend class PIEvaluator;
BINARY_STREAM_FRIEND(PIEvaluatorContent) BINARY_STREAM_FRIEND(PIEvaluatorContent);
public: public:
PIEvaluatorContent(); PIEvaluatorContent();
~PIEvaluatorContent() {;} ~PIEvaluatorContent() {;}

4
libs/main/system/piplugin.h
View File

@@ -146,7 +146,7 @@ public:
static PIPluginInfoStorage * instance(); static PIPluginInfoStorage * instance();
private: private:
NO_COPY_CLASS(PIPluginInfoStorage) NO_COPY_CLASS(PIPluginInfoStorage);
void * current; void * current;
PIMap<void*, PIPluginInfo * > info; PIMap<void*, PIPluginInfo * > info;
@@ -230,7 +230,7 @@ public:
static PIStringList pluginsDirectories(const PIString & name); static PIStringList pluginsDirectories(const PIString & name);
private: private:
NO_COPY_CLASS(PIPluginLoader) NO_COPY_CLASS(PIPluginLoader);
PIString findLibrary(const PIString & path); PIString findLibrary(const PIString & path);
static PIString libExtension(); static PIString libExtension();

6
libs/main/system/piprocess.h
View File

@@ -38,7 +38,7 @@
//! \~russian Внешний процесс. //! \~russian Внешний процесс.
class PIP_EXPORT PIProcess: public PIThread class PIP_EXPORT PIProcess: public PIThread
{ {
PIOBJECT_SUBCLASS(PIProcess, PIThread) PIOBJECT_SUBCLASS(PIProcess, PIThread);
public: public:
//! \~english Construct empty %PIProcess //! \~english Construct empty %PIProcess
@@ -133,8 +133,8 @@ public:
EVENT_HANDLER(bool, waitForFinish) {return waitForFinish(60000);} EVENT_HANDLER(bool, waitForFinish) {return waitForFinish(60000);}
EVENT_HANDLER1(bool, waitForFinish, int, timeout_msecs) {return PIThread::waitForFinish(timeout_msecs);} EVENT_HANDLER1(bool, waitForFinish, int, timeout_msecs) {return PIThread::waitForFinish(timeout_msecs);}
EVENT1(execStarted, PIString, program) EVENT1(execStarted, PIString, program);
EVENT2(execFinished, PIString, program, int, exit_code) EVENT2(execFinished, PIString, program, int, exit_code);
//! \~english Start detached execution "program" without arguments //! \~english Start detached execution "program" without arguments

4
libs/main/system/pisingleapplication.h
View File

@@ -35,7 +35,7 @@ class PISharedMemory;
//! \~english Single-instance application control. //! \~english Single-instance application control.
//! \~russian Контроль одного экземпляра приложения. //! \~russian Контроль одного экземпляра приложения.
class PIP_EXPORT PISingleApplication: public PIThread { class PIP_EXPORT PISingleApplication: public PIThread {
PIOBJECT_SUBCLASS(PISingleApplication, PIThread) PIOBJECT_SUBCLASS(PISingleApplication, PIThread);
public: public:
//! \~english Construct %PISingleApplication with name "app_name" //! \~english Construct %PISingleApplication with name "app_name"
@@ -50,7 +50,7 @@ public:
bool isFirst() const; bool isFirst() const;
EVENT_HANDLER1(void, sendMessage, const PIByteArray &, m); EVENT_HANDLER1(void, sendMessage, const PIByteArray &, m);
EVENT1(messageReceived, PIByteArray, m) EVENT1(messageReceived, PIByteArray, m);
//! \handlers //! \handlers
//! \{ //! \{

2
libs/main/system/pisysteminfo.h
View File

@@ -135,7 +135,7 @@ public:
private: private:
PISystemInfo() {} PISystemInfo() {}
NO_COPY_CLASS(PISystemInfo) NO_COPY_CLASS(PISystemInfo);
}; };

2
libs/main/system/pisystemmonitor.h
View File

@@ -35,7 +35,7 @@
//! \~english Process monitoring. //! \~english Process monitoring.
//! \~russian Мониторинг процесса. //! \~russian Мониторинг процесса.
class PIP_EXPORT PISystemMonitor: public PIThread { class PIP_EXPORT PISystemMonitor: public PIThread {
PIOBJECT_SUBCLASS(PISystemMonitor, PIThread) PIOBJECT_SUBCLASS(PISystemMonitor, PIThread);
friend class PIIntrospectionServer; friend class PIIntrospectionServer;
public: public:
//! \~english Constructs unassigned %PISystemMonitor //! \~english Constructs unassigned %PISystemMonitor

2
libs/main/thread/piconditionvar.h
View File

@@ -37,7 +37,7 @@
*/ */
class PIP_EXPORT PIConditionVariable { class PIP_EXPORT PIConditionVariable {
public: public:
NO_COPY_CLASS(PIConditionVariable) NO_COPY_CLASS(PIConditionVariable);
explicit PIConditionVariable(); explicit PIConditionVariable();
virtual ~PIConditionVariable(); virtual ~PIConditionVariable();

8
libs/main/thread/pigrabberbase.h
View File

@@ -33,7 +33,7 @@
template<typename T = PIByteArray> template<typename T = PIByteArray>
class PIGrabberBase: public PIThread class PIGrabberBase: public PIThread
{ {
PIOBJECT_SUBCLASS(PIGrabberBase, PIThread) PIOBJECT_SUBCLASS(PIGrabberBase, PIThread);
public: public:
PIGrabberBase() { PIGrabberBase() {
is_opened = false; is_opened = false;
@@ -130,9 +130,9 @@ public:
close(); close();
} }
EVENT(dataReady) EVENT(dataReady);
EVENT(opened) EVENT(opened);
EVENT(closed) EVENT(closed);
protected: protected:
virtual void init() {} virtual void init() {}

4
libs/main/thread/pimutex.h
View File

@@ -32,7 +32,7 @@
class PIP_EXPORT PIMutex class PIP_EXPORT PIMutex
{ {
public: public:
NO_COPY_CLASS(PIMutex) NO_COPY_CLASS(PIMutex);
//! \~english Constructs unlocked mutex //! \~english Constructs unlocked mutex
//! \~russian Создает незаблокированный мьютекс //! \~russian Создает незаблокированный мьютекс
@@ -69,7 +69,7 @@ private:
class PIP_EXPORT PIMutexLocker class PIP_EXPORT PIMutexLocker
{ {
public: public:
NO_COPY_CLASS(PIMutexLocker) NO_COPY_CLASS(PIMutexLocker);
//! \~english Constructs and lock "m" if "condition" is \c true //! \~english Constructs and lock "m" if "condition" is \c true
//! \~russian Создает и блокирует мьютекс "m" если "condition" \c true //! \~russian Создает и блокирует мьютекс "m" если "condition" \c true

6
libs/main/thread/pipipelinethread.h
View File

@@ -34,7 +34,7 @@
template <typename Tin, typename Tout> template <typename Tin, typename Tout>
class PIPipelineThread : public PIThread class PIPipelineThread : public PIThread
{ {
PIOBJECT_SUBCLASS(PIPipelineThread, PIThread) PIOBJECT_SUBCLASS(PIPipelineThread, PIThread);
public: public:
PIPipelineThread() { PIPipelineThread() {
cnt = 0; cnt = 0;
@@ -51,9 +51,9 @@ public:
} }
template <typename T> template <typename T>
void connectTo(PIPipelineThread<Tout, T> * next) { void connectTo(PIPipelineThread<Tout, T> * next) {
CONNECT3(void, Tout, bool, bool *, this, calculated, next, enqueue) CONNECT3(void, Tout, bool, bool *, this, calculated, next, enqueue);
} }
EVENT3(calculated, const Tout &, v, bool, wait, bool *, overload) EVENT3(calculated, const Tout &, v, bool, wait, bool *, overload);
EVENT_HANDLER3(void, enqueue, const Tin &, v, bool, wait, bool *, overload) { EVENT_HANDLER3(void, enqueue, const Tin &, v, bool, wait, bool *, overload) {
mutex.lock(); mutex.lock();
//piCoutObj << "enque" << overload; //piCoutObj << "enque" << overload;

4
libs/main/thread/pispinlock.h
View File

@@ -33,7 +33,7 @@
class PIP_EXPORT PISpinlock class PIP_EXPORT PISpinlock
{ {
public: public:
NO_COPY_CLASS(PISpinlock) NO_COPY_CLASS(PISpinlock);
//! \~english Constructs unlocked spinlock //! \~english Constructs unlocked spinlock
//! \~russian Создает незаблокированный спинлок //! \~russian Создает незаблокированный спинлок
@@ -73,7 +73,7 @@ private:
class PIP_EXPORT PISpinlockLocker class PIP_EXPORT PISpinlockLocker
{ {
public: public:
NO_COPY_CLASS(PISpinlockLocker) NO_COPY_CLASS(PISpinlockLocker);
//! \~english Constructs and lock "s" if "condition" is \c true //! \~english Constructs and lock "s" if "condition" is \c true
//! \~russianСоздает и блокирует спинлок "m" если "condition" \c true //! \~russianСоздает и блокирует спинлок "m" если "condition" \c true

8
libs/main/thread/pithread.h
View File

@@ -68,12 +68,12 @@ typedef std::function<void(void *)> ThreadFunc;
class PIP_EXPORT PIThread: public PIObject class PIP_EXPORT PIThread: public PIObject
{ {
PIOBJECT_SUBCLASS(PIThread, PIObject) PIOBJECT_SUBCLASS(PIThread, PIObject);
#ifndef MICRO_PIP #ifndef MICRO_PIP
friend class PIIntrospectionThreads; friend class PIIntrospectionThreads;
#endif #endif
public: public:
NO_COPY_CLASS(PIThread) NO_COPY_CLASS(PIThread);
//! \~english Contructs thread with custom data "data", external function "func" and main loop delay "loop_delay" //! \~english Contructs thread with custom data "data", external function "func" and main loop delay "loop_delay"
//! \~russian Создает поток с данными "data", функцией "func" и задержкой цикла "loop_delay" //! \~russian Создает поток с данными "data", функцией "func" и задержкой цикла "loop_delay"
@@ -166,8 +166,8 @@ public:
void __thread_func__(); void __thread_func__();
void __thread_func_once__(); void __thread_func_once__();
EVENT(started) EVENT(started);
EVENT(stopped) EVENT(stopped);
//! \~english Call event handler "handler" of object "object" in separate thread //! \~english Call event handler "handler" of object "object" in separate thread
//! \~russian Вызывает обработчик "handler" объекта "object" в отдельном потоке //! \~russian Вызывает обработчик "handler" объекта "object" в отдельном потоке

6
libs/main/thread/pitimer.h
View File

@@ -74,9 +74,9 @@ protected:
class PIP_EXPORT PITimer: public PIObject { class PIP_EXPORT PITimer: public PIObject {
PIOBJECT_SUBCLASS(PITimer, PIObject) PIOBJECT_SUBCLASS(PITimer, PIObject);
public: public:
NO_COPY_CLASS(PITimer) NO_COPY_CLASS(PITimer);
//! \~english Constructs timer with PITimer::Thread implementation //! \~english Constructs timer with PITimer::Thread implementation
//! \~russian Создает таймер с реализацией PITimer::Thread //! \~russian Создает таймер с реализацией PITimer::Thread
@@ -215,7 +215,7 @@ public:
EVENT_HANDLER0(void, clearDelimiters) {delims.clear();} EVENT_HANDLER0(void, clearDelimiters) {delims.clear();}
EVENT2(tickEvent, void * , data_, int, delimiter) EVENT2(tickEvent, void * , data_, int, delimiter);
//! \handlers //! \handlers
//! \{ //! \{