summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cpukit/sapi/src/interrtext.c3
-rw-r--r--cpukit/score/include/rtems/score/interr.h3
-rw-r--r--cpukit/score/src/threadrestart.c8
-rw-r--r--testsuites/sptests/Makefile.am1
-rw-r--r--testsuites/sptests/configure.ac1
-rw-r--r--testsuites/sptests/spfatal28/Makefile.am19
-rw-r--r--testsuites/sptests/spfatal28/spfatal28.doc12
-rw-r--r--testsuites/sptests/spfatal28/spfatal28.scn3
-rw-r--r--testsuites/sptests/spfatal28/testcase.h39
-rw-r--r--testsuites/sptests/spinternalerror02/init.c2
-rw-r--r--testsuites/sptests/spsem01/init.c6
-rw-r--r--testsuites/sptests/spsem01/spsem01.scn9
-rw-r--r--testsuites/sptests/spsem02/init.c6
-rw-r--r--testsuites/sptests/spsem02/spsem02.scn7
14 files changed, 101 insertions, 18 deletions
diff --git a/cpukit/sapi/src/interrtext.c b/cpukit/sapi/src/interrtext.c
index a18610cf77..e08414bf9f 100644
--- a/cpukit/sapi/src/interrtext.c
+++ b/cpukit/sapi/src/interrtext.c
@@ -51,7 +51,8 @@ static const char *const internal_error_text[] = {
"INTERNAL_ERROR_GXX_KEY_ADD_FAILED",
"INTERNAL_ERROR_GXX_MUTEX_INIT_FAILED",
"INTERNAL_ERROR_NO_MEMORY_FOR_HEAP",
- "INTERNAL_ERROR_CPU_ISR_INSTALL_VECTOR"
+ "INTERNAL_ERROR_CPU_ISR_INSTALL_VECTOR",
+ "INTERNAL_ERROR_RESOURCE_IN_USE"
};
const char *rtems_internal_error_text( rtems_fatal_code error )
diff --git a/cpukit/score/include/rtems/score/interr.h b/cpukit/score/include/rtems/score/interr.h
index 8c647f5d0f..2100c13e07 100644
--- a/cpukit/score/include/rtems/score/interr.h
+++ b/cpukit/score/include/rtems/score/interr.h
@@ -147,7 +147,8 @@ typedef enum {
INTERNAL_ERROR_GXX_KEY_ADD_FAILED,
INTERNAL_ERROR_GXX_MUTEX_INIT_FAILED,
INTERNAL_ERROR_NO_MEMORY_FOR_HEAP,
- INTERNAL_ERROR_CPU_ISR_INSTALL_VECTOR
+ INTERNAL_ERROR_CPU_ISR_INSTALL_VECTOR,
+ INTERNAL_ERROR_RESOURCE_IN_USE
} Internal_errors_Core_list;
typedef uint32_t Internal_errors_t;
diff --git a/cpukit/score/src/threadrestart.c b/cpukit/score/src/threadrestart.c
index 4b83edefb7..02371acfdb 100644
--- a/cpukit/score/src/threadrestart.c
+++ b/cpukit/score/src/threadrestart.c
@@ -47,6 +47,14 @@ static void _Thread_Make_zombie( Thread_Control *the_thread )
ISR_lock_Context lock_context;
Thread_Zombie_control *zombies = &_Thread_Zombies;
+ if ( the_thread->resource_count != 0 ) {
+ _Terminate(
+ INTERNAL_ERROR_CORE,
+ false,
+ INTERNAL_ERROR_RESOURCE_IN_USE
+ );
+ }
+
_Thread_Set_state( the_thread, STATES_ZOMBIE );
_Thread_queue_Extract_with_proxy( the_thread );
_Watchdog_Remove( &the_thread->Timer );
diff --git a/testsuites/sptests/Makefile.am b/testsuites/sptests/Makefile.am
index d47f6f7244..c344ce01e2 100644
--- a/testsuites/sptests/Makefile.am
+++ b/testsuites/sptests/Makefile.am
@@ -33,6 +33,7 @@ SUBDIRS = \
spsignal_err01 spport_err01 spmsgq_err01 spmsgq_err02 spsem_err01 \
spsem_err02 sptask_err01 spevent_err03 sptask_err03 sptask_err02 \
sptask_err04 spclock_err01
+SUBDIRS += spfatal28
SUBDIRS += spthreadlife01
SUBDIRS += spprofiling01
SUBDIRS += spcache01
diff --git a/testsuites/sptests/configure.ac b/testsuites/sptests/configure.ac
index 4809bdc176..3f2f952db2 100644
--- a/testsuites/sptests/configure.ac
+++ b/testsuites/sptests/configure.ac
@@ -36,6 +36,7 @@ AM_CONDITIONAL(HAS_CPUSET,test x"${ac_cv_header_sys_cpuset_h}" = x"yes")
# Explicitly list all Makefiles here
AC_CONFIG_FILES([Makefile
+spfatal28/Makefile
spthreadlife01/Makefile
spprofiling01/Makefile
spcache01/Makefile
diff --git a/testsuites/sptests/spfatal28/Makefile.am b/testsuites/sptests/spfatal28/Makefile.am
new file mode 100644
index 0000000000..a20d936f5f
--- /dev/null
+++ b/testsuites/sptests/spfatal28/Makefile.am
@@ -0,0 +1,19 @@
+rtems_tests_PROGRAMS = spfatal28
+spfatal28_SOURCES = ../spfatal_support/init.c ../spfatal_support/system.h testcase.h
+
+dist_rtems_tests_DATA = spfatal28.scn spfatal28.doc
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/leaf.am
+
+AM_CPPFLAGS += -I$(top_srcdir)/../support/include
+
+LINK_OBJS = $(spfatal28_OBJECTS)
+LINK_LIBS = $(spfatal28_LDLIBS)
+
+spfatal28$(EXEEXT): $(spfatal28_OBJECTS) $(spfatal28_DEPENDENCIES)
+ @rm -f spfatal28$(EXEEXT)
+ $(make-exe)
+
+include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/spfatal28/spfatal28.doc b/testsuites/sptests/spfatal28/spfatal28.doc
new file mode 100644
index 0000000000..7514dd9903
--- /dev/null
+++ b/testsuites/sptests/spfatal28/spfatal28.doc
@@ -0,0 +1,12 @@
+This file describes the directives and concepts tested by this test set.
+
+test set name: spfatal28
+
+directives:
+
+ - rtems_task_delete()
+
+concepts:
+
+ - Ensure that deletion of a task with a semaphore in use leads to a fatal
+ error.
diff --git a/testsuites/sptests/spfatal28/spfatal28.scn b/testsuites/sptests/spfatal28/spfatal28.scn
new file mode 100644
index 0000000000..6fcae10340
--- /dev/null
+++ b/testsuites/sptests/spfatal28/spfatal28.scn
@@ -0,0 +1,3 @@
+*** BEGIN OF TEST SPFATAL 28 ***
+Fatal error (delete a task with a semaphore in use) hit
+*** END OF TEST SPFATAL 28 ***
diff --git a/testsuites/sptests/spfatal28/testcase.h b/testsuites/sptests/spfatal28/testcase.h
new file mode 100644
index 0000000000..fc721003e2
--- /dev/null
+++ b/testsuites/sptests/spfatal28/testcase.h
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2014 embedded brains GmbH. All rights reserved.
+ *
+ * embedded brains GmbH
+ * Dornierstr. 4
+ * 82178 Puchheim
+ * Germany
+ * <rtems@embedded-brains.de>
+ *
+ * The license and distribution terms for this file may be
+ * found in the file LICENSE in this distribution or at
+ * http://www.rtems.org/license/LICENSE.
+ */
+
+#define FATAL_ERROR_TEST_NAME "28"
+#define FATAL_ERROR_DESCRIPTION "delete a task with a semaphore in use"
+#define FATAL_ERROR_EXPECTED_SOURCE INTERNAL_ERROR_CORE
+#define FATAL_ERROR_EXPECTED_IS_INTERNAL FALSE
+#define FATAL_ERROR_EXPECTED_ERROR INTERNAL_ERROR_RESOURCE_IN_USE
+
+#define CONFIGURE_MAXIMUM_SEMAPHORES 1
+
+void force_error()
+{
+ rtems_status_code sc;
+ rtems_id id;
+
+ sc = rtems_semaphore_create(
+ rtems_build_name('S', 'E', 'M', 'A'),
+ 0,
+ RTEMS_BINARY_SEMAPHORE | RTEMS_PRIORITY | RTEMS_INHERIT_PRIORITY,
+ 0,
+ &id
+ );
+ rtems_test_assert(sc == RTEMS_SUCCESSFUL);
+
+ sc = rtems_task_delete(RTEMS_SELF);
+ rtems_test_assert(sc == RTEMS_SUCCESSFUL);
+}
diff --git a/testsuites/sptests/spinternalerror02/init.c b/testsuites/sptests/spinternalerror02/init.c
index 340a9e3598..3302a2c72a 100644
--- a/testsuites/sptests/spinternalerror02/init.c
+++ b/testsuites/sptests/spinternalerror02/init.c
@@ -35,7 +35,7 @@ static void test_internal_error_text(void)
puts( text );
} while ( text != text_last );
- rtems_test_assert( error - 3 == INTERNAL_ERROR_CPU_ISR_INSTALL_VECTOR );
+ rtems_test_assert( error - 3 == INTERNAL_ERROR_RESOURCE_IN_USE );
}
static void test_fatal_source_text(void)
diff --git a/testsuites/sptests/spsem01/init.c b/testsuites/sptests/spsem01/init.c
index e950890af2..924f4c052d 100644
--- a/testsuites/sptests/spsem01/init.c
+++ b/testsuites/sptests/spsem01/init.c
@@ -150,8 +150,8 @@ rtems_task Task02(rtems_task_argument ignored)
directive_failed( status, " rtems_semaphore_obtain S1");
printf("TA02: priority %d, holding S1\n", getprio());
- printf("TA02: exiting\n");
- status = rtems_task_delete( RTEMS_SELF);
- directive_failed( status, "rtems_task_delete TA02");
+ printf("TA02: suspending\n");
+ status = rtems_task_suspend( RTEMS_SELF);
+ directive_failed( status, "rtems_task_suspend TA02");
}
diff --git a/testsuites/sptests/spsem01/spsem01.scn b/testsuites/sptests/spsem01/spsem01.scn
index 8b0a59a228..35e6b94fc5 100644
--- a/testsuites/sptests/spsem01/spsem01.scn
+++ b/testsuites/sptests/spsem01/spsem01.scn
@@ -1,4 +1,4 @@
-*** TEST SEM01 ***
+*** BEGIN OF TEST SPSEM 1 ***
init: S0 created
init: S1 created
init: TA01 created with priority 36
@@ -7,10 +7,9 @@ TA01: started with priority 36
TA01: priority 36, holding S0
TA01: priority 36, holding S0, S1
TA02: started with priority 34
+TA01: priority 34, holding S0
TA02: priority 34, holding S1
-TA02: exiting
-TA01: priority 36, holding S0
+TA02: suspending
TA01: priority 36
TA01: exiting
-*** END OF SEM01 ***
-
+*** END OF TEST SPSEM 1 ***
diff --git a/testsuites/sptests/spsem02/init.c b/testsuites/sptests/spsem02/init.c
index c88e9adffb..d5fb47b255 100644
--- a/testsuites/sptests/spsem02/init.c
+++ b/testsuites/sptests/spsem02/init.c
@@ -168,9 +168,9 @@ rtems_task Task02(rtems_task_argument ignored)
directive_failed( status, " rtems_semaphore_obtain S1");
printf("TA02: priority %d, holding S1\n", getprio());
- printf("TA02: exiting\n");
- status = rtems_task_delete( RTEMS_SELF);
- directive_failed( status, "rtems_task_delete TA02");
+ printf("TA02: suspending\n");
+ status = rtems_task_suspend( RTEMS_SELF);
+ directive_failed( status, "rtems_task_suspend TA02");
}
/* Task03 starts with priority 32 */
diff --git a/testsuites/sptests/spsem02/spsem02.scn b/testsuites/sptests/spsem02/spsem02.scn
index 5b8d03d8ea..ab8c7ce139 100644
--- a/testsuites/sptests/spsem02/spsem02.scn
+++ b/testsuites/sptests/spsem02/spsem02.scn
@@ -1,4 +1,4 @@
-*** TEST SEM02 ***
+*** BEGIN OF TEST SPSEM 2 ***
init: S0 created
init: S1 created
init: TA01 created with priority 36
@@ -15,8 +15,7 @@ TA03: priority 32, holding S0
TA03: priority 32
TA03: exiting
TA02: priority 34, holding S1
-TA02: exiting
+TA02: suspending
TA01: priority 36
TA01: exiting
-*** END OF SEM02 ***
-
+*** END OF TEST SPSEM 2 ***
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-23 08:46:54 +0000