core: improve coding-style consistency

This commit is contained in:
Norman Feske 2023-02-08 16:06:57 +01:00 committed by Christian Helmuth
parent 5bdc88bf57
commit c10904967b
38 changed files with 1517 additions and 1480 deletions

View File

@ -17,6 +17,7 @@
namespace Genode { class Irq_object; class Irq_args; }
class Genode::Irq_object
{
private:

View File

@ -29,15 +29,17 @@
#include <ipc_pager.h>
#include <rpc_cap_factory.h>
namespace Genode {
typedef Cpu_session::Thread_creation_failed Invalid_thread;
class Pager_entrypoint;
class Pager_object;
class Exception_handlers;
}
class Exception_handlers
class Genode::Exception_handlers
{
private:
@ -54,7 +56,7 @@ namespace Genode {
};
class Pager_object : public Object_pool<Pager_object>::Entry
class Genode::Pager_object : public Object_pool<Pager_object>::Entry
{
private:
@ -372,13 +374,14 @@ namespace Genode {
void print(Output &out) const;
};
/**
* Paging entry point
*
* For a paging entry point can hold only one activation. So, paging is
* strictly serialized for one entry point.
*/
class Pager_entrypoint : public Object_pool<Pager_object>
class Genode::Pager_entrypoint : public Object_pool<Pager_object>
{
public:
@ -402,6 +405,5 @@ namespace Genode {
*/
void dissolve(Pager_object &obj);
};
}
#endif /* _CORE__INCLUDE__PAGER_H_ */

View File

@ -20,9 +20,10 @@
#include <core_mem_alloc.h>
#include <address_space.h>
namespace Genode {
namespace Genode { class Platform; }
class Platform : public Platform_generic
class Genode::Platform : public Platform_generic
{
public:
@ -141,6 +142,5 @@ namespace Genode {
}
}
};
}
#endif /* _CORE__INCLUDE__PLATFORM_H_ */

View File

@ -18,11 +18,14 @@
#include <platform_thread.h>
#include <address_space.h>
namespace Genode {
class Platform_thread;
class Platform_pd : public Address_space
class Platform_pd;
}
class Genode::Platform_pd : public Address_space
{
private:
@ -92,6 +95,5 @@ namespace Genode {
void flush(addr_t, size_t, Core_local_addr) override;
};
}
#endif /* _CORE__INCLUDE__PLATFORM_PD_H_ */

View File

@ -31,7 +31,11 @@
namespace Genode {
class Platform_pd;
class Platform_thread
class Platform_thread;
}
class Genode::Platform_thread
{
private:
@ -220,6 +224,5 @@ namespace Genode {
*/
Trace::Execution_time execution_time() const;
};
}
#endif /* _CORE__INCLUDE__PLATFORM_THREAD_H_ */

View File

@ -24,6 +24,7 @@
namespace Genode { class Vm_session_component; }
class Genode::Vm_session_component
:
private Ram_quota_guard,

View File

@ -20,6 +20,7 @@
namespace Genode { class Irq_object; }
class Genode::Irq_object : public Thread {
private:

View File

@ -27,6 +27,7 @@
namespace Genode { class Page_table_registry; }
class Genode::Page_table_registry
{
public:

View File

@ -19,6 +19,7 @@
namespace Genode { class Rpc_cap_factory; }
class Genode::Rpc_cap_factory
{
private:

View File

@ -27,7 +27,18 @@
namespace Genode {
struct Thread_info
struct Thread_info;
/**
* Set register values for the instruction pointer and stack pointer and
* start the seL4 thread
*/
void start_sel4_thread(Cap_sel tcb_sel, addr_t ip, addr_t sp, unsigned cpu);
void affinity_sel4_thread(Cap_sel const &tcb_sel, unsigned cpu);
}
struct Genode::Thread_info
{
Cap_sel tcb_sel { 0 };
Cap_sel ep_sel { 0 };
@ -49,13 +60,6 @@ namespace Genode {
bool init_vcpu(Platform &, Cap_sel ept);
};
/**
* Set register values for the instruction pointer and stack pointer and
* start the seL4 thread
*/
void start_sel4_thread(Cap_sel tcb_sel, addr_t ip, addr_t sp, unsigned cpu);
void affinity_sel4_thread(Cap_sel const &tcb_sel, unsigned cpu);
};
void Genode::Thread_info::init_tcb(Platform &platform,
Range_allocator &phys_alloc,
@ -76,6 +80,7 @@ void Genode::Thread_info::init_tcb(Platform &platform,
affinity_sel4_thread(tcb_sel, cpu);
}
void Genode::Thread_info::init(addr_t const utcb_virt_addr, unsigned const prio)
{
Platform &platform = platform_specific();

View File

@ -26,6 +26,7 @@
namespace Genode { struct Untyped_memory; }
struct Genode::Untyped_memory
{
class Phys_alloc_failed : Exception { };

View File

@ -23,6 +23,7 @@
namespace Genode { class Vm_session_component; }
class Genode::Vm_session_component
:
private Ram_quota_guard,

View File

@ -19,6 +19,7 @@
namespace Genode { struct Address_space; }
struct Genode::Address_space : private Weak_object<Address_space>,
public Interface
{

View File

@ -16,6 +16,7 @@
namespace Genode { struct Boot_modules_header; }
struct Genode::Boot_modules_header
{
long name; /* physical address of null-terminated string */

View File

@ -19,6 +19,7 @@
namespace Genode { class Constrained_core_ram; }
class Genode::Constrained_core_ram : public Allocator
{
private:

View File

@ -18,6 +18,7 @@
#include <util/string.h>
namespace Genode {
struct Core_log;
struct Core_log_range {

View File

@ -20,9 +20,10 @@
/* Core includes */
#include <cpu_session_component.h>
namespace Genode {
namespace Genode { class Cpu_root; }
class Cpu_root : public Root_component<Cpu_session_component>
class Genode::Cpu_root : public Root_component<Cpu_session_component>
{
private:
@ -85,6 +86,5 @@ namespace Genode {
_trace_sources(trace_sources)
{ }
};
}
#endif /* _CORE__INCLUDE__CPU_ROOT_H_ */

View File

@ -21,8 +21,8 @@
/* base-internal includes */
#include <base/internal/page_size.h>
namespace Genode
{
namespace Genode {
class Cpu_thread_component;
/**

View File

@ -26,13 +26,16 @@
namespace Genode {
class Rm_region;
class Dataspace_component;
/**
* Deriving classes can own a dataspace to implement conditional behavior
*/
class Dataspace_owner : Interface { };
}
class Dataspace_component : public Rpc_object<Dataspace>
class Genode::Dataspace_component : public Rpc_object<Dataspace>
{
private:
@ -159,6 +162,5 @@ namespace Genode {
size_t size() override { return _size; }
bool writeable() override { return _writeable; }
};
}
#endif /* _CORE__INCLUDE__DATASPACE_COMPONENT_H_ */

View File

@ -18,9 +18,10 @@
#include "io_mem_session_component.h"
namespace Genode {
namespace Genode { class Io_mem_root; }
class Io_mem_root : public Root_component<Io_mem_session_component>
class Genode::Io_mem_root : public Root_component<Io_mem_session_component>
{
private:
@ -58,6 +59,5 @@ namespace Genode {
Root_component<Io_mem_session_component>(&session_ep, &md_alloc),
_io_mem_alloc(io_mem_alloc), _ram_alloc(ram_alloc), _ds_ep(ds_ep) { }
};
}
#endif /* _CORE__INCLUDE__IO_MEM_ROOT_H_ */

View File

@ -22,9 +22,10 @@
/* core includes */
#include <dataspace_component.h>
namespace Genode {
namespace Genode { class Io_mem_session_component; }
class Io_mem_session_component : public Rpc_object<Io_mem_session>
class Genode::Io_mem_session_component : public Rpc_object<Io_mem_session>
{
private:
@ -144,6 +145,5 @@ namespace Genode {
Io_mem_dataspace_capability dataspace() override { return _ds_cap; }
};
}
#endif /* _CORE__INCLUDE__IO_MEM_SESSION_COMPONENT_H_ */

View File

@ -19,8 +19,12 @@
#include "io_port_session_component.h"
namespace Genode {
class Io_port_handler;
class Io_port_root;
}
struct Io_port_handler
class Genode::Io_port_handler
{
private:
@ -36,7 +40,8 @@ namespace Genode {
Rpc_entrypoint &entrypoint() { return _ep; }
};
class Io_port_root : private Io_port_handler,
class Genode::Io_port_root : private Io_port_handler,
public Root_component<Io_port_session_component>
{
@ -66,6 +71,5 @@ namespace Genode {
Root_component<Io_port_session_component>(&entrypoint(), &md_alloc),
_io_port_alloc(io_port_alloc) { }
};
}
#endif /* _CORE__INCLUDE__IO_PORT_ROOT_H_ */

View File

@ -3,7 +3,7 @@
* \author Christian Helmuth
* \date 2007-04-17
*
* We assume Core is running on IOPL3.
* We assume core is running on IOPL3.
*/
/*
@ -24,9 +24,10 @@
/* core includes */
#include <dataspace_component.h>
namespace Genode {
namespace Genode { class Io_port_session_component; }
class Io_port_session_component : public Rpc_object<Io_port_session>
class Genode::Io_port_session_component : public Rpc_object<Io_port_session>
{
private:
@ -71,6 +72,5 @@ namespace Genode {
void outw(unsigned short, unsigned short) override;
void outl(unsigned short, unsigned) override;
};
}
#endif /* _CORE__INCLUDE__IO_PORT_SESSION_COMPONENT_H_ */

View File

@ -20,6 +20,7 @@
namespace Genode { class Irq_args; }
class Genode::Irq_args
{
private:

View File

@ -18,8 +18,9 @@
namespace Genode { class Irq_object; }
class Genode::Irq_object : public Thread {
class Genode::Irq_object : public Thread
{
private:
Signal_context_capability _sig_cap { };

View File

@ -20,6 +20,7 @@
namespace Genode { class Irq_root; }
class Genode::Irq_root : public Root_component<Irq_session_component>
{

View File

@ -24,6 +24,7 @@
namespace Genode { class Irq_session_component; }
class Genode::Irq_session_component : public Rpc_object<Irq_session>,
private List<Irq_session_component>::Element
{

View File

@ -19,9 +19,10 @@
#include "log_session_component.h"
namespace Genode {
namespace Genode { class Log_root; }
class Log_root : public Root_component<Log_session_component>
class Genode::Log_root : public Root_component<Log_session_component>
{
protected:
@ -46,6 +47,5 @@ namespace Genode {
Root_component<Log_session_component>(&session_ep, &md_alloc)
{ }
};
}
#endif /* _CORE__INCLUDE__LOG_ROOT_H_ */

View File

@ -20,9 +20,10 @@
#include <base/session_label.h>
#include <log_session/log_session.h>
namespace Genode {
namespace Genode { class Log_session_component; }
class Log_session_component : public Rpc_object<Log_session>
class Genode::Log_session_component : public Rpc_object<Log_session>
{
private:
@ -72,6 +73,5 @@ namespace Genode {
log(_label, Cstring(string + from_i));
}
};
}
#endif /* _CORE__INCLUDE__LOG_SESSION_COMPONENT_H_ */

View File

@ -20,9 +20,7 @@
/* Core */
#include <pd_session_component.h>
namespace Genode {
class Pd_root;
}
namespace Genode { class Pd_root; }
class Genode::Pd_root : public Genode::Root_component<Genode::Pd_session_component>

View File

@ -24,10 +24,25 @@
namespace Genode {
class Platform_generic;
/**
* Generic platform interface
* Request pointer to static generic platform interface of core
*/
class Platform_generic
extern Platform_generic &platform();
class Platform;
/**
* Access the platform-specific platform interface of core
*
* This function should only be called from platform-specific code.
*/
extern Platform &platform_specific();
}
class Genode::Platform_generic
{
public:
@ -106,19 +121,4 @@ namespace Genode {
};
/**
* Request pointer to static generic platform interface of core
*/
extern Platform_generic &platform();
class Platform;
/**
* Access the platform-specific platform interface of core
*
* This function should only be called from platform-specific code.
*/
extern Platform &platform_specific();
}
#endif /* _CORE__INCLUDE__PLATFORM_GENERIC_H_ */

View File

@ -40,7 +40,6 @@
#include <base/internal/stack_area.h>
namespace Genode {
class Cpu_thread_component;
class Dataspace_component;
class Region_map_component;
@ -51,6 +50,7 @@ namespace Genode {
class Rm_session_component;
}
class Genode::Region_map_detach : Genode::Interface
{
public:

View File

@ -17,11 +17,11 @@
#include <root/component.h>
#include "rom_session_component.h"
namespace Genode {
namespace Genode { class Rom_root; }
class Rom_root : public Root_component<Rom_session_component>
class Genode::Rom_root : public Root_component<Rom_session_component>
{
private:
Rom_fs &_rom_fs; /* rom file system */
@ -50,6 +50,5 @@ namespace Genode {
Root_component<Rom_session_component>(&session_ep, &md_alloc),
_rom_fs(rom_fs), _ds_ep(ds_ep) { }
};
}
#endif /* _CORE__INCLUDE__ROM_ROOT_H_ */

View File

@ -20,9 +20,10 @@
#include <rom_session/rom_session.h>
#include <base/session_label.h>
namespace Genode {
namespace Genode { class Rom_session_component; }
class Rom_session_component : public Rpc_object<Rom_session>
class Genode::Rom_session_component : public Rpc_object<Rom_session>
{
private:
@ -77,6 +78,5 @@ namespace Genode {
Rom_dataspace_capability dataspace() override { return _ds_cap; }
void sigh(Signal_context_capability) override { }
};
}
#endif /* _CORE__INCLUDE__ROM_SESSION_COMPONENT_H_ */

View File

@ -20,6 +20,7 @@
namespace Genode { class Rpc_cap_factory; }
class Genode::Rpc_cap_factory
{
private:

View File

@ -21,6 +21,7 @@
namespace Genode { class Signal_broker; }
class Genode::Signal_broker
{
private:

View File

@ -15,15 +15,20 @@
#define _CORE__INCLUDE__SIGNAL_DELIVERY_PROXY_H_
namespace Genode {
struct Signal_delivery_proxy;
struct Signal_delivery_proxy_component;
}
struct Signal_delivery_proxy : Interface
struct Genode::Signal_delivery_proxy : Interface
{
GENODE_RPC(Rpc_deliver, void, _deliver_from_ep, Signal_context_capability, unsigned);
GENODE_RPC(Rpc_release, void, _release_from_ep, Genode::addr_t);
GENODE_RPC_INTERFACE(Rpc_deliver, Rpc_release);
};
struct Signal_delivery_proxy_component
struct Genode::Signal_delivery_proxy_component
:
Rpc_object<Signal_delivery_proxy, Signal_delivery_proxy_component>
{
@ -92,6 +97,5 @@ namespace Genode {
void release(Signal_context_component &context) {
_proxy_cap.call<Rpc_release>(reinterpret_cast<addr_t>(&context)); }
};
}
#endif /* _CORE__INCLUDE__SIGNLA_DELIVERY_PROXY_H_ */

View File

@ -23,6 +23,7 @@
namespace Genode { class Vm_root; }
class Genode::Vm_root : public Root_component<Vm_session_component>
{
private: