Norman Feske 17c79a9e23 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-08-29 17:27:10 +02:00

98 lines
2.0 KiB
C++

/*
* \brief file descriptor allocator interface
* \author Christian Prochaska
* \date 2010-01-21
*
*/
/*
* Copyright (C) 2010-2013 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 _LIBC_PLUGIN__FD_ALLOC_H_
#define _LIBC_PLUGIN__FD_ALLOC_H_
#include <base/allocator_avl.h>
#include <base/lock.h>
#include <base/log.h>
#include <os/path.h>
/* libc includes */
#include <stdlib.h>
#include <string.h>
#include <libc-plugin/plugin.h>
enum { MAX_NUM_FDS = 1024 };
namespace Libc {
/**
* Plugin-specific file-descriptor context
*/
struct Plugin_context { virtual ~Plugin_context() { } };
enum { ANY_FD = -1 };
struct File_descriptor
{
int libc_fd = -1;
char const *fd_path = 0; /* for 'fchdir', 'fstat' */
Plugin *plugin = 0;
Plugin_context *context = 0;
unsigned flags = 0; /* for 'fcntl' */
unsigned status = 0; /* for 'fcntl' */
Genode::Lock lock;
void path(char const *newpath)
{
if (newpath) {
size_t const path_size = ::strlen(newpath) + 1;
char *buf = (char*)malloc(path_size);
if (!buf) {
Genode::error("could not allocate path buffer for libc_fd ",
libc_fd, libc_fd == ANY_FD ? " (any)" : "");
return;
}
::memcpy(buf, newpath, path_size);
fd_path = buf;
} else
fd_path = 0;
}
};
class File_descriptor_allocator : Allocator_avl_tpl<File_descriptor>
{
public:
/**
* Constructor
*/
File_descriptor_allocator();
/**
* Allocate file descriptor
*/
File_descriptor *alloc(Plugin *plugin, Plugin_context *context, int libc_fd = -1);
/**
* Release file descriptor
*/
void free(File_descriptor *fdo);
File_descriptor *find_by_libc_fd(int libc_fd);
};
/**
* Return singleton instance of file-descriptor allocator
*/
extern File_descriptor_allocator *file_descriptor_allocator();
}
#endif /* _LIBC_PLUGIN__FD_ALLOC_H_ */