X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fio%2Fbase.h;h=aadc6acd48db7c49430e4823c74423a354168535;hb=41363aed34382386f915f17c1a961750b4fdcb14;hp=394a2c2306e60ebbe9f8bb7ddee0e1d4f37b4403;hpb=a386a9ff068071aab19e6dcb0452e72784d84267;p=libs%2Fcore.git

diff --git a/source/io/base.h b/source/io/base.h
index 394a2c2..aadc6ac 100644
--- a/source/io/base.h
+++ b/source/io/base.h
@@ -1,7 +1,10 @@
 #ifndef MSP_IO_BASE_H_
 #define MSP_IO_BASE_H_
 
+#include <cstddef>
 #include <sigc++/sigc++.h>
+#include <msp/core/mutex.h>
+#include <msp/core/noncopyable.h>
 #include "handle.h"
 #include "mode.h"
 #include "poll.h"
@@ -11,13 +14,22 @@ namespace IO {
 
 /**
 Common interface for all I/O objects.
-
-A derived class must call set_events(P_NONE) before it is destroyed to avoid
-leaving stale pointers in an EventDispatcher.
 */
-class Base
+class Base: private NonCopyable
 {
 public:
+	/** RAII synchronization primitive.  Prevents concurrent access to the
+	target object during the lifetime of the Synchronize object. */
+	class Synchronize
+	{
+	private:
+		Base &io;
+
+	public:
+		Synchronize(Base &);
+		~Synchronize();
+	};
+
 	/** Emitted when there is no more data to be read. */
 	sigc::signal<void> signal_end_of_file;
 
@@ -30,13 +42,11 @@ public:
 	sigc::signal<void> signal_deleted;
 
 protected:
-	Mode mode;
-	bool eof_flag;
+	Mode mode = M_READ;
+	bool eof_flag = false;
+	Mutex *mutex = nullptr;
 
 	Base();
-private:
-	Base(const Base &);
-	Base &operator=(const Base &);
 public:
 	virtual ~Base();
 
@@ -46,7 +56,13 @@ public:
 	was done.
 
 	Blocking is enabled by default. */
-	virtual void set_block(bool) { }
+	virtual void set_block(bool) = 0;
+
+	/** Sets inheritance mode.  When inheritance is enabled, the file descriptor
+	will persist through Process::execute.
+
+	Inheritance is disabled by default. */
+	virtual void set_inherit(bool) = 0;
 
 	/** Returns the current mode flags. */
 	Mode get_mode() const { return mode; }
@@ -54,25 +70,25 @@ public:
 protected:
 	void check_access(Mode) const;
 
-	virtual unsigned do_write(const char *, unsigned) = 0;
-	virtual unsigned do_read(char *, unsigned) = 0;
+	virtual std::size_t do_write(const char *, std::size_t) = 0;
+	virtual std::size_t do_read(char *, std::size_t) = 0;
 
 public:
 	/** Writes data from a buffer.  Subject to blocking.  Returns the number of
 	bytes written, which may be zero for a non-blockin operation. */
-	unsigned write(const char *b, unsigned c) { return do_write(b, c); }
+	std::size_t write(const char *b, std::size_t c) { return do_write(b, c); }
 
 	/** Writes a string.  This is identical to calling
 	write(s.data(), s.size()). */
-	unsigned write(const std::string &s) { return do_write(s.data(), s.size()); }
+	std::size_t write(const std::string &s) { return do_write(s.data(), s.size()); }
 
 	/** Writes a single character.  This is identical to calling
 	write(&c, 1). */
-	virtual unsigned put(char c) { return do_write(&c, 1); }
+	virtual std::size_t put(char c) { return do_write(&c, 1); }
 
 	/** Reads data into a buffer.  Subject to blocking.  Returns the number of
 	bytes read, which may be zero for a non-blocking operation. */
-	unsigned read(char *b, unsigned c) { return do_read(b, c); }
+	std::size_t read(char *b, std::size_t c) { return do_read(b, c); }
 
 	/** Reads characters up to the next linefeed or end-of-file.  The linefeed
 	is not included in the line.  Returns true if a line was successfully read,
@@ -94,7 +110,7 @@ public:
 
 	/** Returns the system-level handle for the object.  Used by Console to
 	perform redirections. */
-	virtual const Handle &get_handle(Mode);
+	virtual const Handle &get_handle(Mode) = 0;
 };
 
 } // namespace IO