mirror of
https://github.com/genodelabs/genode.git
synced 2025-06-13 12:48:20 +00:00
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
This commit is contained in:
committed by
Christian Helmuth
parent
a5d3aa8373
commit
17c79a9e23
@ -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);
|
||||
}
|
||||
|
@ -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);
|
||||
}
|
||||
|
@ -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();
|
||||
}
|
||||
}
|
||||
|
@ -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();
|
||||
}
|
||||
|
Reference in New Issue
Block a user