ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-06-15 13:48:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

base: avoid use of deprecated base/printf.h

Browse Source 
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
This commit is contained in:
Norman Feske
2016-07-13 19:07:09 +02:00
committed by Christian Helmuth
parent a5d3aa8373
commit 17c79a9e23
699 changed files with 5156 additions and 5865 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
repos/base-linux/src/core/include/platform_thread.h
View File

@ -118,13 +118,13 @@ namespace Genode {
Thread_state state()
{
PDBG("Not implemented");
warning("Not implemented");
throw Cpu_thread::State_access_failed();
}
void state(Thread_state)
{
PDBG("Not implemented");
warning("Not implemented");
throw Cpu_thread::State_access_failed();
}

6
repos/base-linux/src/core/native_pd_component.cc
View File

@ -13,7 +13,7 @@
/* Genode includes */
#include <util/arg_string.h>
#include <base/printf.h>
#include <base/log.h>
#include <base/snprintf.h>
/* core-local includes */
@ -112,7 +112,7 @@ void Native_pd_component::_start(Dataspace_component &ds)
int tmp_binary_fd = lx_open(filename, O_CREAT | O_EXCL | O_WRONLY, S_IRWXU);
if (tmp_binary_fd < 0) {
PERR("Could not create file '%s'", filename);
error("Could not create file '", filename, "'");
return; /* XXX reflect error to client */
}
@ -205,6 +205,6 @@ void Native_pd_component::start(Capability<Dataspace> binary)
if (ds)
_start(*ds);
else
PERR("failed to lookup binary to start");
error("failed to lookup binary to start");
});
};

2
repos/base-linux/src/core/platform.cc
View File

@ -173,7 +173,7 @@ namespace Genode {
* as well as in Genode processes.
*/
if (socket_pair.server_sd != -1 || socket_pair.client_sd != -1)
PERR("%s called for IPC server which should never happen", __func__);
error(__func__, " called for IPC server which should never happen");
}
}

7
repos/base-linux/src/core/platform_thread.cc
View File

@ -14,7 +14,7 @@
/* Genode includes */
#include <util/token.h>
#include <util/misc_math.h>
#include <base/printf.h>
#include <base/log.h>
/* local includes */
#include "platform_thread.h"
@ -100,20 +100,19 @@ Platform_thread::~Platform_thread()
void Platform_thread::cancel_blocking()
{
PDBG("send cancel-blocking signal to %ld\n", _tid);
lx_tgkill(_pid, _tid, LX_SIGUSR1);
}
void Platform_thread::pause()
{
PDBG("not implemented");
warning(__func__, "not implemented");
}
void Platform_thread::resume()
{
PDBG("not implemented");
warning(__func__, "not implemented");
}

5
repos/base-linux/src/include/base/internal/region_registry.h
View File

@ -15,7 +15,7 @@
#define _INCLUDE__BASE__INTERNAL__REGION_REGISTRY_
#include <dataspace/capability.h>
#include <base/printf.h>
#include <base/log.h>
namespace Genode {
class Region;
@ -97,8 +97,7 @@ class Genode::Region_registry
if (!_map[i].used()) break;
if (i == MAX_REGIONS) {
PERR("maximum number of %d regions reached",
MAX_REGIONS);
error("maximum number of ", (unsigned)MAX_REGIONS, " regions reached");
return -1;
}

6
repos/base-linux/src/include/base/internal/stack_area.h
View File

@ -52,7 +52,7 @@ static inline void flush_stack_area()
int ret;
if ((ret = lx_munmap(base, size)) < 0) {
PERR("%s: failed ret=%d", __func__, ret);
error(__func__, ": failed ret=", ret);
throw Region_map::Region_conflict();
}
}
@ -71,9 +71,7 @@ static inline Genode::addr_t reserve_stack_area()
/* reserve at local address failed - unmap incorrect mapping */
if (addr_in != addr_out) {
lx_munmap((void *)addr_out, size);
PERR("%s: failed addr_in=%p addr_out=%p ret=%ld)", __func__,
addr_in, addr_out, (long)addr_out);
error(__func__, ": failed addr_in=", addr_in, " addr_out=", addr_out);
throw Region_map::Region_conflict();
}

6
repos/base-linux/src/lib/base/child_process.cc
View File

