ehmry/genode
ehmry/genode
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

hw: remove note feature from IPC framework

Browse Source 
ref #589
This commit is contained in:
Martin Stein 2013-09-13 01:06:54 +02:00 committed by Norman Feske
parent 349262a655
commit 909c2dbc95
1 changed files with 17 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
base-hw/src/core/kernel/ipc_node.h
View File

@ -1,5 +1,5 @@
/* /*
* \brief End point of inter-process communication * \brief Backend for end points of synchronous interprocess communication
* \author Martin Stein * \author Martin Stein
* \date 2012-11-30 * \date 2012-11-30
*/ */
@ -23,51 +23,7 @@
namespace Kernel namespace Kernel
{ {
/** /**
* Sends requests to other IPC nodes, accumulates request announcments, * Backend for end points of synchronous interprocess communication
* provides serial access to them and replies to them if expected.
* Synchronizes communication.
*
* IPC node states:
*
* +----------+ +---------------+ +---------------+
* --new-->| inactive |---send-request-await-reply--->| await reply | +--send-note--| prepare reply |
* | |<--receive-reply---------------| | | | |
* | |<--cancel-waiting--------------| | | | |
* | | +---------------+ +------------>| |
* | |<--request-is-a-note-------+---request-is-not-a-note------------------------>| |
* | |<--------------------------(---not-await-request---+ | |
* | | | +---------------+ | | |
* | |---await-request-----------+-->| await request |<--+--send-reply-------------| |
* | |<--cancel-waiting--------------| |------announce-request--+--->| |
* | |---send-reply---------+----+-->| | | | |
* | |---send-note--+ | | +---------------+ | | |
* | | | | | | | |
* | |<-------------+ | request available | | |
* | |<--not-await-request--+ | | | |
* | |<--request-is-a-note-------+-------------------request-is-not-a-note----(--->| |
* | |<--request-is-a-note----------------------------------------------------+ | |
* +----------+ +-------------------------+ | |
* | prepare and await reply |<--send-request-and-await-reply--| |
* | |---receive-reply---------------->| |
* | |---cancel-waiting--------------->| |
* +-------------------------+ +---------------+
*
* State model propagated to deriving classes:
*
* +--------------+ +----------------+
* --new-->| has received |--send-request-await-reply-------------------->| awaits receipt |
* | |--await-request----------------------------+-->| |
* | | | | |
* | |<--request-available-----------------------+ | |
* | |--send-reply-------------------------------+-->| |
* | |--send-note--+ | | |
* | | | | | |
* | |<------------+ | | |
* | |<--request-available-or-not-await-request--+ | |
* | |<--announce-request----------------------------| |
* | |<--receive-reply-------------------------------| |
* | |<--cancel-waiting------------------------------| |
* +--------------+ +----------------+
*/ */
class Ipc_node; class Ipc_node;
} }
@ -76,11 +32,10 @@ class Kernel::Ipc_node
{ {
private: private:
template <typename T> class Fifo : public Genode::Fifo<T> { }; class Message_buf;
typedef Genode::Fifo<Message_buf> Message_fifo;
/**
* IPC node states as depicted initially
*/
enum State enum State
{ {
INACTIVE = 1, INACTIVE = 1,
@ -93,18 +48,19 @@ class Kernel::Ipc_node
/** /**
* Describes the buffer for incoming or outgoing messages * Describes the buffer for incoming or outgoing messages
*/ */
struct Message_buf : public Fifo<Message_buf>::Element class Message_buf : public Message_fifo::Element
{ {
void * base; public:
size_t size;
Ipc_node * origin; void * base;
size_t size;
Ipc_node * origin;
}; };
Fifo<Message_buf> _request_queue; /* requests that waits to be Message_fifo _request_queue;
* received by us */ Message_buf _inbuf;
Message_buf _inbuf; /* buffers message we have received lastly */ Message_buf _outbuf;
Message_buf _outbuf; /* buffers the message we aim to send */ State _state;
State _state; /* current node state */
/** /**
* Buffer next request from request queue in 'r' to handle it * Buffer next request from request queue in 'r' to handle it
@ -122,8 +78,7 @@ class Kernel::Ipc_node
_inbuf.origin = r->origin; _inbuf.origin = r->origin;
/* update state */ /* update state */
_state = r->origin->_awaits_reply() ? PREPARE_REPLY : _state = PREPARE_REPLY;
INACTIVE;
} }
/** /**
@ -135,7 +90,7 @@ class Kernel::Ipc_node
void _receive_reply(void * const base, size_t const size) void _receive_reply(void * const base, size_t const size)
{ {
/* FIXME: when discard awaited replies userland must get a hint */ /* FIXME: when discard awaited replies userland must get a hint */
if (!_awaits_reply() || size > _inbuf.size) { if (size > _inbuf.size) {
PDBG("discard invalid IPC reply"); PDBG("discard invalid IPC reply");
return; return;
} }
@ -164,15 +119,6 @@ class Kernel::Ipc_node
_request_queue.enqueue(r); _request_queue.enqueue(r);
} }
/**
* Wether we expect to receive a reply message
*/
bool _awaits_reply()
{
return _state == AWAIT_REPLY ||
_state == PREPARE_AND_AWAIT_REPLY;
}
/** /**
* IPC node waits for a message to receive to its inbuffer * IPC node waits for a message to receive to its inbuffer
*/ */
@ -280,30 +226,6 @@ class Kernel::Ipc_node
} }
} }
/**
* Send a notification and stay inactive
*
* \param dest targeted IPC node
* \param note_base base of the note payload
* \param note_size size of the note payload
*
* The caller must ensure that the note payload remains
* until it is buffered by the targeted node.
*/
void send_note(Ipc_node * const dest,
void * const note_base,
size_t const note_size)
{
/* assert preconditions */
assert(_state == INACTIVE || _state == PREPARE_REPLY);
/* announce request message, our state says: No reply needed */
_outbuf.base = note_base;
_outbuf.size = note_size;
_outbuf.origin = this;
dest->_announce_request(&_outbuf);
}
/** /**
* Stop waiting for a receipt if in a waiting state * Stop waiting for a receipt if in a waiting state
*/ */