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

repos/base-linux/src/lib/base/child_process.cc

@@ -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();
 		}
 

repos/base-linux/src/lib/base/region_map_mmap.cc

@@ -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();
 			}
 

repos/base-linux/src/lib/lx_hybrid/lx_hybrid.cc

@@ -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 =

repos/base-linux/src/lib/syscall/linux_syscalls.h

@@ -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)