@ -14,7 +14,7 @@
/* Genode includes */
#include <base/env.h>
#include <base/child.h>
#include <base/printf.h>
#include <base/log.h>
#include <linux_native_pd/client.h>
/* base-internal includes */
@ -79,7 +79,7 @@ Child::Process::Process(Dataspace_capability elf_ds,
addr_t elf_addr;
try { elf_addr = local_rm.attach(elf_ds); }
catch (Region_map::Attach_failed) {
PERR("local attach of ELF executable failed"); throw; }
error("local attach of ELF executable failed"); throw; }
/* setup ELF object and read program entry pointer */
Elf_binary elf(elf_addr);
@ -97,7 +97,7 @@ Child::Process::Process(Dataspace_capability elf_ds,
if (dynamically_linked) {
if (!ldso_ds.valid()) {
PERR("attempt to start dynamic executable without dynamic linker");
error("attempt to start dynamic executable without dynamic linker");
throw Missing_dynamic_linker();
}

21
repos/base-linux/src/lib/base/region_map_mmap.cc
View File

@ -98,8 +98,8 @@ addr_t Region_map_mmap::_reserve_local(bool use_local_addr,
if ((use_local_addr && addr_in != addr_out)
|| (((long)addr_out < 0) && ((long)addr_out > -4095))) {
PERR("_reserve_local: lx_mmap failed (addr_in=%p,addr_out=%p/%ld)",
addr_in, addr_out, (long)addr_out);
error("_reserve_local: lx_mmap failed "
"(addr_in=", addr_in, ",addr_out=", addr_out, "/", (long)addr_out, ")");
throw Region_map::Region_conflict();
}
@ -139,8 +139,9 @@ void *Region_map_mmap::_map_local(Dataspace_capability ds,
if ((use_local_addr && addr_in != addr_out)
|| (((long)addr_out < 0) && ((long)addr_out > -4095))) {
PERR("_map_local: lx_mmap failed (addr_in=%p,addr_out=%p/%ld) overmap=%d",
addr_in, addr_out, (long)addr_out, overmap);
error("_map_local: lx_mmap failed"
"(addr_in=", addr_in, ", addr_out=", addr_out, "/", (long)addr_out, ") "
"overmap=", overmap);
throw Region_map::Region_conflict();
}
@ -151,7 +152,7 @@ void *Region_map_mmap::_map_local(Dataspace_capability ds,
void Region_map_mmap::_add_to_rmap(Region const &region)
{
if (_rmap.add_region(region) < 0) {
PERR("_add_to_rmap: could not add region to sub RM session");
error("_add_to_rmap: could not add region to sub RM session");
throw Region_conflict();
}
}
@ -167,12 +168,12 @@ Region_map::Local_addr Region_map_mmap::attach(Dataspace_capability ds,
/* only support attach_at for sub RM sessions */
if (_sub_rm && !use_local_addr) {
PERR("Region_map_mmap::attach: attaching w/o local addr not supported\n");
error("Region_map_mmap::attach: attaching w/o local addr not supported");
throw Out_of_metadata();
}
if (offset < 0) {
PERR("Region_map_mmap::attach: negative offset not supported\n");
error("Region_map_mmap::attach: negative offset not supported");
throw Region_conflict();
}
@ -204,7 +205,7 @@ Region_map::Local_addr Region_map_mmap::attach(Dataspace_capability ds,
* Case 4
*/
if (is_sub_rm_session(ds)) {
PERR("Region_map_mmap::attach: nesting sub RM sessions is not supported");
error("Region_map_mmap::attach: nesting sub RM sessions is not supported");
throw Invalid_dataspace();
}
@ -213,7 +214,7 @@ Region_map::Local_addr Region_map_mmap::attach(Dataspace_capability ds,
* sub RM session
*/
if (region_size + (addr_t)local_addr > _size) {
PERR("Region_map_mmap::attach: dataspace does not fit in sub RM session");
error("Region_map_mmap::attach: dataspace does not fit in sub RM session");
throw Region_conflict();
}
@ -249,7 +250,7 @@ Region_map::Local_addr Region_map_mmap::attach(Dataspace_capability ds,
* Detect if sub RM session is already attached
*/
if (rm->_base) {
PERR("Region_map_mmap::attach: mapping a sub RM session twice is not supported");
error("Region_map_mmap::attach: mapping a sub RM session twice is not supported");
throw Out_of_metadata();
}

20
repos/base-linux/src/lib/lx_hybrid/lx_hybrid.cc
View File

@ -12,7 +12,6 @@
*/
/* Genode includes */
#include <base/printf.h>
#include <base/log.h>
#include <base/component.h>
#include <linux_syscalls.h>
@ -307,32 +306,32 @@ namespace Genode {
void wait_for_construction()
{
PERR("wait_for_construction() called for an adopted thread");
error("wait_for_construction() called for an adopted thread");
}
void constructed()
{
PERR("constructed() called for an adopted thread");
error("constructed() called for an adopted thread");
}
void wait_for_start()
{
PERR("wait_for_start() called for an adopted thread");
error("wait_for_start() called for an adopted thread");
}
void started()
{
PERR("started() called for an adopted thread");
error("started() called for an adopted thread");
}
void wait_for_join()
{
PERR("wait_for_join() called for an adopted thread");
error("wait_for_join() called for an adopted thread");
}
void joined()
{
PERR("joined() called for an adopted thread");
error("joined() called for an adopted thread");
}
};
}
@ -464,8 +463,7 @@ Thread::Thread(size_t weight, const char *name, size_t stack_size,
int const ret = pthread_create(&meta_data->pt, 0, thread_start, meta_data);
if (ret) {
PERR("pthread_create failed (returned %d, errno=%d)",
ret, errno);
error("pthread_create failed (returned ", ret, ", errno=", errno, ")");
destroy(env()->heap(), meta_data);
throw Out_of_stack_space();
}
@ -511,8 +509,8 @@ Thread::~Thread()
if (needs_join) {
int const ret = pthread_join(native_thread().meta_data->pt, 0);
if (ret)
PWRN("pthread_join unexpectedly returned with %d (errno=%d)",
ret, errno);
warning("pthread_join unexpectedly returned "
"with ", ret, " (errno=", errno, ")");
}
Thread_meta_data_created *meta_data =

2
repos/base-linux/src/lib/syscall/linux_syscalls.h
View File

@ -57,7 +57,7 @@ extern "C" void wait_for_continue(void);
char str[128]; \
Genode::snprintf(str, sizeof(str), \
ESC_ERR fmt ESC_END "\n", ##__VA_ARGS__); \
Genode::raw((char const *)str); \
Genode::raw(Genode::Cstring(str)); \
} while (0)

14
repos/base-linux/src/test/lx_hybrid_errno/main.cc
View File

@ -7,7 +7,7 @@
/* Genode includes */
#include <base/component.h>
#include <base/thread.h>
#include <base/printf.h>
#include <base/log.h>
/* libc includes */
#include <sys/stat.h>
@ -32,7 +32,7 @@ struct Thread : Genode::Thread_deprecated<STACK_SIZE>
struct stat buf;
int ret = stat("", &buf);
Genode::printf("thread: stat returned %d, errno=%d\n", ret, errno);
Genode::log("thread: stat returned ", ret, ", errno=", errno);
/*
* Let main thread procees
@ -56,13 +56,13 @@ struct Unexpected_errno_change { };
*/
void Component::construct(Genode::Env &env)
{
Genode::printf("--- thread-local errno test ---\n");
Genode::log("--- thread-local errno test ---");
static Genode::Lock barrier(Genode::Lock::LOCKED);
int const orig_errno = errno;
Genode::printf("main: before thread creation, errno=%d\n", orig_errno);
Genode::log("main: before thread creation, errno=", orig_errno);
/* create thread, which modifies its thread-local errno value */
static Thread thread(barrier);
@ -70,14 +70,14 @@ void Component::construct(Genode::Env &env)
/* block until the thread performed a 'stat' syscall */
barrier.lock();
Genode::printf("main: after thread completed, errno=%d\n", errno);
Genode::log("main: after thread completed, errno=", errno);
if (orig_errno != errno) {
PERR("unexpected change of main thread's errno value");
Genode::error("unexpected change of main thread's errno value");
throw Unexpected_errno_change();
}
Genode::printf("--- finished thread-local errno test ---\n");
Genode::log("--- finished thread-local errno test ---");
exit_status = 0;
env.ep().schedule_suspend(exit_on_suspended, nullptr);
}

10
repos/base-linux/src/test/lx_hybrid_pthread_ipc/main.cc
View File

@ -14,7 +14,7 @@
/* Genode includes */
#include <base/component.h>
#include <base/thread.h>
#include <base/printf.h>
#include <base/log.h>
/* libc includes */
#include <pthread.h>
@ -31,7 +31,7 @@ static Genode::Lock *main_wait_lock()
static void *pthread_entry(void *)
{
PINF("first message");
Genode::log("first message");
/*
* Without the lazy initialization of 'Thread' objects for threads
@ -42,7 +42,7 @@ static void *pthread_entry(void *)
* will appear in the LOG output.
*/
PINF("second message");
Genode::log("second message");
main_wait_lock()->unlock();
return 0;
@ -61,7 +61,7 @@ Genode::size_t Component::stack_size() { return 16*1024*sizeof(long); }
*/
void Component::construct(Genode::Env &env)
{
Genode::printf("--- pthread IPC test ---\n");
Genode::log("--- pthread IPC test ---");
/* create thread w/o Genode's thread API */
pthread_t pth;
@ -70,7 +70,7 @@ void Component::construct(Genode::Env &env)
/* wait until 'pthread_entry' finished */
main_wait_lock()->lock();
Genode::printf("--- finished pthread IPC test ---\n");
Genode::log("--- finished pthread IPC test ---");
exit_status = 0;
env.ep().schedule_suspend(exit_on_suspended, nullptr);
}

24
repos/base-linux/src/test/lx_rmap/main.cc
View File

@ -12,7 +12,7 @@
*/
/* Genode includes */
#include <base/printf.h>
#include <base/log.h>
#include <base/env.h>
#include <base/sleep.h>
#include <base/thread.h>
@ -57,18 +57,18 @@ int main()
size_t size(end - beg);
PLOG("blob region region [%016lx,%016lx) size=%zx", beg, end, size);
log("blob region region ", Hex_range<addr_t>(beg, size), " size=", size);
/* RAM dataspace attachment overlapping binary */
try {
Ram_dataspace_capability ds(env()->ram_session()->alloc(size));
PLOG("before RAM dataspace attach");
log("before RAM dataspace attach");
env()->rm_session()->attach_at(ds, beg);
PERR("after RAM dataspace attach -- ERROR");
error("after RAM dataspace attach -- ERROR");
sleep_forever();
} catch (Region_map::Region_conflict) {
PLOG("OK caught Region_conflict exception");
log("OK caught Region_conflict exception");
}
/* empty managed dataspace overlapping binary */
@ -77,12 +77,12 @@ int main()
Region_map_client rm(rm_connection.create(size));
Dataspace_capability ds(rm.dataspace());
PLOG("before sub-RM dataspace attach");
log("before sub-RM dataspace attach");
env()->rm_session()->attach_at(ds, beg);
PERR("after sub-RM dataspace attach -- ERROR");
error("after sub-RM dataspace attach -- ERROR");
sleep_forever();
} catch (Region_map::Region_conflict) {
PLOG("OK caught Region_conflict exception");
log("OK caught Region_conflict exception");
}
/* sparsely populated managed dataspace in free VM area */
@ -94,14 +94,14 @@ int main()
Dataspace_capability ds(rm.dataspace());
PLOG("before populated sub-RM dataspace attach");
log("before populated sub-RM dataspace attach");
char *addr = (char *)env()->rm_session()->attach(ds) + 0x1000;
PLOG("after populated sub-RM dataspace attach / before touch");
log("after populated sub-RM dataspace attach / before touch");
char const val = *addr;
*addr = 0x55;
PLOG("after touch (%x/%x)", val, *addr);
log("after touch (", val, "/", *addr, ")");
} catch (Region_map::Region_conflict) {
PERR("Caught Region_conflict exception -- ERROR");
error("Caught Region_conflict exception -- ERROR");
sleep_forever();
}
}

17
repos/base-linux/src/test/region_map_mmap/main.cc
View File

@ -12,7 +12,7 @@
*/
#include <base/env.h>
#include <base/printf.h>
#include <base/log.h>
#include <ram_session/connection.h>
#include <timer_session/connection.h>
@ -23,31 +23,28 @@ static void test_linux_rmmap_bug()
using namespace Genode;
PLOG("line: %d", __LINE__);
log("line: ", __LINE__);
Ram_connection ram;
#if 1 /* transfer quota */
PLOG("line: %d", __LINE__);
log("line: ", __LINE__);
ram.ref_account(env()->ram_session_cap());
env()->ram_session()->transfer_quota(ram.cap(), QUOTA);
#endif
PLOG("line: %d", __LINE__);
log("line: ", __LINE__);
for (unsigned i = 0; i < ROUNDS; ++i) {
Ram_dataspace_capability ds(ram.alloc(CHUNK));
PLOG("%d of %d pages allocated", (i + 1), ROUNDS);
log(i + 1, " of ", (unsigned)ROUNDS, " pages allocated");
}
PLOG("Done.");
log("Done.");
}
int main()
{
Genode::printf("--- test-rm_session_mmap started ---\n");
// Timer::Connection timer;
// timer.msleep(1000);
Genode::log("--- test-rm_session_mmap started ---");
test_linux_rmmap_bug();
}