ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-05-02 16:52:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

log_terminal: API transition

Browse Source 
Issue #1987
This commit is contained in:
Christian Prochaska 2017-01-13 16:17:58 +01:00 committed by Norman Feske
parent 18504b4801
commit cf4b663b38
2 changed files with 26 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
repos/os/src/server/log_terminal/main.cc
View File

@ -5,16 +5,16 @@
*/ */
/* /*
* Copyright (C) 2013 Genode Labs GmbH * Copyright (C) 2013-2017 Genode Labs GmbH
* *
* This file is part of the Genode OS framework, which is distributed * This file is part of the Genode OS framework, which is distributed
* under the terms of the GNU General Public License version 2. * under the terms of the GNU General Public License version 2.
*/ */
/* Genode includes */ /* Genode includes */
#include <base/component.h>
#include <base/heap.h> #include <base/heap.h>
#include <root/component.h> #include <root/component.h>
#include <os/server.h>
#include <os/attached_ram_dataspace.h> #include <os/attached_ram_dataspace.h>
#include <terminal_session/terminal_session.h> #include <terminal_session/terminal_session.h>
#include <log_session/log_session.h> #include <log_session/log_session.h>
@ -99,9 +99,11 @@ class Terminal::Session_component : public Rpc_object<Session, Session_component
public: public:
Session_component(size_t io_buffer_size) Session_component(Ram_session &ram,
Region_map &rm,
size_t io_buffer_size)
: :
_io_buffer(env()->ram_session(), io_buffer_size) _io_buffer(ram, rm, io_buffer_size)
{ } { }
@ -148,50 +150,45 @@ class Terminal::Session_component : public Rpc_object<Session, Session_component
class Terminal::Root_component : public Genode::Root_component<Session_component> class Terminal::Root_component : public Genode::Root_component<Session_component>
{ {
private:
Ram_session &_ram;
Region_map &_rm;
protected: protected:
Session_component *_create_session(const char *args) Session_component *_create_session(const char *args)
{ {
size_t const io_buffer_size = 4096; size_t const io_buffer_size = 4096;
return new (md_alloc()) Session_component(io_buffer_size); return new (md_alloc()) Session_component(_ram, _rm, io_buffer_size);
} }
public: public:
Root_component(Server::Entrypoint &ep, Genode::Allocator &md_alloc) Root_component(Entrypoint &ep,
Allocator &md_alloc,
Ram_session &ram,
Region_map &rm)
: :
Genode::Root_component<Session_component>(&ep.rpc_ep(), &md_alloc) Genode::Root_component<Session_component>(&ep.rpc_ep(), &md_alloc),
_ram(ram), _rm(rm)
{ } { }
}; };
struct Terminal::Main struct Terminal::Main
{ {
Server::Entrypoint &ep; Env &_env;
Sliced_heap sliced_heap = { env()->ram_session(), env()->rm_session() }; Sliced_heap sliced_heap { _env.ram(), _env.rm() };
Root_component terminal_root = { ep, sliced_heap }; Root_component terminal_root { _env.ep(), sliced_heap,
_env.ram(), _env.rm() };
Main(Server::Entrypoint &ep) : ep(ep) Main(Env &env) : _env(env)
{ {
env()->parent()->announce(ep.manage(terminal_root)); env.parent().announce(env.ep().manage(terminal_root));
} }
}; };
void Component::construct(Genode::Env &env) { static Terminal::Main main(env); }
/************
** Server **
************/
namespace Server {
char const *name() { return "log_terminal_ep"; }
size_t stack_size() { return 16*1024*sizeof(long); }
void construct(Entrypoint &ep)
{
static Terminal::Main terminal(ep);
}
}

2
repos/os/src/server/log_terminal/target.mk
View File

@ -1,3 +1,3 @@
TARGET = log_terminal TARGET = log_terminal
SRC_CC = main.cc SRC_CC = main.cc
LIBS = base server LIBS = base