mirror of
https://github.com/mmueller41/genode.git
synced 2026-01-21 12:32:56 +01:00
Merge branch 'master' of github.com:mmueller41/genode
This commit is contained in:
@@ -22,7 +22,7 @@ namespace Hello { struct Connection; }
|
||||
|
||||
struct Hello::Connection : Genode::Connection<Session>, Session_client
|
||||
{
|
||||
Connection(Genode::Env &env, unsigned short id)
|
||||
Connection(Genode::Env &env)
|
||||
: /* create session */
|
||||
Genode::Connection<Hello::Session>(env, session(env.parent(),
|
||||
"ram_quota=6K, cap_quota=4")),
|
||||
|
||||
@@ -24,8 +24,6 @@ struct Hello::Session : Genode::Session
|
||||
{
|
||||
static const char *service_name() { return "Hello"; }
|
||||
|
||||
unsigned short _id;
|
||||
|
||||
enum { CAP_QUOTA = 2 };
|
||||
|
||||
virtual void say_hello() = 0;
|
||||
|
||||
@@ -60,7 +60,7 @@ struct HelloClient {
|
||||
Genode::log("hello test completed.");
|
||||
}
|
||||
|
||||
HelloClient(Genode::Env &env, Hello::Connection &conn) : _env(env), _a(5), _b(2), _hello(conn)
|
||||
HelloClient(Genode::Env &env, Hello::Connection &conn) : _env(env), _hello(conn), _a(5), _b(2)
|
||||
{
|
||||
_config.sigh(_config_handler);
|
||||
_handle_config();
|
||||
@@ -71,7 +71,7 @@ void
|
||||
Component::construct(Genode::Env &env)
|
||||
{
|
||||
Timer::Connection timer(env);
|
||||
Hello::Connection hello(env, (unsigned short)timer.elapsed_ms());
|
||||
Hello::Connection hello(env);
|
||||
|
||||
HelloClient client(env, hello);
|
||||
client.run();
|
||||
|
||||
@@ -107,7 +107,7 @@ static void test_blocking_connect_timeout()
|
||||
|
||||
int s = socket(AF_INET, SOCK_STREAM, 0);
|
||||
|
||||
struct sockaddr_in addr;
|
||||
struct addr;
|
||||
memset(&addr, 0, sizeof(addr));
|
||||
addr.sin_family = AF_INET;
|
||||
addr.sin_port = htons(port_timeout);
|
||||
|
||||
Reference in New Issue
Block a user