2011-12-22 15:19:25 +00:00
|
|
|
/*
|
2013-01-10 11:10:41 +00:00
|
|
|
* \brief Client-side Audio_out-session
|
2011-12-22 15:19:25 +00:00
|
|
|
* \author Sebastian Sumpf
|
2013-01-10 11:10:41 +00:00
|
|
|
* \date 2012-12-20
|
2011-12-22 15:19:25 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
2017-02-20 12:23:52 +00:00
|
|
|
* Copyright (C) 2012-2017 Genode Labs GmbH
|
2011-12-22 15:19:25 +00:00
|
|
|
*
|
|
|
|
* This file is part of the Genode OS framework, which is distributed
|
2017-02-20 12:23:52 +00:00
|
|
|
* under the terms of the GNU Affero General Public License version 3.
|
2011-12-22 15:19:25 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
#ifndef _INCLUDE__AUDIO_OUT_SESSION__CLIENT_H_
|
|
|
|
#define _INCLUDE__AUDIO_OUT_SESSION__CLIENT_H_
|
|
|
|
|
2013-01-10 11:10:41 +00:00
|
|
|
#include <base/env.h>
|
2011-12-22 15:19:25 +00:00
|
|
|
#include <base/rpc_client.h>
|
2017-01-06 14:32:53 +00:00
|
|
|
#include <base/attached_dataspace.h>
|
2011-12-22 15:19:25 +00:00
|
|
|
#include <audio_out_session/audio_out_session.h>
|
|
|
|
|
|
|
|
namespace Audio_out {
|
2013-01-10 11:10:41 +00:00
|
|
|
struct Signal;
|
|
|
|
struct Session_client;
|
|
|
|
}
|
2011-12-22 15:19:25 +00:00
|
|
|
|
|
|
|
|
2013-01-10 11:10:41 +00:00
|
|
|
struct Audio_out::Signal
|
|
|
|
{
|
Follow practices suggested by "Effective C++"
The patch adjust the code of the base, base-<kernel>, and os repository.
To adapt existing components to fix violations of the best practices
suggested by "Effective C++" as reported by the -Weffc++ compiler
argument. The changes follow the patterns outlined below:
* A class with virtual functions can no longer publicly inherit base
classed without a vtable. The inherited object may either be moved
to a member variable, or inherited privately. The latter would be
used for classes that inherit 'List::Element' or 'Avl_node'. In order
to enable the 'List' and 'Avl_tree' to access the meta data, the
'List' must become a friend.
* Instead of adding a virtual destructor to abstract base classes,
we inherit the new 'Interface' class, which contains a virtual
destructor. This way, single-line abstract base classes can stay
as compact as they are now. The 'Interface' utility resides in
base/include/util/interface.h.
* With the new warnings enabled, all member variables must be explicitly
initialized. Basic types may be initialized with '='. All other types
are initialized with braces '{ ... }' or as class initializers. If
basic types and non-basic types appear in a row, it is nice to only
use the brace syntax (also for basic types) and align the braces.
* If a class contains pointers as members, it must now also provide a
copy constructor and assignment operator. In the most cases, one
would make them private, effectively disallowing the objects to be
copied. Unfortunately, this warning cannot be fixed be inheriting
our existing 'Noncopyable' class (the compiler fails to detect that
the inheriting class cannot be copied and still gives the error).
For now, we have to manually add declarations for both the copy
constructor and assignment operator as private class members. Those
declarations should be prepended with a comment like this:
/*
* Noncopyable
*/
Thread(Thread const &);
Thread &operator = (Thread const &);
In the future, we should revisit these places and try to replace
the pointers with references. In the presence of at least one
reference member, the compiler would no longer implicitly generate
a copy constructor. So we could remove the manual declaration.
Issue #465
2017-12-21 14:42:15 +00:00
|
|
|
Genode::Signal_receiver recv { };
|
|
|
|
Genode::Signal_context context { };
|
2013-01-10 11:10:41 +00:00
|
|
|
Genode::Signal_context_capability cap;
|
2011-12-22 15:19:25 +00:00
|
|
|
|
2024-06-13 13:25:59 +00:00
|
|
|
Signal() : cap(recv.manage(context)) { }
|
|
|
|
~Signal() { recv.dissolve(context); }
|
2011-12-22 15:19:25 +00:00
|
|
|
|
2013-01-10 11:10:41 +00:00
|
|
|
void wait() { recv.wait_for_signal(); }
|
|
|
|
};
|
2011-12-22 15:19:25 +00:00
|
|
|
|
|
|
|
|
2013-01-10 11:10:41 +00:00
|
|
|
class Audio_out::Session_client : public Genode::Rpc_client<Session>
|
|
|
|
{
|
|
|
|
private:
|
2011-12-22 15:19:25 +00:00
|
|
|
|
2017-01-06 14:32:53 +00:00
|
|
|
Genode::Attached_dataspace _shared_ds;
|
|
|
|
|
Follow practices suggested by "Effective C++"
The patch adjust the code of the base, base-<kernel>, and os repository.
To adapt existing components to fix violations of the best practices
suggested by "Effective C++" as reported by the -Weffc++ compiler
argument. The changes follow the patterns outlined below:
* A class with virtual functions can no longer publicly inherit base
classed without a vtable. The inherited object may either be moved
to a member variable, or inherited privately. The latter would be
used for classes that inherit 'List::Element' or 'Avl_node'. In order
to enable the 'List' and 'Avl_tree' to access the meta data, the
'List' must become a friend.
* Instead of adding a virtual destructor to abstract base classes,
we inherit the new 'Interface' class, which contains a virtual
destructor. This way, single-line abstract base classes can stay
as compact as they are now. The 'Interface' utility resides in
base/include/util/interface.h.
* With the new warnings enabled, all member variables must be explicitly
initialized. Basic types may be initialized with '='. All other types
are initialized with braces '{ ... }' or as class initializers. If
basic types and non-basic types appear in a row, it is nice to only
use the brace syntax (also for basic types) and align the braces.
* If a class contains pointers as members, it must now also provide a
copy constructor and assignment operator. In the most cases, one
would make them private, effectively disallowing the objects to be
copied. Unfortunately, this warning cannot be fixed be inheriting
our existing 'Noncopyable' class (the compiler fails to detect that
the inheriting class cannot be copied and still gives the error).
For now, we have to manually add declarations for both the copy
constructor and assignment operator as private class members. Those
declarations should be prepended with a comment like this:
/*
* Noncopyable
*/
Thread(Thread const &);
Thread &operator = (Thread const &);
In the future, we should revisit these places and try to replace
the pointers with references. In the presence of at least one
reference member, the compiler would no longer implicitly generate
a copy constructor. So we could remove the manual declaration.
Issue #465
2017-12-21 14:42:15 +00:00
|
|
|
Signal _progress { };
|
|
|
|
Signal _alloc { };
|
2011-12-22 15:19:25 +00:00
|
|
|
|
2013-01-10 11:10:41 +00:00
|
|
|
Genode::Signal_transmitter _data_avail;
|
2011-12-22 15:19:25 +00:00
|
|
|
|
2013-01-10 11:10:41 +00:00
|
|
|
public:
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Constructor
|
|
|
|
*
|
2017-01-06 14:32:53 +00:00
|
|
|
* \param rm region map for attaching shared buffer
|
2013-01-10 11:10:41 +00:00
|
|
|
* \param session session capability
|
|
|
|
* \param alloc_signal true, install 'alloc_signal' receiver
|
|
|
|
* \param progress_signal true, install 'progress_signal' receiver
|
|
|
|
*/
|
2017-01-06 14:32:53 +00:00
|
|
|
Session_client(Genode::Region_map &rm,
|
|
|
|
Genode::Capability<Session> session,
|
|
|
|
bool alloc_signal, bool progress_signal)
|
2013-01-10 11:10:41 +00:00
|
|
|
:
|
|
|
|
Genode::Rpc_client<Session>(session),
|
2017-01-06 14:32:53 +00:00
|
|
|
_shared_ds(rm, call<Rpc_dataspace>()),
|
2013-01-10 11:10:41 +00:00
|
|
|
_data_avail(call<Rpc_data_avail_sigh>())
|
|
|
|
{
|
2017-01-06 14:32:53 +00:00
|
|
|
_stream = _shared_ds.local_addr<Stream>();
|
2013-01-10 11:10:41 +00:00
|
|
|
|
|
|
|
if (progress_signal)
|
|
|
|
progress_sigh(_progress.cap);
|
|
|
|
|
|
|
|
if (alloc_signal)
|
|
|
|
alloc_sigh(_alloc.cap);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*************
|
|
|
|
** Signals **
|
|
|
|
*************/
|
|
|
|
|
2019-02-14 21:39:08 +00:00
|
|
|
void progress_sigh(Genode::Signal_context_capability sigh) override {
|
2013-01-10 11:10:41 +00:00
|
|
|
call<Rpc_progress_sigh>(sigh); }
|
|
|
|
|
2019-02-14 21:39:08 +00:00
|
|
|
void alloc_sigh(Genode::Signal_context_capability sigh) override {
|
2013-01-10 11:10:41 +00:00
|
|
|
call<Rpc_alloc_sigh>(sigh); }
|
|
|
|
|
2019-02-14 21:39:08 +00:00
|
|
|
Genode::Signal_context_capability data_avail_sigh() override {
|
2013-01-10 11:10:41 +00:00
|
|
|
return Genode::Signal_context_capability(); }
|
|
|
|
|
|
|
|
|
|
|
|
/***********************
|
|
|
|
** Session interface **
|
|
|
|
***********************/
|
|
|
|
|
2019-02-14 21:39:08 +00:00
|
|
|
void start() override
|
2013-01-10 11:10:41 +00:00
|
|
|
{
|
2015-11-25 17:56:12 +00:00
|
|
|
call<Rpc_start>();
|
|
|
|
|
2013-01-10 11:10:41 +00:00
|
|
|
/* reset tail pointer */
|
|
|
|
stream()->reset();
|
|
|
|
}
|
|
|
|
|
2019-02-14 21:39:08 +00:00
|
|
|
void stop() override { call<Rpc_stop>(); }
|
2013-01-10 11:10:41 +00:00
|
|
|
|
|
|
|
|
|
|
|
/**********************************
|
|
|
|
** Session interface extensions **
|
|
|
|
**********************************/
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Wait for progress signal
|
|
|
|
*/
|
|
|
|
void wait_for_progress()
|
|
|
|
{
|
|
|
|
if (!_progress.cap.valid()) {
|
base: avoid use of deprecated base/printf.h
Besides adapting the components to the use of base/log.h, the patch
cleans up a few base headers, i.e., it removes unused includes from
root/component.h, specifically base/heap.h and
ram_session/ram_session.h. Hence, components that relied on the implicit
inclusion of those headers have to manually include those headers now.
While adjusting the log messages, I repeatedly stumbled over the problem
that printing char * arguments is ambiguous. It is unclear whether to
print the argument as pointer or null-terminated string. To overcome
this problem, the patch introduces a new type 'Cstring' that allows the
caller to express that the argument should be handled as null-terminated
string. As a nice side effect, with this type in place, the optional len
argument of the 'String' class could be removed. Instead of supplying a
pair of (char const *, size_t), the constructor accepts a 'Cstring'.
This, in turn, clears the way let the 'String' constructor use the new
output mechanism to assemble a string from multiple arguments (and
thereby getting rid of snprintf within Genode in the near future).
To enforce the explicit resolution of the char * ambiguity, the 'char *'
overload of the 'print' function is marked as deleted.
Issue #1987
2016-07-13 17:07:09 +00:00
|
|
|
Genode::warning("Progress signal is not installed, will not block "
|
|
|
|
"(enable in 'Audio_out::Connection')");
|
2013-01-10 11:10:41 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
_progress.wait();
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Wait for allocation signal
|
|
|
|
*
|
|
|
|
* This can be used when the 'Stream' is full and the application wants
|
|
|
|
* to block until the stream has free elements again.
|
|
|
|
*/
|
|
|
|
void wait_for_alloc()
|
|
|
|
{
|
|
|
|
if (!_alloc.cap.valid()) {
|
base: avoid use of deprecated base/printf.h
Besides adapting the components to the use of base/log.h, the patch
cleans up a few base headers, i.e., it removes unused includes from
root/component.h, specifically base/heap.h and
ram_session/ram_session.h. Hence, components that relied on the implicit
inclusion of those headers have to manually include those headers now.
While adjusting the log messages, I repeatedly stumbled over the problem
that printing char * arguments is ambiguous. It is unclear whether to
print the argument as pointer or null-terminated string. To overcome
this problem, the patch introduces a new type 'Cstring' that allows the
caller to express that the argument should be handled as null-terminated
string. As a nice side effect, with this type in place, the optional len
argument of the 'String' class could be removed. Instead of supplying a
pair of (char const *, size_t), the constructor accepts a 'Cstring'.
This, in turn, clears the way let the 'String' constructor use the new
output mechanism to assemble a string from multiple arguments (and
thereby getting rid of snprintf within Genode in the near future).
To enforce the explicit resolution of the char * ambiguity, the 'char *'
overload of the 'print' function is marked as deleted.
Issue #1987
2016-07-13 17:07:09 +00:00
|
|
|
Genode::warning("Alloc signal is not installed, will not block "
|
|
|
|
"(enable in 'Audio_out::Connection')");
|
2013-01-10 11:10:41 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
_alloc.wait();
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Submit a packet
|
|
|
|
*/
|
|
|
|
void submit(Packet *packet)
|
|
|
|
{
|
|
|
|
bool empty = stream()->empty();
|
|
|
|
|
|
|
|
packet->_submit();
|
|
|
|
if (empty)
|
|
|
|
_data_avail.submit();
|
|
|
|
}
|
|
|
|
};
|
2011-12-22 15:19:25 +00:00
|
|
|
|
|
|
|
#endif /* _INCLUDE__AUDIO_OUT_SESSION__CLIENT_H_ */
|