ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-06-06 17:31:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

server/terminal_log: API transition

Browse Source 
Ref #1987
This commit is contained in:
Emery Hemingway 2017-01-16 12:02:32 +01:00 committed by Norman Feske
parent 212cf856a5
commit 2351aef744
1 changed files with 16 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
repos/os/src/server/terminal_log/main.cc
View File

@ -11,14 +11,12 @@
* under the terms of the GNU General Public License version 2. * under the terms of the GNU General Public License version 2.
*/ */
#include <base/env.h>
#include <base/rpc_server.h>
#include <base/sleep.h>
#include <root/component.h> #include <root/component.h>
#include <base/component.h>
#include <base/heap.h>
#include <util/string.h> #include <util/string.h>
#include <terminal_session/connection.h> #include <terminal_session/connection.h>
#include <cap_session/connection.h>
#include <log_session/log_session.h> #include <log_session/log_session.h>
@ -33,14 +31,14 @@ namespace Genode {
private: private:
char _label[LABEL_LEN]; char _label[LABEL_LEN];
Terminal::Connection *_terminal; Terminal::Connection &_terminal;
public: public:
/** /**
* Constructor * Constructor
*/ */
Termlog_component(const char *label, Terminal::Connection *terminal) Termlog_component(const char *label, Terminal::Connection &terminal)
: _terminal(terminal) { snprintf(_label, LABEL_LEN, "[%s] ", label); } : _terminal(terminal) { snprintf(_label, LABEL_LEN, "[%s] ", label); }
@ -74,16 +72,16 @@ namespace Genode {
*/ */
enum { ESC = 27 }; enum { ESC = 27 };
if ((string[0] == ESC) && (len == 5) && (string[4] == '\n')) { if ((string[0] == ESC) && (len == 5) && (string[4] == '\n')) {
_terminal->write(string, len - 1); _terminal.write(string, len - 1);
return len; return len;
} }
_terminal->write(_label, strlen(_label)); _terminal.write(_label, strlen(_label));
_terminal->write(string, len); _terminal.write(string, len);
/* if last character of string was not a line break, add one */ /* if last character of string was not a line break, add one */
if ((len > 0) && (string[len - 1] != '\n')) if ((len > 0) && (string[len - 1] != '\n'))
_terminal->write("\n", 1); _terminal.write("\n", 1);
return len; return len;
} }
@ -94,7 +92,7 @@ namespace Genode {
{ {
private: private:
Terminal::Connection *_terminal; Terminal::Connection _terminal;
protected: protected:
@ -127,39 +125,19 @@ namespace Genode {
* \param session_ep entry point for managing cpu session objects * \param session_ep entry point for managing cpu session objects
* \param md_alloc meta-data allocator to be used by root component * \param md_alloc meta-data allocator to be used by root component
*/ */
Termlog_root(Rpc_entrypoint *session_ep, Allocator *md_alloc, Termlog_root(Genode::Env &env, Allocator &md_alloc)
Terminal::Connection *terminal) : Root_component<Termlog_component>(env.ep(), md_alloc),
: Root_component<Termlog_component>(session_ep, md_alloc), _terminal(env, "log") { }
_terminal(terminal) { }
}; };
} }
int main(int argc, char **argv) void Component::construct(Genode::Env &env)
{ {
using namespace Genode; using namespace Genode;
/* static Sliced_heap session_alloc(env.ram(), env.rm());
* Open Terminal session static Genode::Termlog_root termlog_root(env, session_alloc);
*/
static Terminal::Connection terminal;
/* env.parent().announce(env.ep().manage(termlog_root));
* Initialize server entry point
*/
enum { STACK_SIZE = 4096 };
static Cap_connection cap;
static Rpc_entrypoint ep(&cap, STACK_SIZE, "termlog_ep");
static Termlog_root termlog_root(&ep, env()->heap(), &terminal);
/*
* Announce services
*/
env()->parent()->announce(ep.manage(&termlog_root));
/**
* Got to sleep forever
*/
sleep_forever();
return 0;
} }