base: uniform base-internal header structure

This patch establishes a common organization of header files
internal to the base framework. The internal headers are located at
'<repository>/src/include/base/internal/'. This structure has been
choosen to make the nature of those headers immediately clear when
included:

  #include <base/internal/lock_helper.h>

Issue #1832
This commit is contained in:
Norman Feske 2016-01-20 18:27:18 +01:00 committed by Christian Helmuth
parent be496c6dc1
commit e6729316ff
128 changed files with 179 additions and 203 deletions

View File

@ -24,8 +24,7 @@ SRC_CC += thread/myself.cc
SRC_CC += thread/context_allocator.cc SRC_CC += thread/context_allocator.cc
SRC_CC += sleep.cc SRC_CC += sleep.cc
INC_DIR += $(REP_DIR)/src/base/lock INC_DIR += $(REP_DIR)/src/include $(BASE_DIR)/src/include
INC_DIR += $(BASE_DIR)/src/base/thread
vpath cap_copy.cc $(BASE_DIR)/src/lib/startup vpath cap_copy.cc $(BASE_DIR)/src/lib/startup
vpath %.cc $(REP_DIR)/src/base vpath %.cc $(REP_DIR)/src/base

View File

@ -13,7 +13,7 @@ SRC_CC += thread/thread_start.cc
SRC_CC += irq/platform.cc SRC_CC += irq/platform.cc
SRC_CC += server/rpc_cap_alloc.cc SRC_CC += server/rpc_cap_alloc.cc
INC_DIR += $(BASE_DIR)/src/base/env INC_DIR += $(REP_DIR)/src/include $(BASE_DIR)/src/include
vpath %.cc $(REP_DIR)/src/base vpath %.cc $(REP_DIR)/src/base
vpath %.cc $(BASE_DIR)/src/base vpath %.cc $(BASE_DIR)/src/base

View File

@ -37,8 +37,8 @@ SRC_CC += context_area.cc \
INC_DIR += $(REP_DIR)/src/core/include \ INC_DIR += $(REP_DIR)/src/core/include \
$(GEN_CORE_DIR)/include \ $(GEN_CORE_DIR)/include \
$(REP_DIR)/src/base/console \ $(REP_DIR)/src/include \
$(BASE_DIR)/src/base/thread $(BASE_DIR)/src/include
LIBS += base-common LIBS += base-common

View File

@ -24,9 +24,7 @@ SRC_CC += thread/myself.cc
SRC_CC += thread/context_allocator.cc SRC_CC += thread/context_allocator.cc
SRC_CC += sleep.cc SRC_CC += sleep.cc
INC_DIR += $(REP_DIR)/src/base/lock INC_DIR += $(REP_DIR)/src/include $(BASE_DIR)/src/include
INC_DIR += $(BASE_DIR)/src/base/lock
INC_DIR += $(BASE_DIR)/src/base/thread
vpath %.cc $(REP_DIR)/src/base vpath %.cc $(REP_DIR)/src/base
vpath %.cc $(BASE_DIR)/src/base vpath %.cc $(BASE_DIR)/src/base

View File

@ -14,7 +14,7 @@ SRC_CC += thread/thread_start.cc
SRC_CC += irq/platform.cc SRC_CC += irq/platform.cc
SRC_CC += server/rpc_cap_alloc.cc SRC_CC += server/rpc_cap_alloc.cc
INC_DIR += $(BASE_DIR)/src/base/env INC_DIR += $(REP_DIR)/src/include $(BASE_DIR)/src/include
vpath %.cc $(REP_DIR)/src/base vpath %.cc $(REP_DIR)/src/base
vpath %.cc $(BASE_DIR)/src/base vpath %.cc $(BASE_DIR)/src/base

View File

