From 5ac3c335dc3eb291d228fc8fac5eb0688a63832e Mon Sep 17 00:00:00 2001 From: Norman Feske Date: Tue, 20 Apr 2021 14:05:06 +0200 Subject: [PATCH] Remove pkg/test-dynamic_config_slave Issue #3754 --- repos/gems/run/depot_autopilot.run | 1 - .../pkg/test-dynamic_config_slave/README | 1 - .../pkg/test-dynamic_config_slave/archives | 2 - .../pkg/test-dynamic_config_slave/hash | 1 - .../pkg/test-dynamic_config_slave/runtime | 37 --------- .../os/src/test/dynamic_config/master/main.cc | 80 ------------------- .../src/test/dynamic_config/master/target.mk | 3 - 7 files changed, 125 deletions(-) delete mode 100644 repos/os/recipes/pkg/test-dynamic_config_slave/README delete mode 100644 repos/os/recipes/pkg/test-dynamic_config_slave/archives delete mode 100644 repos/os/recipes/pkg/test-dynamic_config_slave/hash delete mode 100644 repos/os/recipes/pkg/test-dynamic_config_slave/runtime delete mode 100644 repos/os/src/test/dynamic_config/master/main.cc delete mode 100644 repos/os/src/test/dynamic_config/master/target.mk diff --git a/repos/gems/run/depot_autopilot.run b/repos/gems/run/depot_autopilot.run index 3842b6df8d..bd49ead80b 100644 --- a/repos/gems/run/depot_autopilot.run +++ b/repos/gems/run/depot_autopilot.run @@ -655,7 +655,6 @@ set default_test_pkgs { test-ds_ownership test-dynamic_config test-dynamic_config_loader - test-dynamic_config_slave test-entrypoint test-expat test-fault_detection diff --git a/repos/os/recipes/pkg/test-dynamic_config_slave/README b/repos/os/recipes/pkg/test-dynamic_config_slave/README deleted file mode 100644 index 5924751dd3..0000000000 --- a/repos/os/recipes/pkg/test-dynamic_config_slave/README +++ /dev/null @@ -1 +0,0 @@ -Test for changing the configuration of a slave at runtime. diff --git a/repos/os/recipes/pkg/test-dynamic_config_slave/archives b/repos/os/recipes/pkg/test-dynamic_config_slave/archives deleted file mode 100644 index cf4c0e504e..0000000000 --- a/repos/os/recipes/pkg/test-dynamic_config_slave/archives +++ /dev/null @@ -1,2 +0,0 @@ -_/src/init -_/src/test-dynamic_config diff --git a/repos/os/recipes/pkg/test-dynamic_config_slave/hash b/repos/os/recipes/pkg/test-dynamic_config_slave/hash deleted file mode 100644 index bedbaaefe2..0000000000 --- a/repos/os/recipes/pkg/test-dynamic_config_slave/hash +++ /dev/null @@ -1 +0,0 @@ -2021-04-19 4f56b11f9dd922fe8d70c771a90b6fd998b0f78a diff --git a/repos/os/recipes/pkg/test-dynamic_config_slave/runtime b/repos/os/recipes/pkg/test-dynamic_config_slave/runtime deleted file mode 100644 index f7cf749686..0000000000 --- a/repos/os/recipes/pkg/test-dynamic_config_slave/runtime +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - [init -> test-dynamic_config_master -> test-dynamic_config] obtained counter value 11 from config - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/repos/os/src/test/dynamic_config/master/main.cc b/repos/os/src/test/dynamic_config/master/main.cc deleted file mode 100644 index 54dbc87692..0000000000 --- a/repos/os/src/test/dynamic_config/master/main.cc +++ /dev/null @@ -1,80 +0,0 @@ -/* - * \brief Test for changing the configuration of a slave at runtime - * \author Norman Feske - * \date 2012-04-04 - */ - -/* - * Copyright (C) 2012-2017 Genode Labs GmbH - * - * This file is part of the Genode OS framework, which is distributed - * under the terms of the GNU Affero General Public License version 3. - */ - -/* Genode includes */ -#include -#include -#include -#include - - -namespace Test { - - using namespace Genode; - - struct Policy; - struct Main; -} - - -struct Test::Policy -: - private Static_parent_services, - public Slave::Policy -{ - Policy(Env &env, Name const &name) - : - Static_parent_services(env), - Slave::Policy(env, name, name, *this, env.ep().rpc_ep(), - Cap_quota{100}, Ram_quota{1024*1024}) - { } -}; - - -struct Test::Main -{ - Env &_env; - - Policy _policy { _env, "test-dynamic_config" }; - - unsigned _cnt = 0; - - void _configure() - { - String<256> const config("", _cnt, ""); - _policy.configure(config.string()); - _cnt++; - } - - Child _child { _env.rm(), _env.ep().rpc_ep(), _policy }; - - Timer::Connection timer { _env }; - - Signal_handler
_timeout_handler { _env.ep(), *this, &Main::_handle_timeout }; - - void _handle_timeout() { _configure(); } - - Main(Env &env) : _env(env) - { - /* update slave config at regular intervals */ - timer.sigh(_timeout_handler); - timer.trigger_periodic(250*1000); - - /* define initial config for slave before returning to entrypoint */ - _configure(); - } -}; - - -void Component::construct(Genode::Env &env) { static Test::Main main(env); } diff --git a/repos/os/src/test/dynamic_config/master/target.mk b/repos/os/src/test/dynamic_config/master/target.mk deleted file mode 100644 index dae175e8ea..0000000000 --- a/repos/os/src/test/dynamic_config/master/target.mk +++ /dev/null @@ -1,3 +0,0 @@ -TARGET = test-dynamic_config_master -SRC_CC = main.cc -LIBS = base