forked from Imagelibrary/rtems
2003-07-18 Joel Sherrill <joel@OARcorp.com>
PR 426/ada * configure.ac, samples/Makefile.am: Remove base_mp from 4.6 branch. * samples/base_mp/.cvsignore, samples/base_mp/Makefile.am, samples/base_mp/config.h, samples/base_mp/mptest.adb, samples/base_mp/mptest.ads, samples/base_mp/node1/.cvsignore, samples/base_mp/node1/Makefile.am, samples/base_mp/node1/base_mp.scn, samples/base_mp/node2/.cvsignore, samples/base_mp/node2/Makefile.am, samples/base_mp/node2/base_mp.scn: Removed.
This commit is contained in:
Joel Sherrill
@@ -1,3 +1,14 @@
|
|||||||
|
2003-07-18 Joel Sherrill <joel@OARcorp.com>
|
||||||
|
|
||||||
|
PR 426/ada
|
||||||
|
* configure.ac, samples/Makefile.am: Remove base_mp from 4.6 branch.
|
||||||
|
* samples/base_mp/.cvsignore, samples/base_mp/Makefile.am,
|
||||||
|
samples/base_mp/config.h, samples/base_mp/mptest.adb,
|
||||||
|
samples/base_mp/mptest.ads, samples/base_mp/node1/.cvsignore,
|
||||||
|
samples/base_mp/node1/Makefile.am, samples/base_mp/node1/base_mp.scn,
|
||||||
|
samples/base_mp/node2/.cvsignore, samples/base_mp/node2/Makefile.am,
|
||||||
|
samples/base_mp/node2/base_mp.scn: Removed.
|
||||||
|
|
||||||
2003-07-17 Joel Sherrill <joel@OARcorp.com>
|
2003-07-17 Joel Sherrill <joel@OARcorp.com>
|
||||||
|
|
||||||
PR 425/ada
|
PR 425/ada
|
||||||
|
|||||||
@@ -50,14 +50,6 @@ samples/hello/Makefile
|
|||||||
samples/ticker/Makefile
|
samples/ticker/Makefile
|
||||||
])
|
])
|
||||||
|
|
||||||
if test "$HAS_MP" = "yes"; then
|
|
||||||
AC_CONFIG_FILES([
|
|
||||||
samples/base_mp/Makefile
|
|
||||||
samples/base_mp/node1/Makefile
|
|
||||||
samples/base_mp/node2/Makefile
|
|
||||||
])
|
|
||||||
fi
|
|
||||||
|
|
||||||
AC_CONFIG_FILES([
|
AC_CONFIG_FILES([
|
||||||
sptests/Makefile
|
sptests/Makefile
|
||||||
sptests/sp01/Makefile
|
sptests/sp01/Makefile
|
||||||
|
|||||||
@@ -2,10 +2,5 @@
|
|||||||
|
|
||||||
SUBDIRS = hello ticker base_sp
|
SUBDIRS = hello ticker base_sp
|
||||||
|
|
||||||
if HAS_MP
|
|
||||||
SUBDIRS += base_mp
|
|
||||||
endif
|
|
||||||
|
|
||||||
|
|
||||||
include $(top_srcdir)/../../../automake/subdirs.am
|
include $(top_srcdir)/../../../automake/subdirs.am
|
||||||
include $(top_srcdir)/../../../automake/local.am
|
include $(top_srcdir)/../../../automake/local.am
|
||||||
|
|||||||
@@ -1,2 +0,0 @@
|
|||||||
Makefile.in
|
|
||||||
Makefile
|
|
||||||
@@ -1,25 +0,0 @@
|
|||||||
## $Id$
|
|
||||||
|
|
||||||
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
|
|
||||||
include $(top_srcdir)/../../../automake/compile.am
|
|
||||||
include $(top_srcdir)/../../../automake/subdirs.am
|
|
||||||
|
|
||||||
SUBDIRS = node1 node2
|
|
||||||
#include $(top_srcdir)/ada.am
|
|
||||||
|
|
||||||
#mptest$(EXEEXT): mptest.adb
|
|
||||||
# $(GNATCOMPILE) -margs -a $< -o $@
|
|
||||||
|
|
||||||
#if EXPADA
|
|
||||||
#noinst_PROGRAMS = mptest
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#mptest_SOURCES = mptest.adb mptest.ads
|
|
||||||
|
|
||||||
#EXTRA_DIST = node1/base_mp.scn
|
|
||||||
#EXTRA_DIST += node1/mptest-per_node_configuration.adb
|
|
||||||
|
|
||||||
#EXTRA_DIST += node2/base_mp.scn
|
|
||||||
#EXTRA_DIST += node2/mptest-per_node_configuration.adb
|
|
||||||
|
|
||||||
include $(top_srcdir)/../../../automake/local.am
|
|
||||||
@@ -1,38 +0,0 @@
|
|||||||
/* system.h
|
|
||||||
*
|
|
||||||
* This include file contains information that is included in every
|
|
||||||
* function in the test set.
|
|
||||||
*
|
|
||||||
* COPYRIGHT (c) 1989-1999.
|
|
||||||
* On-Line Applications Research Corporation (OAR).
|
|
||||||
*
|
|
||||||
* The license and distribution terms for this file may be
|
|
||||||
* found in the file LICENSE in this distribution or at
|
|
||||||
* http://www.OARcorp.com/rtems/license.html.
|
|
||||||
*
|
|
||||||
* $Id$
|
|
||||||
*/
|
|
||||||
|
|
||||||
/* configuration information */
|
|
||||||
|
|
||||||
#define CONFIGURE_MP_APPLICATION
|
|
||||||
|
|
||||||
#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
|
|
||||||
#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
|
|
||||||
|
|
||||||
#define CONFIGURE_MAXIMUM_TASKS 2
|
|
||||||
|
|
||||||
#define CONFIGURE_POSIX_INIT_THREAD_TABLE
|
|
||||||
|
|
||||||
#define CONFIGURE_MAXIMUM_POSIX_THREADS 10
|
|
||||||
#define CONFIGURE_MAXIMUM_POSIX_KEYS 10
|
|
||||||
#define CONFIGURE_MAXIMUM_POSIX_MUTEXES 20
|
|
||||||
#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES 10
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Put the overrides of default configuration parameters here.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <confdefs.h>
|
|
||||||
|
|
||||||
/* end of include file */
|
|
||||||
@@ -1,103 +0,0 @@
|
|||||||
--
|
|
||||||
-- MPTEST / BODY
|
|
||||||
--
|
|
||||||
-- DESCRIPTION:
|
|
||||||
--
|
|
||||||
-- This package is the implementation for Test 1 of the RTEMS
|
|
||||||
-- Multiprocessor Test Suite.
|
|
||||||
--
|
|
||||||
-- DEPENDENCIES:
|
|
||||||
--
|
|
||||||
--
|
|
||||||
--
|
|
||||||
-- COPYRIGHT (c) 1989-1997.
|
|
||||||
-- On-Line Applications Research Corporation (OAR).
|
|
||||||
-- Copyright assigned to U.S. Government, 1994.
|
|
||||||
--
|
|
||||||
-- The license and distribution terms for this file may in
|
|
||||||
-- the file LICENSE in this distribution or at
|
|
||||||
-- http://www.OARcorp.com/rtems/license.html.
|
|
||||||
--
|
|
||||||
-- $Id$
|
|
||||||
--
|
|
||||||
|
|
||||||
with INTERFACES; use INTERFACES;
|
|
||||||
with RTEMS;
|
|
||||||
with TEST_SUPPORT;
|
|
||||||
with TEXT_IO;
|
|
||||||
with UNSIGNED32_IO;
|
|
||||||
|
|
||||||
package body MPTEST is
|
|
||||||
|
|
||||||
--PAGE
|
|
||||||
--
|
|
||||||
-- INIT
|
|
||||||
--
|
|
||||||
|
|
||||||
procedure INIT (
|
|
||||||
ARGUMENT : in RTEMS.TASK_ARGUMENT
|
|
||||||
) is
|
|
||||||
STATUS : RTEMS.STATUS_CODES;
|
|
||||||
begin
|
|
||||||
|
|
||||||
TEXT_IO.NEW_LINE( 2 );
|
|
||||||
TEXT_IO.PUT( "*** SAMPLE MULTIPROCESSOR APPLICATION ***" );
|
|
||||||
TEXT_IO.PUT( "Creating and starting an application task" );
|
|
||||||
|
|
||||||
|
|
||||||
MPTEST.TASK_NAME( 1 ) := RTEMS.BUILD_NAME( 'T', 'A', '1', ' ' );
|
|
||||||
|
|
||||||
RTEMS.TASK_CREATE(
|
|
||||||
MPTEST.TASK_NAME( 1 ),
|
|
||||||
1,
|
|
||||||
2048,
|
|
||||||
RTEMS.INTERRUPT_LEVEL( 0 ),
|
|
||||||
RTEMS.DEFAULT_ATTRIBUTES,
|
|
||||||
MPTEST.TASK_ID( 1 ),
|
|
||||||
STATUS
|
|
||||||
);
|
|
||||||
TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA1" );
|
|
||||||
|
|
||||||
RTEMS.TASK_START(
|
|
||||||
MPTEST.TASK_ID( 1 ),
|
|
||||||
MPTEST.APPLICATION_TASK'ACCESS,
|
|
||||||
0,
|
|
||||||
STATUS
|
|
||||||
);
|
|
||||||
TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA1" );
|
|
||||||
|
|
||||||
RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
|
|
||||||
TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
|
|
||||||
|
|
||||||
end INIT;
|
|
||||||
|
|
||||||
--PAGE
|
|
||||||
--
|
|
||||||
-- APPLICATION_TASK
|
|
||||||
--
|
|
||||||
|
|
||||||
procedure APPLICATION_TASK (
|
|
||||||
ARGUMENT : in RTEMS.TASK_ARGUMENT
|
|
||||||
) is
|
|
||||||
TID : RTEMS.ID;
|
|
||||||
STATUS : RTEMS.STATUS_CODES;
|
|
||||||
begin
|
|
||||||
|
|
||||||
RTEMS.TASK_IDENT( RTEMS.SELF, RTEMS.SEARCH_ALL_NODES, TID, STATUS );
|
|
||||||
TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_IDENT OF SELF" );
|
|
||||||
|
|
||||||
TEXT_IO.PUT( "This task was invoked with node argument (" );
|
|
||||||
UNSIGNED32_IO.PUT( ARGUMENT );
|
|
||||||
TEXT_IO.PUT_LINE( ")" );
|
|
||||||
|
|
||||||
TEXT_IO.PUT( "This task has the id of 0x" );
|
|
||||||
UNSIGNED32_IO.PUT( TID, BASE => 16 );
|
|
||||||
TEXT_IO.NEW_LINE;
|
|
||||||
|
|
||||||
TEXT_IO.PUT_LINE( "*** END OF SAMPLE MULTIPROCESSOR APPLICATION ***" );
|
|
||||||
|
|
||||||
RTEMS.SHUTDOWN_EXECUTIVE( 0 );
|
|
||||||
|
|
||||||
end APPLICATION_TASK;
|
|
||||||
|
|
||||||
end MPTEST;
|
|
||||||
@@ -1,62 +0,0 @@
|
|||||||
--
|
|
||||||
-- MPTEST / SPECIFICATION
|
|
||||||
--
|
|
||||||
-- DESCRIPTION:
|
|
||||||
--
|
|
||||||
-- This package is the specification for Test 1 of the RTEMS
|
|
||||||
-- Multiprocessor Test Suite.
|
|
||||||
--
|
|
||||||
-- DEPENDENCIES:
|
|
||||||
--
|
|
||||||
--
|
|
||||||
--
|
|
||||||
-- COPYRIGHT (c) 1989-1997.
|
|
||||||
-- On-Line Applications Research Corporation (OAR).
|
|
||||||
-- Copyright assigned to U.S. Government, 1994.
|
|
||||||
--
|
|
||||||
-- The license and distribution terms for this file may in
|
|
||||||
-- the file LICENSE in this distribution or at
|
|
||||||
-- http://www.OARcorp.com/rtems/license.html.
|
|
||||||
--
|
|
||||||
-- $Id$
|
|
||||||
--
|
|
||||||
|
|
||||||
with RTEMS;
|
|
||||||
|
|
||||||
package MPTEST is
|
|
||||||
|
|
||||||
--
|
|
||||||
-- These arrays contain the IDs and NAMEs of all RTEMS tasks created
|
|
||||||
-- by this test.
|
|
||||||
--
|
|
||||||
|
|
||||||
TASK_ID : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.ID;
|
|
||||||
TASK_NAME : array ( RTEMS.UNSIGNED32 range 1 .. 3 ) of RTEMS.NAME;
|
|
||||||
|
|
||||||
--
|
|
||||||
-- INIT
|
|
||||||
--
|
|
||||||
-- DESCRIPTION:
|
|
||||||
--
|
|
||||||
-- This RTEMS task initializes the application.
|
|
||||||
--
|
|
||||||
|
|
||||||
procedure INIT (
|
|
||||||
ARGUMENT : in RTEMS.TASK_ARGUMENT
|
|
||||||
);
|
|
||||||
|
|
||||||
--
|
|
||||||
-- APPLICATION_TASK
|
|
||||||
--
|
|
||||||
-- DESCRIPTION:
|
|
||||||
--
|
|
||||||
-- This routine is as an example of an application task which
|
|
||||||
-- prints a message including its RTEMS task id. This task
|
|
||||||
-- then invokes exit to return to the monitor.
|
|
||||||
--
|
|
||||||
|
|
||||||
procedure APPLICATION_TASK (
|
|
||||||
ARGUMENT : in RTEMS.TASK_ARGUMENT
|
|
||||||
);
|
|
||||||
|
|
||||||
end MPTEST;
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
Makefile.in
|
|
||||||
Makefile
|
|
||||||
@@ -1,24 +0,0 @@
|
|||||||
## $Id$
|
|
||||||
|
|
||||||
NODE=1
|
|
||||||
|
|
||||||
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
|
|
||||||
include $(top_srcdir)/../../../automake/compile.am
|
|
||||||
|
|
||||||
include $(top_srcdir)/ada.am
|
|
||||||
|
|
||||||
AM_ADAFLAGS += -I$(srcdir)/..
|
|
||||||
|
|
||||||
node1$(EXEEXT): ../mptest.adb init.o
|
|
||||||
$(GNATCOMPILE) -margs -a $< -o $@
|
|
||||||
|
|
||||||
init.o: ../../../support/init.c
|
|
||||||
$(COMPILE.c) -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. -c $<
|
|
||||||
|
|
||||||
if EXPADA
|
|
||||||
noinst_PROGRAMS = node1
|
|
||||||
endif
|
|
||||||
|
|
||||||
EXTRA_DIST = base_mp.scn
|
|
||||||
|
|
||||||
include $(top_srcdir)/../../../automake/local.am
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
*** SAMPLE MULTIPROCESSOR APPLICATION ***
|
|
||||||
Creating and starting an application task
|
|
||||||
This task was invoked with the node argument (1)
|
|
||||||
This task has the id of 0x10002
|
|
||||||
*** END OF SAMPLE MULTIPROCESSOR APPLICATION ***
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
Makefile.in
|
|
||||||
Makefile
|
|
||||||
@@ -1,26 +0,0 @@
|
|||||||
## $Id$
|
|
||||||
|
|
||||||
NODE=2
|
|
||||||
|
|
||||||
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
|
|
||||||
include $(top_srcdir)/../../../automake/compile.am
|
|
||||||
|
|
||||||
include $(top_srcdir)/ada.am
|
|
||||||
|
|
||||||
AM_ADAFLAGS += -I$(srcdir)/..
|
|
||||||
|
|
||||||
node2$(EXEEXT): ../mptest.adb init.o
|
|
||||||
$(GNATCOMPILE) -margs -a $< -o $@
|
|
||||||
|
|
||||||
init.o: ../../../support/init.c
|
|
||||||
$(COMPILE.c) -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. -c $<
|
|
||||||
|
|
||||||
if EXPADA
|
|
||||||
noinst_PROGRAMS = node2
|
|
||||||
endif
|
|
||||||
|
|
||||||
node2_SOURCES = mptest-per_node_configuration.adb
|
|
||||||
|
|
||||||
EXTRA_DIST = base_mp.scn
|
|
||||||
|
|
||||||
include $(top_srcdir)/../../../automake/local.am
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
*** SAMPLE MULTIPROCESSOR APPLICATION ***
|
|
||||||
Creating and starting an application task
|
|
||||||
This task was invoked with the node argument (2)
|
|
||||||
This task has the id of 0x20002
|
|
||||||
*** END OF SAMPLE MULTIPROCESSOR APPLICATION ***
|
|
||||||
Reference in New Issue
Block a user