Norman Feske a7b3072cc2 Pass Env & as first argument to connection objects
This patch supplements each existing connection type with an new
constructor that is meant to replace the original one. The new
one takes a reference to the component's environment as argument and
thereby does not rely on the presence of the globally accessible
'env()' interface.

The original constructors are marked as deprecated. Once we have
completely abolished the use of the global 'env()', we will remove them.

Fixes #1960
2016-05-23 15:52:37 +02:00

150 lines
4.3 KiB
C++

/*
* \brief Connection to file-system service
* \author Norman Feske
* \date 2012-04-05
*/
/*
* Copyright (C) 2012-2016 Genode Labs GmbH
*
* This file is part of the Genode OS framework, which is distributed
* under the terms of the GNU General Public License version 2.
*/
#ifndef _INCLUDE__FILE_SYSTEM_SESSION__CONNECTION_H_
#define _INCLUDE__FILE_SYSTEM_SESSION__CONNECTION_H_
#include <file_system_session/client.h>
#include <base/connection.h>
#include <base/allocator.h>
#include <util/retry.h>
namespace File_system {
struct Connection_base;
struct Connection;
/* recommended packet transmission buffer size */
enum { DEFAULT_TX_BUF_SIZE = 128*1024 };
}
/**
* The base implementation of a File_system connection
*/
struct File_system::Connection_base : Genode::Connection<Session>, Session_client
{
Capability<File_system::Session> _session(Genode::Parent &parent,
char const *label,
char const *root,
bool writeable,
size_t tx_buf_size)
{
return session(parent,
"ram_quota=%zd, "
"tx_buf_size=%zd, "
"label=\"%s\", "
"root=\"%s\", "
"writeable=%d",
8*1024*sizeof(long) + tx_buf_size,
tx_buf_size,
label, root, writeable);
}
/**
* Constructor
*
* \param tx_buffer_alloc allocator used for managing the
* transmission buffer
* \param label session label
* \param root root directory of session
* \param writeable session is writable
* \param tx_buf_size size of transmission buffer in bytes
*/
Connection_base(Genode::Env &env,
Genode::Range_allocator &tx_block_alloc,
char const *label = "",
char const *root = "/",
bool writeable = true,
size_t tx_buf_size = DEFAULT_TX_BUF_SIZE)
:
Genode::Connection<Session>(env, _session(env.parent(), label, root,
writeable, tx_buf_size)),
Session_client(cap(), tx_block_alloc)
{ }
/**
* Constructor
*
* \noapi
* \deprecated Use the constructor with 'Env &' as first
* argument instead
*/
Connection_base(Genode::Range_allocator &tx_block_alloc,
size_t tx_buf_size = DEFAULT_TX_BUF_SIZE,
char const *label = "",
char const *root = "/",
bool writeable = true)
:
Genode::Connection<Session>(_session(*Genode::env()->parent(), label,
root, writeable, tx_buf_size)),
Session_client(cap(), tx_block_alloc)
{ }
};
/**
* A File_system connection that upgrades its RAM quota
*/
struct File_system::Connection : File_system::Connection_base
{
/* reuse constructor */
using Connection_base::Connection_base;
/**
* Upgrade the session quota in response to Out_of_metadata
*/
void upgrade_ram()
{
PWRN("upgrading File_system session");
Genode::env()->parent()->upgrade(cap(), "ram=8K");
}
enum { UPGRADE_ATTEMPTS = 2 };
Dir_handle dir(Path const &path, bool create) override
{
return Genode::retry<Out_of_metadata>(
[&] () { return Session_client::dir(path, create); },
[&] () { upgrade_ram(); },
UPGRADE_ATTEMPTS);
}
File_handle file(Dir_handle dir, Name const &name, Mode mode, bool create) override
{
return Genode::retry<Out_of_metadata>(
[&] () { return Session_client::file(dir, name, mode, create); },
[&] () { upgrade_ram(); },
UPGRADE_ATTEMPTS);
}
Symlink_handle symlink(Dir_handle dir, Name const &name, bool create) override
{
return Genode::retry<Out_of_metadata>(
[&] () { return Session_client::symlink(dir, name, create); },
[&] () { upgrade_ram(); },
UPGRADE_ATTEMPTS);
}
Node_handle node(Path const &path) override
{
return Genode::retry<Out_of_metadata>(
[&] () { return Session_client::node(path); },
[&] () { upgrade_ram(); },
UPGRADE_ATTEMPTS);
}
};
#endif /* _INCLUDE__FILE_SYSTEM_SESSION__CONNECTION_H_ */