2010-12-17 Joel Sherrill <joel.sherrill@oarcorp.com>

	* ChangeLog, schedsim_priority/Makefile, schedsim_priority/README,
	schedsim_priority/config.c, schedsim_priority/printheir_executing.c,
	schedsim_priority/schedsim.cc,
	schedsim_priority/wrap_thread_dispatch.c: New files.

7 files changed, 279 insertions, 0 deletions

diff --git a/schedsim/ChangeLog b/schedsim/ChangeLog
new file mode 100644
index 0000000..7ca7848
--- /dev/null
+++ b/schedsim/ChangeLog
@@ -0,0 +1,7 @@
+2010-12-17	Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	* ChangeLog, schedsim_priority/Makefile, schedsim_priority/README,
+	schedsim_priority/config.c, schedsim_priority/printheir_executing.c,
+	schedsim_priority/schedsim.cc,
+	schedsim_priority/wrap_thread_dispatch.c: New files.
+
diff --git a/schedsim/schedsim_priority/Makefile b/schedsim/schedsim_priority/Makefile
new file mode 100644
index 0000000..b92e4ea
--- /dev/null
+++ b/schedsim/schedsim_priority/Makefile
@@ -0,0 +1,17 @@
+#
+#  $Id$
+#
+
+PREFIX=/home/jennifer/rtems-head-work/bsp-install/
+OBJS = config.o printheir_executing.o schedsim.o wrap_thread_dispatch.o
+CPPFLAGS = -I${PREFIX}/include/schedsim
+LDFLAGS = -L${PREFIX}/lib
+LDFLAGS += -Wl,--wrap=_Thread_Dispatch
+
+all:    schedsim
+
+schedsim: $(OBJS)
+	g++ -o schedsim $(OBJS) $(LDFLAGS) -lschedsim -lrtems
+
+clean:
+	rm -f *.o schedsim
diff --git a/schedsim/schedsim_priority/README b/schedsim/schedsim_priority/README
new file mode 100644
index 0000000..e0952ff
--- /dev/null
+++ b/schedsim/schedsim_priority/README
@@ -0,0 +1,6 @@
+#
+#  $Id$
+#
+
+This is an example of how to build a custom RTEMS Scheduler Simulator
+instance for evaluation of new scheduling algorithms.
diff --git a/schedsim/schedsim_priority/config.c b/schedsim/schedsim_priority/config.c
new file mode 100644
index 0000000..4023f74
--- /dev/null
+++ b/schedsim/schedsim_priority/config.c
@@ -0,0 +1,7 @@
+#include <rtems.h>
+
+#define CONFIGURE_INIT
+#define CONFIGURE_MAXIMUM_TASKS             1000
+#define CONFIGURE_MAXIMUM_SEMAPHORES        1000
+#include <rtems/confdefs.h>
+
diff --git a/schedsim/schedsim_priority/printheir_executing.c b/schedsim/schedsim_priority/printheir_executing.c
new file mode 100644
index 0000000..b0855d3
--- /dev/null
+++ b/schedsim/schedsim_priority/printheir_executing.c
@@ -0,0 +1,31 @@
+/*
+ *  printheir_executing
+ *
+ *  COPYRIGHT (c) 1989-2010.
+ *  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.rtems.com/license/LICENSE.
+ *
+ *  $Id$
+ */
+
+#include <stdio.h>
+#include <rtems.h>
+
+void PRINT_EXECUTING() {
+  printf(
+    "  Thread Executing: 0x%08x priority=%ld\n",
+    _Thread_Executing->Object.id,
+    (long) _Thread_Executing->current_priority
+  );
+}
+
+void PRINT_HEIR() {
+  printf( 
+    "  Thread Heir: 0x%08x priority=%ld\n", 
+    _Thread_Heir->Object.id, 
+    (long) _Thread_Heir->current_priority 
+  );
+}
diff --git a/schedsim/schedsim_priority/schedsim.cc b/schedsim/schedsim_priority/schedsim.cc
new file mode 100644
index 0000000..b70dd71
--- /dev/null
+++ b/schedsim/schedsim_priority/schedsim.cc
@@ -0,0 +1,169 @@
+/*
+ *  COPYRIGHT (c) 1989-2010.
+ *  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.rtems.com/license/LICENSE.
+ *
+ *  $Id$
+ */
+
+#include <newlib/getopt.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+
+#include "shell.h"
+#include "rtems_sched.h"
+
+/*
+ *  Variables to control global behavior
+ */
+int verbose = 0;
+const char *progname;
+const char *scriptname;
+
+FILE *Script;
+int ScriptFileLine = 0;
+
+/*
+ *  Print program usage message
+ */
+void usage()
+{
+  fprintf(
+    stderr,
+    "Usage: %s [-v] script\n"
+    "\n"
+    "  -v           - enable verbose output\n",
+    progname
+  );
+  exit( -1 );
+}
+
+#define RTEMS_SHELL_MAXIMUM_ARGUMENTS (128)
+
+void ProcessScript(
+  FILE *script
+)
+{
+  char               buffer[512];
+  char              *cStatus;
+  char              *c;
+  size_t             length;
+  int                argc;
+  char              *argv[RTEMS_SHELL_MAXIMUM_ARGUMENTS];
+  rtems_shell_cmd_t *shell_cmd;
+  
+ 
+  while ( 1 ) {
+    cStatus = fgets( buffer, sizeof(buffer), script );
+    if ( cStatus == NULL )
+      break;
+
+    // If the last line does not have a CR, then we don't want to
+    // arbitrarily clobber an = instead of a \n.
+    length = strlen(buffer);
+    if ( buffer[ length - 1] == '\n' )
+      buffer[ length - 1] = '\0';
+
+    if ( verbose )
+      fprintf( stderr, "%d: %s\n", ++ScriptFileLine, buffer );
+
+    if ( buffer[0] == '#' )
+      continue;
+
+    for ( c = buffer ; *c ; c++ ) {
+      if (!isblank((int)*c))
+        break;
+    }
+
+
+    if (!strcmp(c,"bye") || !strcmp(c,"exit")) {
+      return;
+    } 
+
+    if (rtems_shell_make_args(c, &argc, argv, RTEMS_SHELL_MAXIMUM_ARGUMENTS)) {
+      fprintf(stderr, "Error parsing arguments\n" );
+      continue;
+    }
+
+    shell_cmd = rtems_shell_lookup_cmd(argv[0]);
+    if ( !shell_cmd ) {
+      fprintf(stderr, "%s is unknown command\n", c );
+      continue;
+    }
+
+    shell_cmd->command(argc, argv);
+  }
+}
+
+int main(
+  int argc,
+  char **argv
+)
+{
+  int opt;
+  progname = argv[0];
+  
+  while ((opt = getopt(argc, argv, "v")) != -1) {
+    switch (opt) {
+      case 'v': verbose = 1;                break;
+      default: /* '?' */
+        usage();
+    }
+  }
+
+  if ( optind >= argc ) {
+    fprintf( stderr, "no script to process\n" );
+    usage();
+  }
+
+  scriptname = argv[ optind ];
+
+  if ( verbose ) {
+    fprintf(
+      stderr,
+      "Script File               : %s\n"
+      "verbose                   : %d\n",
+      scriptname,
+      verbose
+    );
+  }
+
+  //
+  //  Initialize the command interpreter
+  //
+  rtems_shell_initialize_command_set();
+
+  //
+  //  Open the script file
+  // 
+  Script = fopen( scriptname, "r" );
+  if ( !Script ) {
+    fprintf( stderr, "Unable to open script file (%s)\n", scriptname );
+    exit( -1 );
+  }
+
+  //
+  //  Process the Script
+  //
+  ProcessScript( Script );
+
+  //
+  //  Open the script file
+  // 
+  (void) fclose( Script );
+
+  //
+  //  Just in case something throws
+  //
+  try {
+  } catch (...) {
+    exit(-1);
+  }
+
+  return 0;
+}
diff --git a/schedsim/schedsim_priority/wrap_thread_dispatch.c b/schedsim/schedsim_priority/wrap_thread_dispatch.c
new file mode 100644
index 0000000..3432188
--- /dev/null
+++ b/schedsim/schedsim_priority/wrap_thread_dispatch.c
@@ -0,0 +1,42 @@
+/*
+ *  Thread Dispatch Wrapper Implmentation
+ *
+ *  COPYRIGHT (c) 1989-2010.
+ *  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.rtems.com/license/LICENSE.
+ *
+ *  $Id$
+ */
+
+#include "shell.h"
+#include <schedsim_shell.h>
+
+#include <stdio.h>
+#include <rtems.h>
+
+Thread_Control *last_heir = NULL;
+Thread_Control *last_executing = NULL;
+
+extern void __real__Thread_Dispatch(void);
+
+void check_heir_and_executing(void)
+{
+  if ( last_heir != _Thread_Heir ) 
+    PRINT_HEIR();
+
+  if ( last_executing != _Thread_Executing )
+    PRINT_EXECUTING();
+
+  last_heir = _Thread_Heir;
+  last_executing = _Thread_Executing;
+}
+
+void __wrap__Thread_Dispatch(void)
+{
+  check_heir_and_executing();
+    __real__Thread_Dispatch();
+  check_heir_and_executing();
+}