git-svn-id: svn://db.shs.com.ru/pip@313 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

src/io/piiodevice.h

@@ -25,7 +25,6 @@
 
 #include "piinit.h"
 #include "picollection.h"
-#include "pivariant.h"
 #include "pitimer.h"
 
 // function executed from threaded read, pass ThreadedReadData, readedData, sizeOfData

src/io/piiomodule.h

@@ -31,6 +31,7 @@
 #include "pifiletransfer.h"
 #include "piiostring.h"
 #include "piiobytearray.h"
+#include "pitransparentdevice.h"
 #include "pipeer.h"
 #include "pipacketextractor.h"
 #include "piprotocol.h"

src/io/piiostring.cpp

@@ -24,7 +24,7 @@
  * \brief PIIODevice wrapper around PIString
  * 
  * \section  PIIOString_sec0 Synopsis
- * This class sllow you to use PIString as PIIODevice and pass it to, e.g. PIConfig
+ * This class allow you to use PIString as PIIODevice and pass it to, e.g. PIConfig
  */
 
 //REGISTER_DEVICE(PIIOString);

src/io/pitransparentdevice.cpp

@@ -0,0 +1,79 @@
+/*
+    PIP - Platform Independent Primitives
+	PIIODevice that pass write to read
+	Copyright (C) 2017  Ivan Pelipenko peri4ko@yandex.ru
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "pitransparentdevice.h"
+
+
+/*! \class PITransparentDevice
+ * \brief PIIODevice that pass write to read
+ * 
+ * \section  PITransparentDevice_sec0 Synopsis
+ * This class pass all data from \a write() function to \a read().
+ * %PITransparentDevice contains internal queue and works in
+ * packets mode. If you write 3 different  packets into this device,
+ * read will return this 3 packets.
+ */
+
+REGISTER_DEVICE(PITransparentDevice)
+
+
+PITransparentDevice::PITransparentDevice() {
+}
+
+
+int PITransparentDevice::readDevice(void * read_to, int max_size) {
+	if (!canRead()) return -1;
+	que_mutex.lock();
+	if (que.isEmpty()) {
+		que_mutex.unlock();
+		return 0;
+	}
+	PIByteArray ba = que.dequeue();
+	que_mutex.unlock();
+	int ret = piMini(max_size, ba.size_s());
+	memcpy(read_to, ba.data(), ret);
+	return ret;
+}
+
+
+int PITransparentDevice::writeDevice(const void * data, int max_size) {
+	if (!canWrite()) return -1;
+	que_mutex.lock();
+	que.enqueue(PIByteArray(data, max_size));
+	que_mutex.unlock();
+	return max_size;
+}
+
+
+PIString PITransparentDevice::fullPathPrefix() const {
+	return PIStringAscii("tr");
+}
+
+
+bool PITransparentDevice::openDevice() {
+	return true;
+}
+
+
+bool PITransparentDevice::closeDevice() {
+	que_mutex.lock();
+	que.clear();
+	que_mutex.unlock();
+	return true;
+}

src/io/pitransparentdevice.h

@@ -0,0 +1,51 @@
+/*! \file pitransparentdevice.h
+ * \brief PIIODevice that pass write to read
+*/
+/*
+    PIP - Platform Independent Primitives
+	PIIODevice that pass write to read
+	Copyright (C) 2017  Ivan Pelipenko peri4ko@yandex.ru
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef PITRANSPARENTDEVICE_H
+#define PITRANSPARENTDEVICE_H
+
+#include "piiodevice.h"
+
+
+class PIP_EXPORT PITransparentDevice: public PIIODevice
+{
+	PIIODEVICE(PITransparentDevice)
+public:
+	
+	//! Contructs empty %PITransparentDevice
+	PITransparentDevice();
+	
+	~PITransparentDevice() {closeDevice();}
+	
+protected:
+	bool openDevice();
+	bool closeDevice();
+	int readDevice(void * read_to, int max_size);
+	int writeDevice(const void * data, int max_size);
+	PIString fullPathPrefix() const;
+
+	PIMutex que_mutex;
+	PIQueue<PIByteArray> que;
+
+};
+
+#endif // PITRANSPARENTDEVICE_H

src/piversion.h

@@ -4,7 +4,7 @@
 
 #define PIP_VERSION_MAJOR      0
 #define PIP_VERSION_MINOR      7
-#define PIP_VERSION_REVISION   0
+#define PIP_VERSION_REVISION   1
 #define PIP_VERSION_SUFFIX     ""
 
 #endif // PIVERSION_H