X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fio%2Fbase.h;h=c58be90f7ebd039504e261105e53dc7329a1ac13;hp=df63b5b1ed3ed2d5cfbd4797bc319919fa110794;hb=5a32939eb6e576c223e1be5f80226d9e628a2398;hpb=31e72f50fbb34d86877e5110401c49ce3fefd4bb

diff --git a/source/io/base.h b/source/io/base.h
index df63b5b..c58be90 100644
--- a/source/io/base.h
+++ b/source/io/base.h
@@ -2,14 +2,14 @@
 #define MSP_IO_BASE_H_
 
 #include <sigc++/sigc++.h>
+#include <msp/core/mutex.h>
+#include "handle.h"
 #include "mode.h"
 #include "poll.h"
 
 namespace Msp {
 namespace IO {
 
-struct Handle;
-
 /**
 Common interface for all I/O objects.
 
@@ -19,9 +19,17 @@ leaving stale pointers in an EventDispatcher.
 class Base
 {
 public:
-	/** Emitted when there is data available for reading.  If all data is not
-	read, the signal is emitted again immediately. */
-	sigc::signal<void> signal_data_available;
+	/** 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,21 +38,14 @@ public:
 	seeked) and any data buffered by upper layers needs to be flushed. */
 	sigc::signal<void> signal_flush_required;
 
-	/** Emitted when the I/O object has closed. */
-	sigc::signal<void> signal_closed;
-
-	/** Emitted when the mask of interesting events changes.  Mainly for use by
-	EventDispatcher. */
-	sigc::signal<void, PollEvent> signal_events_changed;
-
 	/** Emitted when the object is deleted.  Mainly for use by
 	EventDispatcher. */
 	sigc::signal<void> signal_deleted;
 
 protected:
 	Mode mode;
-	PollEvent events;
 	bool eof_flag;
+	Mutex *mutex;
 
 	Base();
 private:
@@ -65,6 +66,8 @@ public:
 	Mode get_mode() const { return mode; }
 
 protected:
+	void check_access(Mode) const;
+
 	virtual unsigned do_write(const char *, unsigned) = 0;
 	virtual unsigned do_read(char *, unsigned) = 0;
 
@@ -94,26 +97,18 @@ public:
 	to end-of-file or non-blocking operation. */
 	virtual int get();
 
-	/** Returns the end-of-file flag. */
-	bool eof() const { return eof_flag; }
-
 protected:
-	void set_events(PollEvent);
+	void set_eof();
 
 public:
-	/** Returns a mask of the currently interesting events.  Used by
-	EventDispatcher. */
-	PollEvent get_events() const { return events; }
-
-	/** Returns a handle for polling.  Should throw if the object does not have
-	an event handle. */
-	virtual const Handle &get_event_handle() = 0;
-
-	/** Notifies the object of an event.  Used by EventDispatcher. */
-	void event(PollEvent);
+	/** Returns the end-of-file flag.  Note that some types of objects won't
+	indicate end-of-file until you try to read at least one byte past the actual
+	end, while others indicate it when you've read the last byte. */
+	bool eof() const { return eof_flag; }
 
-protected:
-	virtual void on_event(PollEvent) { }
+	/** Returns the system-level handle for the object.  Used by Console to
+	perform redirections. */
+	virtual const Handle &get_handle(Mode);
 };
 
 } // namespace IO