ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-02-20 09:46:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

base: add 'Connection' constructor accepting args

Browse Source 
The new 'Connection' constructor accepts the session label, affinity,
and args as constructor arguments. The session arguments are passed as a
'Genode::String'. This allows for side-stepping the need for rendering a
format string passed to 'Env::session'.

Issue #2064
This commit is contained in:
Norman Feske 2023-03-03 09:45:12 +01:00 committed by Christian Helmuth
parent bed084c17c
commit fb66e733b5
1 changed files with 63 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
repos/base/include/base/connection.h
View File

@ -5,7 +5,7 @@
*/
/*
* Copyright (C) 2008-2017 Genode Labs GmbH
* Copyright (C) 2008-2023 Genode Labs GmbH
*
* This file is part of the Genode OS framework, which is distributed
* under the terms of the GNU Affero General Public License version 3.
@ -101,6 +101,12 @@ class Genode::Connection_base : Noncopyable, Interface
template <typename SESSION_TYPE>
class Genode::Connection : public Connection_base
{
public:
using Args = String<Parent::Session_args::MAX_SIZE>;
using Session_type = SESSION_TYPE;
using Ram_quota = Genode::Ram_quota;
private:
/*
@ -126,6 +132,36 @@ class Genode::Connection : public Connection_base
_affinity_arg = affinity;
}
using Client_id = Parent::Client::Id;
static Capability<SESSION_TYPE> _request(Env &env,
Client_id const &id,
Session_label const &label,
Ram_quota const &ram_quota,
Affinity const &affinity,
Args const &args)
{
/* supplement session quotas and label as session arguments */
Args const complete_args("label=\"", label, "\", "
"ram_quota=", ram_quota, ", "
"cap_quota=", unsigned(SESSION_TYPE::CAP_QUOTA), ", ",
args);
if (complete_args.length() == Args::capacity())
warning("truncated arguments of ",
SESSION_TYPE::service_name(), " session");
try {
return env.session<SESSION_TYPE>(id, complete_args.string(),
affinity);
}
catch (...) {
error(SESSION_TYPE::service_name(), "-session creation failed "
"(", complete_args, ")");
throw;
}
}
Capability<SESSION_TYPE> _request_cap()
{
try {
@ -142,19 +178,38 @@ class Genode::Connection : public Connection_base
public:
typedef SESSION_TYPE Session_type;
/**
* Constructor
*
* \deprecated
*/
Connection(Env &env, Capability<SESSION_TYPE>)
:
Connection_base(env), _cap(_request_cap())
{ }
Connection(Env &env,
Session_label const &label,
Ram_quota const &ram_quota,
Affinity const &affinity,
Args const &args)
:
Connection_base(env),
_cap(_request(env, _id_space_element.id(),
label, ram_quota, affinity, args))
{ }
/**
* Destructor
* Constructor
*
* Shortcut for the common case where the affinity is not specified.
*/
Connection(Env &env, Session_label const &label,
Ram_quota const &ram_quota, Args const &args)
:
Connection(env, label, ram_quota, Affinity(), args)
{ }
~Connection() { _env.close(_id_space_element.id()); }
/**
@ -164,6 +219,8 @@ class Genode::Connection : public Connection_base
/**
* Issue session request to the parent
*
* \deprecated
*/
Capability<SESSION_TYPE> session(Parent &parent, const char *format_args, ...)
{
@ -176,6 +233,8 @@ class Genode::Connection : public Connection_base
/**
* Issue session request to the parent
*
* \deprecated
*/
Capability<SESSION_TYPE> session(Parent &parent,
Affinity const &affinity,