From 62d65d00e0da1343c67f61bb4d0f46f971b53bbd Mon Sep 17 00:00:00 2001
From: Norman Feske <norman.feske@genode-labs.com>
Date: Tue, 12 Jul 2016 16:33:18 +0200
Subject: [PATCH] Remove signal-source headers from public API

Those headers implement a platform-specific mechanism. They are never
used by components directly.

This patch also cleans up a few other remaining platform-specific
artifact such as the Fiasco.OC-specific assert.h.

Issue #1993
---
 repos/base-foc/include/util/assert.h          | 37 -------------------
 repos/base-foc/src/core/rpc_cap_factory.cc    |  3 +-
 .../src/include/base/internal/cap_alloc.h     |  2 +-
 .../src/include/base/internal/foc_assert.h    | 32 ++++++++++++++++
 .../{ => src}/include/signal_source/client.h  |  0
 .../include/signal_source/foc_signal_source.h |  0
 .../include/signal_source/rpc_object.h        |  0
 repos/base-foc/src/lib/base/cap_map.cc        |  5 +--
 repos/base-foc/src/lib/base/ipc.cc            |  2 +-
 .../{ => src}/include/signal_source/client.h  |  0
 .../signal_source/nova_signal_source.h        |  0
 repos/base/include/pd_session/pd_session.h    |  1 -
 .../include/signal_source/capability.h        |  0
 .../{ => src}/include/signal_source/client.h  |  1 +
 .../include/signal_source/rpc_object.h        |  0
 .../include/signal_source/signal_source.h     |  0
 repos/base/src/lib/base/rpc_entrypoint.cc     |  1 +
 repos/base/src/lib/base/signal.cc             |  2 +-
 repos/ports-foc/src/lib/l4lx/genode_block.cc  | 12 ++++--
 19 files changed, 48 insertions(+), 50 deletions(-)
 delete mode 100644 repos/base-foc/include/util/assert.h
 create mode 100644 repos/base-foc/src/include/base/internal/foc_assert.h
 rename repos/base-foc/{ => src}/include/signal_source/client.h (100%)
 rename repos/base-foc/{ => src}/include/signal_source/foc_signal_source.h (100%)
 rename repos/base-foc/{ => src}/include/signal_source/rpc_object.h (100%)
 rename repos/base-nova/{ => src}/include/signal_source/client.h (100%)
 rename repos/base-nova/{ => src}/include/signal_source/nova_signal_source.h (100%)
 rename repos/base/{ => src}/include/signal_source/capability.h (100%)
 rename repos/base/{ => src}/include/signal_source/client.h (95%)
 rename repos/base/{ => src}/include/signal_source/rpc_object.h (100%)
 rename repos/base/{ => src}/include/signal_source/signal_source.h (100%)

diff --git a/repos/base-foc/include/util/assert.h b/repos/base-foc/include/util/assert.h
deleted file mode 100644
index 43bc7f142..000000000
--- a/repos/base-foc/include/util/assert.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * \brief  Assertion macros for Fiasco.OC
- * \author Stefan Kalkowski
- * \date   2012-05-25
- */
-
-/*
- * Copyright (C) 2006-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 _INCLUDE__UTIL__ASSERT_H_
-#define _INCLUDE__UTIL__ASSERT_H_
-
-#include <base/printf.h>
-
-namespace Fiasco {
-#include <l4/sys/kdebug.h>
-}
-
-#if 1
-#define ASSERT(e, s) \
-	do { if (!(e)) {                               \
-		Fiasco::outstring(ESC_ERR s ESC_END "\n"); \
-		Fiasco::outstring(__FILE__ ":");           \
-		Fiasco::outdec(__LINE__);                  \
-		Fiasco::outstring("\n");                   \
-		enter_kdebug("ASSERT");                    \
-		}                                          \
-	} while(0)
-#else
-#define ASSERT(e, s)  do { } while (0)
-#endif
-
-#endif /* _INCLUDE__UTIL__ASSERT_H_ */
diff --git a/repos/base-foc/src/core/rpc_cap_factory.cc b/repos/base-foc/src/core/rpc_cap_factory.cc
index 8672f2072..cce7ab30f 100644
--- a/repos/base-foc/src/core/rpc_cap_factory.cc
+++ b/repos/base-foc/src/core/rpc_cap_factory.cc
@@ -24,6 +24,7 @@
 
 /* base-internal includes */
 #include <base/internal/cap_alloc.h>