@ -13,14 +13,16 @@
* under the terms of the GNU General Public License version 2. * under the terms of the GNU General Public License version 2.
*/ */
/* Genode includes */
#include <base/cap_map.h> #include <base/cap_map.h>
#include <base/native_types.h> #include <base/native_types.h>
#include <util/assert.h> #include <util/assert.h>
/* Lock implementation local include */ /* base-internal includes */
#include <spin_lock.h> #include <base/internal/spin_lock.h>
/* kernel includes */
namespace Fiasco { namespace Fiasco {
#include <l4/sys/consts.h> #include <l4/sys/consts.h>
#include <l4/sys/task.h> #include <l4/sys/task.h>

View File

@ -16,8 +16,8 @@
/* Genode includes */ /* Genode includes */
#include <base/cap_map.h> #include <base/cap_map.h>
/* Lock implementation local include */ /* base-internal includes */
#include <spin_lock.h> #include <base/internal/spin_lock.h>
Genode::Spin_lock::Spin_lock() : _spinlock(SPINLOCK_UNLOCKED) {} Genode::Spin_lock::Spin_lock() : _spinlock(SPINLOCK_UNLOCKED) {}

View File

@ -27,8 +27,8 @@
#include <base/thread.h> #include <base/thread.h>
#include <util/assert.h> #include <util/assert.h>
/* base-foc/src/base/lock */ /* base-internal includes */
#include <lock_helper.h> /* for 'thread_get_my_native_id()' */ #include <base/internal/lock_helper.h> /* for 'thread_get_my_native_id()' */
/* Fiasco.OC includes */ /* Fiasco.OC includes */
namespace Fiasco { namespace Fiasco {

View File

@ -40,10 +40,8 @@ SRC_CC += context_area.cc \
INC_DIR += $(REP_DIR)/src/core/include \ INC_DIR += $(REP_DIR)/src/core/include \
$(GEN_CORE_DIR)/include \ $(GEN_CORE_DIR)/include \
$(REP_DIR)/src/base/lock \ $(REP_DIR)/src/include \
$(BASE_DIR)/src/base/lock \ $(BASE_DIR)/src/include
$(BASE_DIR)/src/base/thread \
$(REP_DIR)/src/base/console
include $(GEN_CORE_DIR)/version.inc include $(GEN_CORE_DIR)/version.inc

View File

@ -11,8 +11,8 @@
* under the terms of the GNU General Public License version 2. * under the terms of the GNU General Public License version 2.
*/ */
#ifndef _LIB__STARTUP___MAIN_PARENT_CAP_H_ #ifndef _INCLUDE__STARTUP__INTERNAL___MAIN_PARENT_CAP_H_
#define _LIB__STARTUP___MAIN_PARENT_CAP_H_ #define _INCLUDE__STARTUP__INTERNAL___MAIN_PARENT_CAP_H_
#include <base/native_types.h> #include <base/native_types.h>
@ -41,4 +41,4 @@ namespace Genode {
} }
} }
#endif /* _LIB__STARTUP___MAIN_PARENT_CAP_H_ */ #endif /* _INCLUDE__STARTUP__INTERNAL___MAIN_PARENT_CAP_H_ */

View File

@ -1,14 +1,12 @@
# #
# \brief Portions of base library shared by core and non-core processes # \brief Portions of base library shared by core and non-core components
# \author Norman Feske # \author Norman Feske
# \author Martin Stein # \author Martin Stein
# \date 2013-02-14 # \date 2013-02-14
# #
# add library dependencies
LIBS += cxx LIBS += cxx
# add C++ sources
SRC_CC += ipc/ipc.cc SRC_CC += ipc/ipc.cc
SRC_CC += avl_tree/avl_tree.cc SRC_CC += avl_tree/avl_tree.cc
SRC_CC += allocator/slab.cc SRC_CC += allocator/slab.cc
@ -31,11 +29,7 @@ SRC_CC += thread/context_allocator.cc
SRC_CC += kernel/interface.cc SRC_CC += kernel/interface.cc
SRC_CC += sleep.cc SRC_CC += sleep.cc
# add include paths INC_DIR += $(REP_DIR)/src/include $(BASE_DIR)/src/include
INC_DIR += $(REP_DIR)/src/base/lock
INC_DIR += $(BASE_DIR)/src/base/lock
INC_DIR += $(BASE_DIR)/src/base/thread
# declare source locations
vpath % $(REP_DIR)/src/base vpath % $(REP_DIR)/src/base
vpath % $(BASE_DIR)/src/base vpath % $(BASE_DIR)/src/base

View File

@ -1,13 +1,11 @@
# #
# \brief Portions of base library that are exclusive to non-core processes # \brief Portions of base library that are exclusive to non-core components
# \author Norman Feske # \author Norman Feske
# \date 2013-02-14 # \date 2013-02-14
# #
# add library dependencies
LIBS += base-common startup LIBS += base-common startup
# add C++ sources
SRC_CC += console/log_console.cc SRC_CC += console/log_console.cc
SRC_CC += cpu/cache.cc SRC_CC += cpu/cache.cc
SRC_CC += env/env.cc SRC_CC += env/env.cc
@ -19,11 +17,7 @@ SRC_CC += env.cc
SRC_CC += capability.cc SRC_CC += capability.cc
SRC_CC += server/rpc_cap_alloc.cc SRC_CC += server/rpc_cap_alloc.cc
# add include paths INC_DIR += $(REP_DIR)/src/include $(BASE_DIR)/src/include
INC_DIR += $(REP_DIR)/src/base/lock
INC_DIR += $(BASE_DIR)/src/base/lock
INC_DIR += $(BASE_DIR)/src/base/env
# declare source locations
vpath % $(REP_DIR)/src/base vpath % $(REP_DIR)/src/base
vpath % $(BASE_DIR)/src/base vpath % $(BASE_DIR)/src/base

View File

@ -11,11 +11,8 @@ LIBS += core-perf_counter
LIBS += base-common LIBS += base-common
# add include paths # add include paths
INC_DIR += $(REP_DIR)/src/core/include INC_DIR += $(REP_DIR)/src/core/include $(BASE_DIR)/src/core/include
INC_DIR += $(BASE_DIR)/src/core/include INC_DIR += $(REP_DIR)/src/include $(BASE_DIR)/src/include
INC_DIR += $(BASE_DIR)/src/base/include
INC_DIR += $(BASE_DIR)/src/base/thread
INC_DIR += $(BASE_DIR)/src/lib/startup
# add C++ sources # add C++ sources
SRC_CC += console.cc SRC_CC += console.cc

View File

@ -12,9 +12,11 @@
*/ */
/* Genode includes */ /* Genode includes */
#include <spin_lock.h>
#include <base/capability.h> #include <base/capability.h>
/* base-internal includes */
#include <base/internal/spin_lock.h>
static volatile int spinlock = SPINLOCK_UNLOCKED; static volatile int spinlock = SPINLOCK_UNLOCKED;
static Genode::uint8_t ref_counter[1 << (sizeof(Kernel::capid_t)*8)]; static Genode::uint8_t ref_counter[1 << (sizeof(Kernel::capid_t)*8)];

View File

@ -18,8 +18,8 @@
/* core includes */ /* core includes */
#include <serial.h> #include <serial.h>
/* base includes */ /* base-internal includes */
#include <unmanaged_singleton.h> #include <base/internal/unmanaged_singleton.h>
namespace Genode namespace Genode
{ {

View File

@ -18,9 +18,11 @@
/* Genode includes */ /* Genode includes */
#include <base/native_types.h> #include <base/native_types.h>
#include <irq_session/irq_session.h> #include <irq_session/irq_session.h>
#include <unmanaged_singleton.h>
#include <util/avl_tree.h> #include <util/avl_tree.h>
/* base-internal includes */
#include <base/internal/unmanaged_singleton.h>
/* core includes */ /* core includes */
#include <kernel/signal_receiver.h> #include <kernel/signal_receiver.h>

View File

@ -19,7 +19,9 @@
#include <base/object_pool.h> #include <base/object_pool.h>
#include <base/signal.h> #include <base/signal.h>
#include <pager/capability.h> #include <pager/capability.h>
#include <unmanaged_singleton.h>
/* base-internal includes */
#include <base/internal/unmanaged_singleton.h>
/* core-local includes */ /* core-local includes */
#include <kernel/signal_receiver.h> #include <kernel/signal_receiver.h>

View File

@ -22,7 +22,7 @@
#include <cpu/cpu_state.h> #include <cpu/cpu_state.h>
/* base includes */ /* base includes */
#include <unmanaged_singleton.h> #include <base/internal/unmanaged_singleton.h>
/* core includes */ /* core includes */
#include <fpu.h> #include <fpu.h>

View File

@ -22,8 +22,8 @@
#include <timer.h> #include <timer.h>
#include <assert.h> #include <assert.h>
/* base includes */ /* base-internal includes */
#include <unmanaged_singleton.h> #include <base/internal/unmanaged_singleton.h>
using namespace Kernel; using namespace Kernel;

View File

@ -22,7 +22,7 @@
#include <platform_thread.h> #include <platform_thread.h>
/* base includes */ /* base includes */
#include <unmanaged_singleton.h> #include <base/internal/unmanaged_singleton.h>
#include <base/native_types.h> #include <base/native_types.h>
using namespace Kernel; using namespace Kernel;

View File

@ -19,7 +19,9 @@
/* Genode includes */ /* Genode includes */
#include <assert.h> #include <assert.h>
#include <page_flags.h> #include <page_flags.h>
#include <unmanaged_singleton.h>
/* base-internal includes */
#include <base/internal/unmanaged_singleton.h>
using namespace Kernel; using namespace Kernel;

View File

@ -14,10 +14,12 @@
/* Genode includes */ /* Genode includes */
#include <base/thread_state.h> #include <base/thread_state.h>
#include <unmanaged_singleton.h>
#include <cpu_session/cpu_session.h> #include <cpu_session/cpu_session.h>
#include <util/construct_at.h> #include <util/construct_at.h>
/* base-internal includes */
#include <base/internal/unmanaged_singleton.h>
/* core includes */ /* core includes */
#include <assert.h> #include <assert.h>
#include <kernel/kernel.h> #include <kernel/kernel.h>

View File

@ -136,7 +136,7 @@ Platform::Platform()
init_alloc(_core_mem_alloc.virt_alloc(), virt_region, init_alloc(_core_mem_alloc.virt_alloc(), virt_region,
_core_only_ram_regions, get_page_size_log2()); _core_only_ram_regions, get_page_size_log2());
/* preserve context area in core's virtual address space */ /* preserve stack area in core's virtual address space */
_core_mem_alloc.virt_alloc()->remove_range( _core_mem_alloc.virt_alloc()->remove_range(
Native_config::context_area_virtual_base(), Native_config::context_area_virtual_base(),
Native_config::context_area_virtual_size()); Native_config::context_area_virtual_size());

View File

@ -16,8 +16,8 @@
#include <kernel/kernel.h> #include <kernel/kernel.h>
#include <kernel/cpu.h> #include <kernel/cpu.h>
/* base includes */ /* base-internal includes */
#include <unmanaged_singleton.h> #include <base/internal/unmanaged_singleton.h>
/* spin-lock used to synchronize kernel access of different cpus */ /* spin-lock used to synchronize kernel access of different cpus */

View File

@ -17,7 +17,9 @@
#include <cpu.h> #include <cpu.h>
#include <pic.h> #include <pic.h>
#include <cortex_a9_wugen.h> #include <cortex_a9_wugen.h>
#include <unmanaged_singleton.h>
/* base-internal includes */
#include <base/internal/unmanaged_singleton.h>
using namespace Genode; using namespace Genode;

View File

@ -17,7 +17,9 @@
#include <board.h> #include <board.h>
#include <cpu.h> #include <cpu.h>
#include <pic.h> #include <pic.h>
#include <unmanaged_singleton.h>
/* base-internal includes */
#include <base/internal/unmanaged_singleton.h>
using namespace Genode; using namespace Genode;

View File

@ -23,11 +23,7 @@ SRC_CC += thread/trace.cc thread/thread_env.cc thread/context_allocator.cc
SRC_CC += irq/platform.cc SRC_CC += irq/platform.cc
SRC_CC += sleep.cc SRC_CC += sleep.cc
INC_DIR += $(REP_DIR)/src/base/lock $(BASE_DIR)/src/base/lock INC_DIR += $(REP_DIR)/src/include $(BASE_DIR)/src/include
INC_DIR += $(REP_DIR)/src/base/ipc
INC_DIR += $(REP_DIR)/src/base/env $(BASE_DIR)/src/base/env
INC_DIR += $(BASE_DIR)/src/lib/startup
INC_DIR += $(BASE_DIR)/src/base/thread
vpath %.cc $(REP_DIR)/src/base vpath %.cc $(REP_DIR)/src/base
vpath %.cc $(BASE_DIR)/src/base vpath %.cc $(BASE_DIR)/src/base

View File

@ -13,7 +13,7 @@ SRC_CC += console/log_console.cc
SRC_CC += env/env.cc env/platform_env.cc env/context_area.cc SRC_CC += env/env.cc env/platform_env.cc env/context_area.cc
SRC_CC += server/rpc_cap_alloc.cc SRC_CC += server/rpc_cap_alloc.cc
INC_DIR += $(REP_DIR)/src/base/env $(BASE_DIR)/src/base/env INC_DIR += $(REP_DIR)/src/include $(BASE_DIR)/src/include
vpath %.cc $(REP_DIR)/src/base vpath %.cc $(REP_DIR)/src/base
vpath %.cc $(BASE_DIR)/src/base vpath %.cc $(BASE_DIR)/src/base

View File

@ -5,6 +5,7 @@
# #
LIBS += startup cxx LIBS += startup cxx
SRC_CC += thread/thread.cc thread/myself.cc thread/thread_linux.cc SRC_CC += thread/thread.cc thread/myself.cc thread/thread_linux.cc
SRC_CC += server/rpc_cap_alloc.cc SRC_CC += server/rpc_cap_alloc.cc

View File

@ -17,8 +17,8 @@
#include <linux_dataspace/client.h> #include <linux_dataspace/client.h>
#include <linux_syscalls.h> #include <linux_syscalls.h>
/* local includes */ /* base-internal includes */
#include <platform_env.h> #include <base/internal/platform_env.h>
using namespace Genode; using namespace Genode;

View File

@ -37,10 +37,10 @@
#include <base/thread.h> #include <base/thread.h>
#include <linux_dataspace/client.h> #include <linux_dataspace/client.h>
#include <linux_syscalls.h> #include <linux_syscalls.h>
#include <context_area.h>
/* local includes */ /* base-internal includes */
#include <platform_env.h> #include <base/internal/platform_env.h>
#include <base/internal/context_area.h>
using namespace Genode; using namespace Genode;

View File

@ -34,8 +34,8 @@
#include <base/env.h> #include <base/env.h>
#include <linux_cpu_session/linux_cpu_session.h> #include <linux_cpu_session/linux_cpu_session.h>
/* local includes */ /* base-internal includes */
#include <socket_descriptor_registry.h> #include <base/internal/socket_descriptor_registry.h>
/* Linux includes */ /* Linux includes */
#include <linux_syscalls.h> #include <linux_syscalls.h>

View File

@ -17,7 +17,8 @@
#include <base/printf.h> #include <base/printf.h>
#include <base/thread.h> #include <base/thread.h>
#include <context_area.h> /* base-internal includes */
#include <base/internal/context_area.h>
/** /**

View File

@ -25,8 +25,8 @@
#include <ram_session_component.h> #include <ram_session_component.h>
#include <core_pd_session.h> #include <core_pd_session.h>
/* internal base includes */ /* base-internal includes */
#include <platform_env.h> #include <base/internal/platform_env.h>
namespace Genode { namespace Genode {

View File

@ -19,8 +19,8 @@
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/un.h> #include <sys/un.h>
/* include from 'src/base/ipc' */ /* base-internal includes */
#include <socket_descriptor_registry.h> #include <base/internal/socket_descriptor_registry.h>
/* core-local includes */ /* core-local includes */
#include <resource_path.h> #include <resource_path.h>

View File

@ -31,11 +31,8 @@ SRC_CC = main.cc \
INC_DIR += $(REP_DIR)/src/core/include \ INC_DIR += $(REP_DIR)/src/core/include \
$(GEN_CORE_DIR)/include \ $(GEN_CORE_DIR)/include \
$(REP_DIR)/src/platform \ $(REP_DIR)/src/platform \
$(REP_DIR)/src/base/ipc \ $(REP_DIR)/src/include \
$(REP_DIR)/src/base/env \ $(BASE_DIR)/src/include
$(BASE_DIR)/src/base/env \
$(REP_DIR)/src/base/console \
$(BASE_DIR)/src/base/thread \
HOST_INC_DIR += /usr/include HOST_INC_DIR += /usr/include

View File

@ -27,8 +27,8 @@
#include <base/heap.h> #include <base/heap.h>
#include <linux_cpu_session/client.h> #include <linux_cpu_session/client.h>
/* local includes (from 'base/src/base/env/') */ /* base-internal includes */
#include <platform_env_common.h> #include <base/internal/platform_env_common.h>
namespace Genode { namespace Genode {

View File

@ -23,9 +23,7 @@ SRC_CC += thread/myself.cc
SRC_CC += thread/context_allocator.cc env/cap_map.cc SRC_CC += thread/context_allocator.cc env/cap_map.cc
SRC_CC += sleep.cc SRC_CC += sleep.cc
INC_DIR += $(REP_DIR)/src/base/lock INC_DIR += $(REP_DIR)/src/include $(BASE_DIR)/src/include
INC_DIR += $(BASE_DIR)/src/base/lock
INC_DIR += $(BASE_DIR)/src/base/thread
vpath %.cc $(REP_DIR)/src/base vpath %.cc $(REP_DIR)/src/base
vpath %.cc $(BASE_DIR)/src/base vpath %.cc $(BASE_DIR)/src/base

View File

@ -13,7 +13,7 @@ SRC_CC += thread/thread_nova.cc
SRC_CC += irq/platform.cc SRC_CC += irq/platform.cc
SRC_CC += server/rpc_cap_alloc.cc SRC_CC += server/rpc_cap_alloc.cc
INC_DIR += $(BASE_DIR)/src/base/env INC_DIR += $(REP_DIR)/src/include $(BASE_DIR)/src/include
vpath %.cc $(REP_DIR)/src/base vpath %.cc $(REP_DIR)/src/base
vpath %.cc $(BASE_DIR)/src/base vpath %.cc $(BASE_DIR)/src/base

View File

@ -40,9 +40,8 @@ SRC_CC = context_area.cc \
trace_session_component.cc trace_session_component.cc
INC_DIR = $(REP_DIR)/src/core/include \ INC_DIR = $(REP_DIR)/src/core/include \
$(REP_DIR)/src/base/console \ $(REP_DIR)/src/include \
$(BASE_DIR)/src/base/thread \ $(BASE_DIR)/src/include \
$(BASE_DIR)/src/base/include \
$(GEN_CORE_DIR)/include $(GEN_CORE_DIR)/include
include $(GEN_CORE_DIR)/version.inc include $(GEN_CORE_DIR)/version.inc

View File

@ -19,8 +19,8 @@
#include <cpu/memory_barrier.h> #include <cpu/memory_barrier.h>
#include <base/thread.h> #include <base/thread.h>
/* local includes */ /* base-internal includes */
#include <lock_helper.h> #include <base/internal/lock_helper.h>
enum State { enum State {

View File

@ -24,9 +24,7 @@ SRC_CC += thread/myself.cc
SRC_CC += thread/context_allocator.cc SRC_CC += thread/context_allocator.cc
SRC_CC += sleep.cc SRC_CC += sleep.cc
INC_DIR += $(REP_DIR)/src/base/lock INC_DIR += $(REP_DIR)/src/include $(BASE_DIR)/src/include
INC_DIR += $(BASE_DIR)/src/base/lock
INC_DIR += $(BASE_DIR)/src/base/thread
vpath cap_copy.cc $(BASE_DIR)/src/lib/startup vpath cap_copy.cc $(BASE_DIR)/src/lib/startup
vpath %.cc $(REP_DIR)/src/base vpath %.cc $(REP_DIR)/src/base

View File

@ -8,6 +8,6 @@ SRC_CC += server/rpc_cap_alloc.cc
vpath %.cc $(REP_DIR)/src/base vpath %.cc $(REP_DIR)/src/base
vpath %.cc $(BASE_DIR)/src/base vpath %.cc $(BASE_DIR)/src/base
INC_DIR += $(BASE_DIR)/src/base/env INC_DIR += $(REP_DIR)/src/include $(BASE_DIR)/src/include
LIBS += base-common LIBS += base-common

View File

@ -1,5 +1,5 @@
SRC_C = bootinfo.c SRC_C = bootinfo.c
INC_DIR += $(REP_DIR)/src/base/bootinfo INC_DIR += $(REP_DIR)/src/include/bootinfo/internal
CC_WARN = -Wall -Wno-attributes CC_WARN = -Wall -Wno-attributes
vpath bootinfo.c $(OKL4_DIR)/libs/bootinfo/src vpath bootinfo.c $(OKL4_DIR)/libs/bootinfo/src

View File

@ -37,11 +37,8 @@ SRC_CC += context_area.cc \
thread_start.cc \ thread_start.cc \
trace_session_component.cc trace_session_component.cc
INC_DIR += $(REP_DIR)/src/core/include \ INC_DIR += $(REP_DIR)/src/core/include $(GEN_CORE_DIR)/include \
$(GEN_CORE_DIR)/include \ $(REP_DIR)/src/include $(BASE_DIR)/src/include
$(REP_DIR)/src/base/console \
$(BASE_DIR)/src/base/thread \
$(BASE_DIR)/src/lib/startup
include $(GEN_CORE_DIR)/version.inc include $(GEN_CORE_DIR)/version.inc

View File

@ -24,9 +24,7 @@ SRC_CC += thread/myself.cc
SRC_CC += thread/context_allocator.cc SRC_CC += thread/context_allocator.cc
SRC_CC += sleep.cc SRC_CC += sleep.cc
INC_DIR += $(REP_DIR)/src/base/lock INC_DIR += $(REP_DIR)/src/include $(BASE_DIR)/src/include
INC_DIR += $(BASE_DIR)/src/base/lock
INC_DIR += $(BASE_DIR)/src/base/thread
vpath cap_copy.cc $(BASE_DIR)/src/lib/startup vpath cap_copy.cc $(BASE_DIR)/src/lib/startup
vpath %.cc $(REP_DIR)/src/base vpath %.cc $(REP_DIR)/src/base

View File

@ -13,7 +13,7 @@ SRC_CC += thread/thread_start.cc
SRC_CC += irq/platform.cc SRC_CC += irq/platform.cc
SRC_CC += server/rpc_cap_alloc.cc SRC_CC += server/rpc_cap_alloc.cc
INC_DIR += $(BASE_DIR)/src/base/env INC_DIR += $(REP_DIR)/src/include $(BASE_DIR)/src/include
vpath %.cc $(REP_DIR)/src/base vpath %.cc $(REP_DIR)/src/base
vpath %.cc $(BASE_DIR)/src/base vpath %.cc $(BASE_DIR)/src/base

View File

@ -13,19 +13,10 @@
/* Genode includes */ /* Genode includes */
#include <cpu_session_component.h> #include <cpu_session_component.h>
#include <pistachio/kip.h>
using namespace Genode; using namespace Genode;
using namespace Pistachio; using namespace Pistachio;
// unsigned int Cpu_session_component::available_cpus()
// {
// if (_pinned_cpu == -1)
// return L4_NumProcessors(get_kip());
// else
// return 1;
// }
Ram_dataspace_capability Cpu_session_component::utcb(Thread_capability thread_cap) Ram_dataspace_capability Cpu_session_component::utcb(Thread_capability thread_cap)
{ {
PERR("%s: Not implemented", __PRETTY_FUNCTION__); PERR("%s: Not implemented", __PRETTY_FUNCTION__);

View File

@ -20,7 +20,9 @@
#include <base/ipc.h> #include <base/ipc.h>
#include <base/stdint.h> #include <base/stdint.h>
#include <util/touch.h> #include <util/touch.h>
#include <pistachio/kip.h>
/* core-local includes */
#include <kip.h>
/* Pistachio includes */ /* Pistachio includes */
namespace Pistachio { namespace Pistachio {

View File

@ -1,5 +1,5 @@
/* /*
* \brief Pistachio-specific thread helper functions * \brief Pistachio-specific thread helper
* \author Julian Stecklina * \author Julian Stecklina
* \date 2008-02-20 * \date 2008-02-20
*/ */
@ -11,16 +11,15 @@
* under the terms of the GNU General Public License version 2. * under the terms of the GNU General Public License version 2.
*/ */
#ifndef _INCLUDE__PISTACHIO__THREAD_HELPER_H_ #ifndef _INCLUDE__PISTACHIO__PRINT_L4_THREAD_ID_
#define _INCLUDE__PISTACHIO__THREAD_HELPER_H_ #define _INCLUDE__PISTACHIO__PRINT_L4_THREAD_ID_
#include <base/printf.h> #include <base/printf.h>
namespace Pistachio namespace Pistachio {
{
#include <l4/types.h> #include <l4/types.h>
inline void print_l4_threadid(L4_ThreadId_t t) inline void print_l4_thread_id(L4_ThreadId_t t)
{ {
if (L4_IsLocalId(t)) { if (L4_IsLocalId(t)) {
Genode::printf("THREAD (local) %02lx (raw %08lx)\n", Genode::printf("THREAD (local) %02lx (raw %08lx)\n",
@ -42,4 +41,4 @@ namespace Pistachio
} }
} }
#endif /* _INCLUDE__PISTACHIO__THREAD_HELPER_H_ */ #endif /* _INCLUDE__PISTACHIO__PRINT_L4_THREAD_ID_ */

View File

@ -19,9 +19,11 @@
#include <base/printf.h> #include <base/printf.h>
#include <rm_session/rm_session.h> #include <rm_session/rm_session.h>
#include <util/touch.h> #include <util/touch.h>
#include <pistachio/kip.h>
#include <base/native_types.h> #include <base/native_types.h>
/* core-local includes */
#include <kip.h>
/* Pistachio includes */ /* Pistachio includes */
namespace Pistachio { namespace Pistachio {
#include <l4/types.h> #include <l4/types.h>

View File

@ -13,10 +13,10 @@
*/ */
/* core includes */ /* core includes */
#include <pistachio/kip.h>
#include <platform.h> #include <platform.h>
#include <util.h> #include <util.h>
#include <io_mem_session_component.h> #include <io_mem_session_component.h>
#include <kip.h>
/* Pistachio includes */ /* Pistachio includes */
namespace Pistachio { namespace Pistachio {

View File

@ -11,7 +11,8 @@
* under the terms of the GNU General Public License version 2. * under the terms of the GNU General Public License version 2.
*/ */
#include <pistachio/kip.h> /* core-local includes */
#include <kip.h>
using namespace Pistachio; using namespace Pistachio;

View File

@ -15,10 +15,10 @@
#include <base/printf.h> #include <base/printf.h>
#include <multiboot.h> #include <multiboot.h>
#include <util/misc_math.h> #include <util/misc_math.h>
#include <pistachio/kip.h>
/* core includes */ /* core includes */
#include <util.h> #include <util.h>
#include <kip.h>
/* Pistachio includes */ /* Pistachio includes */
namespace Pistachio { namespace Pistachio {

View File

@ -26,8 +26,8 @@
#include <platform_thread.h> #include <platform_thread.h>
#include <platform_pd.h> #include <platform_pd.h>
#include <util.h> #include <util.h>
#include <pistachio/thread_helper.h> #include <kip.h>
#include <pistachio/kip.h> #include <print_l4_thread_id.h>
/* Pistachio includes */ /* Pistachio includes */
namespace Pistachio { namespace Pistachio {
@ -161,13 +161,13 @@ static void _core_pager_loop()
PDBG("Got page fault (pf_addr = %08lx, pf_ip = %08lx, flags = %08lx).", PDBG("Got page fault (pf_addr = %08lx, pf_ip = %08lx, flags = %08lx).",
pf_addr, pf_ip, flags); pf_addr, pf_ip, flags);
print_l4_threadid(L4_GlobalId(t)); print_l4_thread_id(L4_GlobalId(t));
/* check for NULL pointer */ /* check for NULL pointer */
if (pf_addr < page_size) { if (pf_addr < page_size) {
PERR("possible null pointer %s at address %lx at EIP %lx in", PERR("possible null pointer %s at address %lx at EIP %lx in",
is_write_fault(flags) ? "WRITE" : "READ/EXEC", pf_addr, pf_ip); is_write_fault(flags) ? "WRITE" : "READ/EXEC", pf_addr, pf_ip);
print_l4_threadid(t); print_l4_thread_id(t);
/* do not unblock faulter */ /* do not unblock faulter */
break; break;
} else if (!_core_address_ranges().valid_addr(pf_addr)) { } else if (!_core_address_ranges().valid_addr(pf_addr)) {
@ -175,12 +175,12 @@ static void _core_pager_loop()
PERR("%s access outside of RAM at %lx IP %lx", PERR("%s access outside of RAM at %lx IP %lx",
is_write_fault(flags) ? "WRITE" : "READ", pf_addr, pf_ip); is_write_fault(flags) ? "WRITE" : "READ", pf_addr, pf_ip);
print_l4_threadid(t); print_l4_thread_id(t);
/* do not unblock faulter */ /* do not unblock faulter */
break; break;
} else if (verbose_core_pf) { } else if (verbose_core_pf) {
PDBG("pfa=%lx ip=%lx in", pf_addr, pf_ip); PDBG("pfa=%lx ip=%lx in", pf_addr, pf_ip);
print_l4_threadid(t); print_l4_thread_id(t);
} }
/* my pf handler is sigma0 - just touch the appropriate page */ /* my pf handler is sigma0 - just touch the appropriate page */

View File

@ -14,12 +14,11 @@
/* Genode includes */ /* Genode includes */
#include <base/printf.h> #include <base/printf.h>
#include <util/string.h> #include <util/string.h>
#include <pistachio/thread_helper.h>
#include <pistachio/kip.h>
/* core includes */ /* core includes */
#include <platform_pd.h> #include <platform_pd.h>
#include <platform_thread.h> #include <platform_thread.h>
#include <kip.h>
/* Pistachio includes */ /* Pistachio includes */
namespace Pistachio namespace Pistachio

View File

@ -11,8 +11,8 @@
* under the terms of the GNU General Public License version 2. * under the terms of the GNU General Public License version 2.
*/ */
#include <pistachio/thread_helper.h> /* core-local includes */
#include <pistachio/kip.h> #include <kip.h>
#include "platform.h" #include "platform.h"
#include "util.h" #include "util.h"

View File

@ -37,10 +37,8 @@ SRC_CC = context_area.cc \
thread_start.cc \ thread_start.cc \
trace_session_component.cc trace_session_component.cc
INC_DIR += $(REP_DIR)/src/core/include \ INC_DIR += $(REP_DIR)/src/core/include $(GEN_CORE_DIR)/include \
$(REP_DIR)/src/base/console \ $(REP_DIR)/src/include $(BASE_DIR)/src/include
$(BASE_DIR)/src/base/thread \
$(GEN_CORE_DIR)/include
include $(GEN_CORE_DIR)/version.inc include $(GEN_CORE_DIR)/version.inc

View File

@ -26,9 +26,7 @@ SRC_CC += thread/thread_bootstrap.cc
SRC_CC += env/capability.cc SRC_CC += env/capability.cc
SRC_CC += sleep.cc SRC_CC += sleep.cc
INC_DIR += $(REP_DIR)/src/base INC_DIR += $(REP_DIR)/src/include $(BASE_DIR)/src/include
INC_DIR += $(REP_DIR)/src/base/lock
INC_DIR += $(BASE_DIR)/src/base/thread
vpath %.cc $(REP_DIR)/src/base vpath %.cc $(REP_DIR)/src/base
vpath %.cc $(BASE_DIR)/src/base vpath %.cc $(BASE_DIR)/src/base

View File

@ -13,8 +13,7 @@ SRC_CC += thread/thread_start.cc thread/thread_init.cc
SRC_CC += irq/platform.cc SRC_CC += irq/platform.cc
SRC_CC += server/rpc_cap_alloc.cc SRC_CC += server/rpc_cap_alloc.cc
INC_DIR += $(REP_DIR)/src/base INC_DIR += $(REP_DIR)/src/include $(BASE_DIR)/src/include
INC_DIR += $(BASE_DIR)/src/base/env
vpath %.cc $(REP_DIR)/src/base vpath %.cc $(REP_DIR)/src/base
vpath %.cc $(BASE_DIR)/src/base vpath %.cc $(BASE_DIR)/src/base

View File

@ -37,10 +37,8 @@ SRC_CC += \
LIBS += core_printf base-common syscall LIBS += core_printf base-common syscall
INC_DIR += $(REP_DIR)/src/core/include \ INC_DIR += $(REP_DIR)/src/core/include $(GEN_CORE_DIR)/include \
$(GEN_CORE_DIR)/include \ $(REP_DIR)/src/include $(BASE_DIR)/src/include
$(REP_DIR)/src/base \
$(BASE_DIR)/src/base/thread
include $(GEN_CORE_DIR)/version.inc include $(GEN_CORE_DIR)/version.inc

View File

@ -1,5 +1,5 @@
SRC_CC = core_printf.cc SRC_CC = core_printf.cc
INC_DIR += $(REP_DIR)/src/base/console INC_DIR += $(REP_DIR)/src/include
LIBS += syscall LIBS += syscall
vpath core_printf.cc $(BASE_DIR)/src/base/console vpath core_printf.cc $(BASE_DIR)/src/base/console

View File

@ -1,9 +1,9 @@
# #
# Make the includes of src/base/internal/ available to the startup lib. This is # Make the includes of src/base/include/ available to the startup lib. This is
# needed because the seL4-specific src/platform/_main_parent_cap.h as included # needed because the seL4-specific src/platform/_main_parent_cap.h as included
# by the startup lib depends on the internal/capability_space_sel4.h. # by the startup lib depends on base/internal/capability_space_sel4.h.
# #
INC_DIR += $(REP_DIR)/src/base INC_DIR += $(REP_DIR)/src/include $(BASE_DIR)/src/include
include $(BASE_DIR)/lib/mk/startup.inc include $(BASE_DIR)/lib/mk/startup.inc

View File

@ -15,8 +15,8 @@
#include <base/printf.h> #include <base/printf.h>
/* base-internal includes */ /* base-internal includes */
#include <internal/native_types.h> #include <base/internal/native_types.h>
#include <internal/capability_space.h> #include <base/internal/capability_space.h>
using namespace Genode; using namespace Genode;

View File

@ -16,8 +16,8 @@
#include <base/printf.h> #include <base/printf.h>
/* base-internal includes */ /* base-internal includes */
#include <internal/capability_data.h> #include <base/internal/capability_data.h>
#include <internal/capability_space_sel4.h> #include <base/internal/capability_space_sel4.h>
/** /**
* Definition of capability meta data * Definition of capability meta data

View File

@ -19,8 +19,8 @@
#include <util/misc_math.h> #include <util/misc_math.h>
/* base-internal includes */ /* base-internal includes */
#include <internal/capability_space_sel4.h> #include <base/internal/capability_space_sel4.h>
#include <internal/kernel_debugger.h> #include <base/internal/kernel_debugger.h>
/* seL4 includes */ /* seL4 includes */
#include <sel4/sel4.h> #include <sel4/sel4.h>

View File

@ -17,9 +17,11 @@
*/ */
/* Genode includes */ /* Genode includes */
#include <internal/capability_space_sel4.h>
#include <base/rpc_server.h> #include <base/rpc_server.h>
/* base-internal includes */
#include <base/internal/capability_space_sel4.h>
using namespace Genode; using namespace Genode;

View File

@ -16,8 +16,8 @@
#include <base/printf.h> #include <base/printf.h>
/* base-internal includes */ /* base-internal includes */
#include <internal/capability_data.h> #include <base/internal/capability_data.h>
#include <internal/capability_space_sel4.h> #include <base/internal/capability_space_sel4.h>
/* core includes */ /* core includes */
#include <core_capability_space.h> #include <core_capability_space.h>

View File

@ -18,7 +18,7 @@
#include <base/exception.h> #include <base/exception.h>
/* base-internal includes */ /* base-internal includes */
#include <internal/capability_space_sel4.h> #include <base/internal/capability_space_sel4.h>
namespace Genode { struct Cap_sel_alloc; } namespace Genode { struct Cap_sel_alloc; }

View File

@ -15,7 +15,7 @@
#define _CORE__INCLUDE__CAPABILITY_CORE_DATA_H_ #define _CORE__INCLUDE__CAPABILITY_CORE_DATA_H_
/* base-internal includes */ /* base-internal includes */
#include <internal/capability_data.h> #include <base/internal/capability_data.h>
namespace Genode { namespace Genode {

View File

@ -15,7 +15,7 @@
#define _CORE__INCLUDE__CORE_CAPABILITY_SPACE_H_ #define _CORE__INCLUDE__CORE_CAPABILITY_SPACE_H_
/* base-internal includes */ /* base-internal includes */
#include <internal/rpc_obj_key.h> #include <base/internal/rpc_obj_key.h>
namespace Genode { class Pd_session; } namespace Genode { class Pd_session; }

View File

@ -23,7 +23,7 @@
#include <vm_space.h> #include <vm_space.h>
/* base-internal includes */ /* base-internal includes */
#include <internal/capability_space_sel4.h> #include <base/internal/capability_space_sel4.h>
namespace Genode { class Platform_pd; } namespace Genode { class Platform_pd; }

View File

@ -21,7 +21,7 @@
#include <base/printf.h> #include <base/printf.h>
/* base-internal includes */ /* base-internal includes */
#include <internal/assert.h> #include <base/internal/assert.h>
/* core includes */ /* core includes */
#include <map_local.h> #include <map_local.h>

View File

@ -20,7 +20,7 @@
#include <install_mapping.h> #include <install_mapping.h>
/* base-internal includes */ /* base-internal includes */
#include <internal/capability_space_sel4.h> #include <base/internal/capability_space_sel4.h>
/* seL4 includes */ /* seL4 includes */
#include <sel4/sel4.h> #include <sel4/sel4.h>

View File

@ -22,7 +22,7 @@
#include <kernel_object.h> #include <kernel_object.h>
/* base-internal includes */ /* base-internal includes */
#include <internal/capability_space_sel4.h> #include <base/internal/capability_space_sel4.h>
using namespace Genode; using namespace Genode;

View File

@ -20,7 +20,7 @@
#include <platform_pd.h> #include <platform_pd.h>
/* base-internal includes */ /* base-internal includes */
#include <internal/capability_space_sel4.h> #include <base/internal/capability_space_sel4.h>
using namespace Genode; using namespace Genode;

View File

@ -21,7 +21,7 @@
#include <base/snprintf.h> #include <base/snprintf.h>
/* base-internal includes */ /* base-internal includes */
#include <internal/kernel_debugger.h> #include <base/internal/kernel_debugger.h>
#define ASSERT(e) \ #define ASSERT(e) \
do { if (!(e)) { \ do { if (!(e)) { \

View File

@ -19,7 +19,7 @@
#include <util/avl_tree.h> #include <util/avl_tree.h>
/* base-internal includes */ /* base-internal includes */
#include <internal/rpc_obj_key.h> #include <base/internal/rpc_obj_key.h>
namespace Genode { class Capability_data; } namespace Genode { class Capability_data; }

View File

@ -23,7 +23,7 @@
#include <base/thread.h> #include <base/thread.h>
/* base-internal includes */ /* base-internal includes */
#include <internal/capability_data.h> #include <base/internal/capability_data.h>
namespace Genode { namespace Capability_space { namespace Genode { namespace Capability_space {

View File

@ -19,8 +19,8 @@
#include <base/lock.h> #include <base/lock.h>
/* base-internal includes */ /* base-internal includes */
#include <internal/capability_space.h> #include <base/internal/capability_space.h>
#include <internal/assert.h> #include <base/internal/assert.h>
namespace Genode { namespace Genode {

Some files were not shown because too many files have changed in this diff Show More