score: Rework global construction

Ensure that the global construction is performed in the context of the
first initialization thread.  On SMP this was not guaranteed in the
previous implementation.

4 files changed, 106 insertions, 0 deletions

diff --git a/testsuites/psxtests/psxglobalcon02/Makefile.am b/testsuites/psxtests/psxglobalcon02/Makefile.am
new file mode 100644
index 0000000000..0d29894baa
--- /dev/null
+++ b/testsuites/psxtests/psxglobalcon02/Makefile.am
@@ -0,0 +1,19 @@
+rtems_tests_PROGRAMS = psxglobalcon02
+psxglobalcon02_SOURCES = init.cc
+
+dist_rtems_tests_DATA = psxglobalcon02.scn psxglobalcon02.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 = $(psxglobalcon02_OBJECTS)
+LINK_LIBS = $(psxglobalcon02_LDLIBS)
+
+psxglobalcon02$(EXEEXT): $(psxglobalcon02_OBJECTS) $(psxglobalcon02_DEPENDENCIES)
+	@rm -f psxglobalcon02$(EXEEXT)
+	$(make-exe)
+
+include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxglobalcon02/init.cc b/testsuites/psxtests/psxglobalcon02/init.cc
new file mode 100644
index 0000000000..6de4fbd7c7
--- /dev/null
+++ b/testsuites/psxtests/psxglobalcon02/init.cc
@@ -0,0 +1,73 @@
+/*
+ * 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.
+ */
+
+#ifdef HAVE_CONFIG_H
+  #include "config.h"
+#endif
+
+#include "tmacros.h"
+
+const char rtems_test_name[] = "PSXGLOBALCON 2";
+
+class A {
+  public:
+    A()
+    {
+      ++i;
+    }
+
+    static int i;
+};
+
+int A::i;
+
+static A a;
+
+static bool rtems_init_done;
+
+extern "C" void Init(rtems_task_argument argument)
+{
+  TEST_BEGIN();
+
+  rtems_test_assert(a.i == 1);
+
+  rtems_init_done = true;
+
+  rtems_task_delete(RTEMS_SELF);
+  rtems_test_assert(0);
+}
+
+static void *POSIX_Init(void *argument)
+{
+  rtems_test_assert(rtems_init_done);
+  rtems_test_assert(a.i == 1);
+
+  TEST_END();
+  rtems_test_exit(0);
+}
+
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+
+#define CONFIGURE_MAXIMUM_TASKS 1
+#define CONFIGURE_MAXIMUM_POSIX_THREADS 1
+
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
+#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
+#define CONFIGURE_POSIX_INIT_THREAD_TABLE
+
+#define CONFIGURE_INIT
+
+#include <rtems/confdefs.h>
diff --git a/testsuites/psxtests/psxglobalcon02/psxglobalcon02.doc b/testsuites/psxtests/psxglobalcon02/psxglobalcon02.doc
new file mode 100644
index 0000000000..4dc5bde09d
--- /dev/null
+++ b/testsuites/psxtests/psxglobalcon02/psxglobalcon02.doc
@@ -0,0 +1,12 @@
+This file describes the directives and concepts tested by this test set.
+
+test set name: psxglobalcon02
+
+directives:
+
+  - _Thread_Global_construction()
+
+concepts:
+
+  - Ensure that the global construction is performed exactly once in case a
+    RTEMS initialization task and a POSIX initialization thread are present.
diff --git a/testsuites/psxtests/psxglobalcon02/psxglobalcon02.scn b/testsuites/psxtests/psxglobalcon02/psxglobalcon02.scn
new file mode 100644
index 0000000000..54ae33b5f6
--- /dev/null
+++ b/testsuites/psxtests/psxglobalcon02/psxglobalcon02.scn
@@ -0,0 +1,2 @@
+*** BEGIN OF TEST PSXGLOBALCON 2 ***
+*** END OF TEST PSXGLOBALCON 2 ***