From 604f4c666b28fa25b2a0b97179aea4fe66f75933 Mon Sep 17 00:00:00 2001 From: Christian Helmuth Date: Wed, 5 Feb 2020 16:03:37 +0100 Subject: [PATCH] Remove Timed_semaphore from libc incl test package Issue #3550 --- repos/gems/run/depot_autopilot.run | 1 - .../recipes/pkg/test-timed_semaphore/README | 1 - .../recipes/pkg/test-timed_semaphore/archives | 2 - .../recipes/pkg/test-timed_semaphore/hash | 1 - .../recipes/pkg/test-timed_semaphore/runtime | 36 -------- .../src/test-timed_semaphore/content.mk | 9 -- .../recipes/src/test-timed_semaphore/hash | 1 - .../src/test-timed_semaphore/used_apis | 3 - .../libports/src/test/timed_semaphore/main.cc | 84 ------------------- .../src/test/timed_semaphore/target.mk | 4 - 10 files changed, 142 deletions(-) delete mode 100644 repos/libports/recipes/pkg/test-timed_semaphore/README delete mode 100644 repos/libports/recipes/pkg/test-timed_semaphore/archives delete mode 100644 repos/libports/recipes/pkg/test-timed_semaphore/hash delete mode 100644 repos/libports/recipes/pkg/test-timed_semaphore/runtime delete mode 100644 repos/libports/recipes/src/test-timed_semaphore/content.mk delete mode 100644 repos/libports/recipes/src/test-timed_semaphore/hash delete mode 100644 repos/libports/recipes/src/test-timed_semaphore/used_apis delete mode 100644 repos/libports/src/test/timed_semaphore/main.cc delete mode 100644 repos/libports/src/test/timed_semaphore/target.mk diff --git a/repos/gems/run/depot_autopilot.run b/repos/gems/run/depot_autopilot.run index 7f8e15c92..b8fd22f0f 100644 --- a/repos/gems/run/depot_autopilot.run +++ b/repos/gems/run/depot_autopilot.run @@ -719,7 +719,6 @@ set default_test_pkgs { test-tcp_bulk_lwip test-tcp_bulk_lxip test-terminal_crosslink - test-timed_semaphore test-timer test-tls test-trace diff --git a/repos/libports/recipes/pkg/test-timed_semaphore/README b/repos/libports/recipes/pkg/test-timed_semaphore/README deleted file mode 100644 index 124243c2d..000000000 --- a/repos/libports/recipes/pkg/test-timed_semaphore/README +++ /dev/null @@ -1 +0,0 @@ -Test for the timed-semaphore. diff --git a/repos/libports/recipes/pkg/test-timed_semaphore/archives b/repos/libports/recipes/pkg/test-timed_semaphore/archives deleted file mode 100644 index b4c5496d2..000000000 --- a/repos/libports/recipes/pkg/test-timed_semaphore/archives +++ /dev/null @@ -1,2 +0,0 @@ -_/src/init -_/src/test-timed_semaphore diff --git a/repos/libports/recipes/pkg/test-timed_semaphore/hash b/repos/libports/recipes/pkg/test-timed_semaphore/hash deleted file mode 100644 index a045d0b19..000000000 --- a/repos/libports/recipes/pkg/test-timed_semaphore/hash +++ /dev/null @@ -1 +0,0 @@ -2020-02-03 7b7b3c7a824463cdabab57847e283e22b0783f53 diff --git a/repos/libports/recipes/pkg/test-timed_semaphore/runtime b/repos/libports/recipes/pkg/test-timed_semaphore/runtime deleted file mode 100644 index d97a5aaa5..000000000 --- a/repos/libports/recipes/pkg/test-timed_semaphore/runtime +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - --- Timed semaphore test finished --- - Error: - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/repos/libports/recipes/src/test-timed_semaphore/content.mk b/repos/libports/recipes/src/test-timed_semaphore/content.mk deleted file mode 100644 index c0c092f2c..000000000 --- a/repos/libports/recipes/src/test-timed_semaphore/content.mk +++ /dev/null @@ -1,9 +0,0 @@ -SRC_DIR = src/test/timed_semaphore -include $(GENODE_DIR)/repos/base/recipes/src/content.inc - -MIRROR_FROM_REP_DIR := src/lib/libc/internal/timed_semaphore.h - -content: $(MIRROR_FROM_REP_DIR) - -$(MIRROR_FROM_REP_DIR): - $(mirror_from_rep_dir) diff --git a/repos/libports/recipes/src/test-timed_semaphore/hash b/repos/libports/recipes/src/test-timed_semaphore/hash deleted file mode 100644 index b65552458..000000000 --- a/repos/libports/recipes/src/test-timed_semaphore/hash +++ /dev/null @@ -1 +0,0 @@ -2020-02-03 594e3c8a2cf17fdd598b0fbddb77720d58e3f0c5 diff --git a/repos/libports/recipes/src/test-timed_semaphore/used_apis b/repos/libports/recipes/src/test-timed_semaphore/used_apis deleted file mode 100644 index 3a7f09b08..000000000 --- a/repos/libports/recipes/src/test-timed_semaphore/used_apis +++ /dev/null @@ -1,3 +0,0 @@ -base -os -timer_session diff --git a/repos/libports/src/test/timed_semaphore/main.cc b/repos/libports/src/test/timed_semaphore/main.cc deleted file mode 100644 index 82ea5399b..000000000 --- a/repos/libports/src/test/timed_semaphore/main.cc +++ /dev/null @@ -1,84 +0,0 @@ -/* - * \brief Test for the libc-internal timed semaphore - * \author Stefan Kalkowski - * \author Martin Stein - * \date 2010-03-05 - */ - -/* - * Copyright (C) 2010-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 - -/* libc-internal include */ -#include - -using namespace Genode; -using namespace Libc; - - -struct Test : Thread -{ - struct Failed : Exception { }; - - Timeout_entrypoint timeout_ep; - unsigned id; - Timer::Connection wakeup_timer; - uint64_t const wakeup_period; - Timed_semaphore sem { timeout_ep }; - bool stop_wakeup { false }; - Lock wakeup_stopped { Lock::LOCKED }; - bool got_timeouts { false }; - - void entry() override - { - do { - wakeup_timer.msleep(wakeup_period); - sem.up(); - } while (!stop_wakeup); - wakeup_stopped.unlock(); - } - - Test(Env &env, bool timeouts, unsigned id, char const *brief) - : - Thread(env, "wakeup", 1024 * sizeof(addr_t)), - timeout_ep(env), id(id), wakeup_timer(env), - wakeup_period(timeouts ? 1000 : 100) - { - log("\nTEST ", id, ": ", brief, "\n"); - Thread::start(); - try { for (int i = 0; i < 10; i++) { sem.down(timeouts ? 100 : 1000); } } - catch (Timeout_exception) { got_timeouts = true; } - if (timeouts != got_timeouts) { - throw Failed(); } - - stop_wakeup = true; - wakeup_stopped.lock(); - } - - ~Test() { log("\nTEST ", id, " finished\n"); } -}; - - -struct Main -{ - Constructible test { }; - - Main(Env &env) - { - log("--- Timed semaphore test ---"); - test.construct(env, false, 1, "without timeouts"); test.destruct(); - test.construct(env, true, 2, "with timeouts"); test.destruct(); - log("--- Timed semaphore test finished ---"); - } -}; - - -void Component::construct(Genode::Env &env) { static Main main(env); } diff --git a/repos/libports/src/test/timed_semaphore/target.mk b/repos/libports/src/test/timed_semaphore/target.mk deleted file mode 100644 index d850f3780..000000000 --- a/repos/libports/src/test/timed_semaphore/target.mk +++ /dev/null @@ -1,4 +0,0 @@ -TARGET = test-timed_semaphore -SRC_CC = main.cc -LIBS = base -INC_DIR += $(REP_DIR)/src/lib/libc/internal