17c79a9e23
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
154 lines
4.3 KiB
C++
154 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
|
|
{
|
|
/**
|
|
* Issue session request
|
|
*
|
|
* \noapi
|
|
*/
|
|
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()
|
|
{
|
|
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_ */
|