+#include <base/internal/foc_assert.h>
 
 /* Fiasco includes */
 namespace Fiasco {
@@ -34,8 +35,6 @@ namespace Fiasco {
 #include <l4/sys/types.h>
 }
 
-#include <util/assert.h>
-
 using namespace Genode;
 
 
diff --git a/repos/base-foc/src/include/base/internal/cap_alloc.h b/repos/base-foc/src/include/base/internal/cap_alloc.h
index 7b995af1a..760cb17a3 100644
--- a/repos/base-foc/src/include/base/internal/cap_alloc.h
+++ b/repos/base-foc/src/include/base/internal/cap_alloc.h
@@ -16,12 +16,12 @@
 
 /* Genode includes */
 #include <base/native_capability.h>
-#include <util/assert.h>
 #include <util/construct_at.h>
 #include <foc/native_capability.h>
 
 /* base-internal includes */
 #include <base/internal/cap_map.h>
+#include <base/internal/foc_assert.h>
 
 namespace Genode {
 
diff --git a/repos/base-foc/src/include/base/internal/foc_assert.h b/repos/base-foc/src/include/base/internal/foc_assert.h
new file mode 100644
index 000000000..04f73c325
--- /dev/null
+++ b/repos/base-foc/src/include/base/internal/foc_assert.h
@@ -0,0 +1,32 @@
+/*
+ * \brief  Assertion macros for Fiasco.OC
+ * \author Stefan Kalkowski
+ * \date   2012-05-25
+ */
+
+/*
+ * Copyright (C) 2006-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 _INCLUDE__BASE__INTERNAL__FOC_ASSERT_H_
+#define _INCLUDE__BASE__INTERNAL__FOC_ASSERT_H_
+
+/* Genode includes */
+#include <base/log.h>
+
+/* Fiasco includes */
+namespace Fiasco {
+#include <l4/sys/kdebug.h>
+}
+
+#define ASSERT(e, s) \
+	do { if (!(e)) { \
+		Genode::raw("assertion failed: ", s, __FILE__, __LINE__); \
+		enter_kdebug("ASSERT"); \
+		} \
+	} while(0)
+
+#endif /* _INCLUDE__BASE__INTERNAL__FOC_ASSERT_H_ */
diff --git a/repos/base-foc/include/signal_source/client.h b/repos/base-foc/src/include/signal_source/client.h
similarity index 100%
rename from repos/base-foc/include/signal_source/client.h
rename to repos/base-foc/src/include/signal_source/client.h
diff --git a/repos/base-foc/include/signal_source/foc_signal_source.h b/repos/base-foc/src/include/signal_source/foc_signal_source.h
similarity index 100%
rename from repos/base-foc/include/signal_source/foc_signal_source.h
rename to repos/base-foc/src/include/signal_source/foc_signal_source.h
diff --git a/repos/base-foc/include/signal_source/rpc_object.h b/repos/base-foc/src/include/signal_source/rpc_object.h
similarity index 100%
rename from repos/base-foc/include/signal_source/rpc_object.h
rename to repos/base-foc/src/include/signal_source/rpc_object.h
diff --git a/repos/base-foc/src/lib/base/cap_map.cc b/repos/base-foc/src/lib/base/cap_map.cc
index 47974fb8c..fb7b32702 100644
--- a/repos/base-foc/src/lib/base/cap_map.cc
+++ b/repos/base-foc/src/lib/base/cap_map.cc
@@ -13,13 +13,10 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-/* Genode includes */
-#include <util/assert.h>
-#include <base/log.h>
-
 /* base-internal includes */
 #include <base/internal/spin_lock.h>
 #include <base/internal/cap_map.h>
+#include <base/internal/foc_assert.h>
 
 /* kernel includes */
 #include <foc/capability_space.h>
diff --git a/repos/base-foc/src/lib/base/ipc.cc b/repos/base-foc/src/lib/base/ipc.cc
index 8abe4dcbc..71866b9e5 100644
--- a/repos/base-foc/src/lib/base/ipc.cc
+++ b/repos/base-foc/src/lib/base/ipc.cc
@@ -26,13 +26,13 @@
 #include <base/ipc.h>
 #include <base/ipc_msgbuf.h>
 #include <base/thread.h>
-#include <util/assert.h>
 
 /* base-internal includes */
 #include <base/internal/lock_helper.h> /* for 'thread_get_my_native_id()' */
 #include <base/internal/ipc_server.h>
 #include <base/internal/native_utcb.h>
 #include <base/internal/cap_map.h>
+#include <base/internal/foc_assert.h>
 
 /* Fiasco.OC includes */
 namespace Fiasco {
diff --git a/repos/base-nova/include/signal_source/client.h b/repos/base-nova/src/include/signal_source/client.h
similarity index 100%
rename from repos/base-nova/include/signal_source/client.h
rename to repos/base-nova/src/include/signal_source/client.h
diff --git a/repos/base-nova/include/signal_source/nova_signal_source.h b/repos/base-nova/src/include/signal_source/nova_signal_source.h
similarity index 100%
rename from repos/base-nova/include/signal_source/nova_signal_source.h
rename to repos/base-nova/src/include/signal_source/nova_signal_source.h
diff --git a/repos/base/include/pd_session/pd_session.h b/repos/base/include/pd_session/pd_session.h
index 0074b93ab..b3053382c 100644
--- a/repos/base/include/pd_session/pd_session.h
+++ b/repos/base/include/pd_session/pd_session.h
@@ -20,7 +20,6 @@
 #include <base/exception.h>
 #include <thread/capability.h>
 #include <session/session.h>
-#include <signal_source/signal_source.h>
 #include <region_map/region_map.h>
 
 namespace Genode {
diff --git a/repos/base/include/signal_source/capability.h b/repos/base/src/include/signal_source/capability.h
similarity index 100%
rename from repos/base/include/signal_source/capability.h
rename to repos/base/src/include/signal_source/capability.h
diff --git a/repos/base/include/signal_source/client.h b/repos/base/src/include/signal_source/client.h
similarity index 95%
rename from repos/base/include/signal_source/client.h
rename to repos/base/src/include/signal_source/client.h
index aa2448898..b6843e43c 100644
--- a/repos/base/include/signal_source/client.h
+++ b/repos/base/src/include/signal_source/client.h
@@ -16,6 +16,7 @@
 
 #include <base/rpc_client.h>
 #include <pd_session/pd_session.h>
+#include <signal_source/signal_source.h>
 
 namespace Genode { class Signal_source_client; }
 
diff --git a/repos/base/include/signal_source/rpc_object.h b/repos/base/src/include/signal_source/rpc_object.h
similarity index 100%
rename from repos/base/include/signal_source/rpc_object.h
rename to repos/base/src/include/signal_source/rpc_object.h
diff --git a/repos/base/include/signal_source/signal_source.h b/repos/base/src/include/signal_source/signal_source.h
similarity index 100%
rename from repos/base/include/signal_source/signal_source.h
rename to repos/base/src/include/signal_source/signal_source.h
diff --git a/repos/base/src/lib/base/rpc_entrypoint.cc b/repos/base/src/lib/base/rpc_entrypoint.cc
index 68f4da924..ea82ea9c5 100644
--- a/repos/base/src/lib/base/rpc_entrypoint.cc
+++ b/repos/base/src/lib/base/rpc_entrypoint.cc
@@ -19,6 +19,7 @@
 
 /* base-internal includes */
 #include <base/internal/ipc_server.h>
+#include <signal_source/signal_source.h>
 
 using namespace Genode;
 
diff --git a/repos/base/src/lib/base/signal.cc b/repos/base/src/lib/base/signal.cc
index 348741e01..b079a264a 100644
--- a/repos/base/src/lib/base/signal.cc
+++ b/repos/base/src/lib/base/signal.cc
@@ -18,11 +18,11 @@
 #include <base/thread.h>
 #include <base/sleep.h>
 #include <base/trace/events.h>
-#include <signal_source/client.h>
 #include <util/volatile_object.h>
 
 /* base-internal includes */
 #include <base/internal/globals.h>
+#include <signal_source/client.h>
 
 using namespace Genode;
 
diff --git a/repos/ports-foc/src/lib/l4lx/genode_block.cc b/repos/ports-foc/src/lib/l4lx/genode_block.cc
index 54cd3d81d..c34b1fe7b 100644
--- a/repos/ports-foc/src/lib/l4lx/genode_block.cc
+++ b/repos/ports-foc/src/lib/l4lx/genode_block.cc
@@ -16,7 +16,6 @@
 #include <base/allocator_avl.h>
 #include <block_session/connection.h>
 #include <os/config.h>
-#include <util/assert.h>
 #include <foc/capability_space.h>
 
 #include <vcpu.h>
@@ -25,6 +24,7 @@
 namespace Fiasco {
 #include <genode/block.h>
 #include <l4/sys/irq.h>
+#include <l4/sys/kdebug.h>
 }
 
 namespace {
@@ -63,7 +63,10 @@ namespace {
 			void insert(void *packet, void *request)
 			{
 				int idx = _find(0);
-				ASSERT(idx >= 0, "Req cache full!");
+				if (idx == 0) {
+					PERR("Req cache full!");
+					enter_kdebug("Req_cache");
+				}
 
 				_cache[idx] = Req_entry(packet, request);
 			}
@@ -71,7 +74,10 @@ namespace {
 			void remove(void *packet, void **request)
 			{
 				int idx = _find(packet);
-				ASSERT(idx >= 0, "Req cache entry not found!");
+				if (idx == 0) {
+					PERR("Req cache entry not found!");
+					enter_kdebug("Req_cache");
+				}
 
 				*request = _cache[idx].req;
 				_cache[idx].pkt = 0;