Merge branch 'master' into Trick-ify

2025-04-05 02:09:14 +00:00 · 2025-04-02 12:50:56 -05:00 · 2025-04-02 12:50:56 -05:00 · 4d8deb1ada
commit 4d8deb1ada
parent 82d9231dd3 ec4d6d1b7b
59 changed files with 19397 additions and 10223 deletions
--- a/.github/workflows/test_32_oracle.yml
+++ b/.github/workflows/test_32_oracle.yml
@ -28,7 +28,7 @@ jobs:
    - name: Install Udunits (32 bit)
      run: |
        cd /
-        curl --retry 4 -O https://artifacts.unidata.ucar.edu/repository/downloads-udunits/current/udunits-2.2.28.tar.gz
+        curl --retry 4 -O https://downloads.unidata.ucar.edu/udunits/2.2.28/udunits-2.2.28.tar.gz
        tar xfvz udunits-2.2.28.tar.gz
        rm -rf udunits-2.2.28.tar.gz
        cd udunits-2.2.28
--- a/autoconf/configure.ac
+++ b/autoconf/configure.ac
@ -209,7 +209,23 @@ AC_PATH_PROG(CLANG, clang, noclang, "$LLVM_BIN_DIR:/bin:/usr/bin:/usr/local/bin:
 AS_IF([test "$ac_cv_path_CLANG" = "noclang"],AC_MSG_ERROR([could not find clang]),[])
 AC_SUBST([LLVM_HOME])

-OLD_CLANG_LIBS="-lclangFrontend -lclangDriver -lclangSerialization -lclangParse -lclangSema -lclangAnalysis -lclangEdit -lclangAST -lclangLex -lclangBasic"
+TR_CLANG_VERSION
+dnl if llvm/clang, test for version >= 3.4.2
+AS_IF([test "x$CLANG_VERSION" = "x"],[],
+ [AC_MSG_CHECKING([clang version >= 3.4.2])
+  AX_COMPARE_VERSION([$CLANG_VERSION],[ge],[3.4.2], [AC_MSG_RESULT([yes])],
+   [AC_MSG_RESULT([no])
+    AC_MSG_ERROR([Trick requires llvm/clang version >= 3.4.2])
+   ])
+])
+
+AS_IF([test "x$CLANG_VERSION" = "x"],[],
+  [AX_COMPARE_VERSION([$CLANG_VERSION],[ge],[18.0.0], 
+   [OLD_CLANG_LIBS="-lclangFrontend -lclangDriver -lclangSerialization -lclangParse -lclangSema -lclangAnalysis -lclangEdit -lclangAST -lclangASTMatchers -lclangAPINotes -lclangLex -lclangBasic"],
+   [OLD_CLANG_LIBS="-lclangFrontend -lclangDriver -lclangSerialization -lclangParse -lclangSema -lclangAnalysis -lclangEdit -lclangAST -lclangLex -lclangBasic"]
+   )]
+)
+
 NEW_CLANG_LIBS="-lclang-cpp"
 AC_CHECK_FILE([$LLVM_LIB_DIR/libclangFrontend.a],
  [
@ -237,16 +253,6 @@ AC_CHECK_FILE([$LLVM_LIB_DIR/libclangSupport.a],[ICG_CLANGLIBS="$ICG_CLANGLIBS -

 AC_SUBST([ICG_CLANGLIBS])

-TR_CLANG_VERSION
-dnl if llvm/clang, test for version >= 3.4.2
-AS_IF([test "x$CLANG_VERSION" = "x"],[],
- [AC_MSG_CHECKING([clang version >= 3.4.2])
-  AX_COMPARE_VERSION([$CLANG_VERSION],[ge],[3.4.2], [AC_MSG_RESULT([yes])],
-   [AC_MSG_RESULT([no])
-    AC_MSG_ERROR([Trick requires llvm/clang version >= 3.4.2])
-   ])
-])
-
 AX_CHECK_ZLIB([],AC_MSG_ERROR([could not find zlib]))

 dnl look for udunits in /usr/include and /usr/include/udunits2
--- a/bin/trick-jperf
+++ b/bin/trick-jperf
@ -0,0 +1,8 @@
+#!/usr/bin/perl
+
+use FindBin qw($RealBin);
+use lib ("$RealBin/../libexec/trick/pm", "$RealBin/../lib/trick/pm") ;
+use launch_java ;
+
+launch_java("JPERF", "JPerf") ;
+
--- a/178
+++ b/178
@ -630,8 +630,8 @@ UDUNITS_EXCLUDE
 UDUNITS_LDFLAGS
 UDUNITS_INCLUDES
 UDUNITS_HOME
-CLANG_VERSION
 ICG_CLANGLIBS
+CLANG_VERSION
 LLVM_HOME
 CLANG
 LLVM_CONFIG
@ -717,6 +717,7 @@ infodir
 docdir
 oldincludedir
 includedir
+runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@ -810,6 +811,7 @@ datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@ -1062,6 +1064,15 @@ do
  | -silent | --silent | --silen | --sile | --sil)
    silent=yes ;;

+  -runstatedir | --runstatedir | --runstatedi | --runstated \
+  | --runstate | --runstat | --runsta | --runst | --runs \
+  | --run | --ru | --r)
+    ac_prev=runstatedir ;;
+  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+  | --run=* | --ru=* | --r=*)
+    runstatedir=$ac_optarg ;;
+
  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
    ac_prev=sbindir ;;
  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@ -1199,7 +1210,7 @@ fi
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
+		libdir localedir mandir runstatedir
 do
  eval ac_val=\$$ac_var
  # Remove trailing slashes.
@ -1352,6 +1363,7 @@ Fine tuning of the installation directories:
  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
  --libdir=DIR            object code libraries [EPREFIX/lib]
  --includedir=DIR        C header files [PREFIX/include]
  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
@ -7337,7 +7349,108 @@ if test "$ac_cv_path_CLANG" = "noclang"; then :
 fi


-OLD_CLANG_LIBS="-lclangFrontend -lclangDriver -lclangSerialization -lclangParse -lclangSema -lclangAnalysis -lclangEdit -lclangAST -lclangLex -lclangBasic"
+
+  CLANG_VERSION=""
+  ax_cv_clang_version="`$CLANG --version | grep "version" | sed "s/.*version \(0-9*\.0-9*\.0-9*\).*/\1/"`"
+  if test "x$ax_cv_clang_version" = "x"; then :
+
+    ax_cv_clang_version=""
+
+fi
+  CLANG_VERSION=$ax_cv_clang_version
+
+
+if test "x$CLANG_VERSION" = "x"; then :
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking clang version >= 3.4.2" >&5
+$as_echo_n "checking clang version >= 3.4.2... " >&6; }
+
+
+
+  # Used to indicate true or false condition
+  ax_compare_version=false
+
+  # Convert the two version strings to be compared into a format that
+  # allows a simple string comparison.  The end result is that a version
+  # string of the form 1.12.5-r617 will be converted to the form
+  # 0001001200050617.  In other words, each number is zero padded to four
+  # digits, and non digits are removed.
+
+  ax_compare_version_A=`echo "$CLANG_VERSION" | sed -e 's/\([0-9]*\)/Z\1Z/g' \
+                     -e 's/Z\([0-9]\)Z/Z0\1Z/g' \
+                     -e 's/Z\([0-9][0-9]\)Z/Z0\1Z/g' \
+                     -e 's/Z\([0-9][0-9][0-9]\)Z/Z0\1Z/g' \
+                     -e 's/[^0-9]//g'`
+
+
+  ax_compare_version_B=`echo "3.4.2" | sed -e 's/\([0-9]*\)/Z\1Z/g' \
+                     -e 's/Z\([0-9]\)Z/Z0\1Z/g' \
+                     -e 's/Z\([0-9][0-9]\)Z/Z0\1Z/g' \
+                     -e 's/Z\([0-9][0-9][0-9]\)Z/Z0\1Z/g' \
+                     -e 's/[^0-9]//g'`
+
+
+    ax_compare_version=`echo "x$ax_compare_version_A
+x$ax_compare_version_B" | sed 's/^ *//' | sort -r | sed "s/x${ax_compare_version_A}/true/;s/x${ax_compare_version_B}/false/;1q"`
+
+
+
+    if test "$ax_compare_version" = "true" ; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+    else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    as_fn_error $? "Trick requires llvm/clang version >= 3.4.2" "$LINENO" 5
+
+  fi
+
+
+fi
+
+if test "x$CLANG_VERSION" = "x"; then :
+
+else
+
+
+
+  # Used to indicate true or false condition
+  ax_compare_version=false
+
+  # Convert the two version strings to be compared into a format that
+  # allows a simple string comparison.  The end result is that a version
+  # string of the form 1.12.5-r617 will be converted to the form
+  # 0001001200050617.  In other words, each number is zero padded to four
+  # digits, and non digits are removed.
+
+  ax_compare_version_A=`echo "$CLANG_VERSION" | sed -e 's/\([0-9]*\)/Z\1Z/g' \
+                     -e 's/Z\([0-9]\)Z/Z0\1Z/g' \
+                     -e 's/Z\([0-9][0-9]\)Z/Z0\1Z/g' \
+                     -e 's/Z\([0-9][0-9][0-9]\)Z/Z0\1Z/g' \
+                     -e 's/[^0-9]//g'`
+
+
+  ax_compare_version_B=`echo "18.0.0" | sed -e 's/\([0-9]*\)/Z\1Z/g' \
+                     -e 's/Z\([0-9]\)Z/Z0\1Z/g' \
+                     -e 's/Z\([0-9][0-9]\)Z/Z0\1Z/g' \
+                     -e 's/Z\([0-9][0-9][0-9]\)Z/Z0\1Z/g' \
+                     -e 's/[^0-9]//g'`
+
+
+    ax_compare_version=`echo "x$ax_compare_version_A
+x$ax_compare_version_B" | sed 's/^ *//' | sort -r | sed "s/x${ax_compare_version_A}/true/;s/x${ax_compare_version_B}/false/;1q"`
+
+
+
+    if test "$ax_compare_version" = "true" ; then
+    OLD_CLANG_LIBS="-lclangFrontend -lclangDriver -lclangSerialization -lclangParse -lclangSema -lclangAnalysis -lclangEdit -lclangAST -lclangASTMatchers -lclangAPINotes -lclangLex -lclangBasic"
+    else OLD_CLANG_LIBS="-lclangFrontend -lclangDriver -lclangSerialization -lclangParse -lclangSema -lclangAnalysis -lclangEdit -lclangAST -lclangLex -lclangBasic"
+
+  fi
+
+
+fi
+
 NEW_CLANG_LIBS="-lclang-cpp"
 as_ac_File=`$as_echo "ac_cv_file_$LLVM_LIB_DIR/libclangFrontend.a" | $as_tr_sh`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LLVM_LIB_DIR/libclangFrontend.a" >&5
@ -7465,65 +7578,6 @@ fi



-
-  CLANG_VERSION=""
-  ax_cv_clang_version="`$CLANG --version | grep "version" | sed "s/.*version \(0-9*\.0-9*\.0-9*\).*/\1/"`"
-  if test "x$ax_cv_clang_version" = "x"; then :
-
-    ax_cv_clang_version=""
-
-fi
-  CLANG_VERSION=$ax_cv_clang_version
-
-
-if test "x$CLANG_VERSION" = "x"; then :
-
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking clang version >= 3.4.2" >&5
-$as_echo_n "checking clang version >= 3.4.2... " >&6; }
-
-
-
-  # Used to indicate true or false condition
-  ax_compare_version=false
-
-  # Convert the two version strings to be compared into a format that
-  # allows a simple string comparison.  The end result is that a version
-  # string of the form 1.12.5-r617 will be converted to the form
-  # 0001001200050617.  In other words, each number is zero padded to four
-  # digits, and non digits are removed.
-
-  ax_compare_version_A=`echo "$CLANG_VERSION" | sed -e 's/\([0-9]*\)/Z\1Z/g' \
-                     -e 's/Z\([0-9]\)Z/Z0\1Z/g' \
-                     -e 's/Z\([0-9][0-9]\)Z/Z0\1Z/g' \
-                     -e 's/Z\([0-9][0-9][0-9]\)Z/Z0\1Z/g' \
-                     -e 's/[^0-9]//g'`
-
-
-  ax_compare_version_B=`echo "3.4.2" | sed -e 's/\([0-9]*\)/Z\1Z/g' \
-                     -e 's/Z\([0-9]\)Z/Z0\1Z/g' \
-                     -e 's/Z\([0-9][0-9]\)Z/Z0\1Z/g' \
-                     -e 's/Z\([0-9][0-9][0-9]\)Z/Z0\1Z/g' \
-                     -e 's/[^0-9]//g'`
-
-
-    ax_compare_version=`echo "x$ax_compare_version_A
-x$ax_compare_version_B" | sed 's/^ *//' | sort -r | sed "s/x${ax_compare_version_A}/true/;s/x${ax_compare_version_B}/false/;1q"`
-
-
-
-    if test "$ax_compare_version" = "true" ; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-    else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-    as_fn_error $? "Trick requires llvm/clang version >= 3.4.2" "$LINENO" 5
-
-  fi
-
-
-fi
-
 #
 # Handle user hints
 #
--- a/docs/documentation/simulation_capabilities/Frame-Logging.md
+++ b/docs/documentation/simulation_capabilities/Frame-Logging.md
@ -1,7 +1,7 @@
 | [Home](/trick) → [Documentation Home](../Documentation-Home) → [Simulation Capabilities](Simulation-Capabilities) → Frame Logging |
 |------------------------------------------------------------------|

-Trick provides a means to gather simulation performance data and view it using Data Products (see [Data Products](Data-Products)).
+Trick provides a means to gather simulation performance data and view it using Data Products (see [Data Products](../data_products/Data-Products)).
 When the user turns on the Frame Logging feature, Trick will use its Data Recording mechanism to track the following:
 - execution time of each Trick and User job, view in Data Products using DP_rt_trickjobs.xml and DP_rt_userjobs.xml
 - a timeline showing when each job runs during each job frame, view in Data Products using DP_rt_timeline_init.xml and DP_rt_timeline.xml
--- a/docs/howto_guides/How-To-Guides.md
+++ b/docs/howto_guides/How-To-Guides.md
@ -12,3 +12,4 @@
 01. [How to Setup a Virtual Python Environment](How-To-Python-Virtual-Environment)
 01. [Checkpointing Best Practices](Checkpointing-Best-Practices)
 01. [Realtime Best Practices](Realtime-Best-Practices)
+01. [How to Use trick-jperf to visualize a sim's job execution timeline](How-to-Use-trick-jperf)
--- a/docs/howto_guides/How-to-Use-trick-jperf.md
+++ b/docs/howto_guides/How-to-Use-trick-jperf.md
@ -0,0 +1,204 @@
+# trick-jperf
+
+**Contents**
+
+* [Purpose](#purpose)<br>
+* [Introduction](#introduction)<br>
+* [Prerequisite Knowledge](#prerequisite-knowledge)<br>
+* [Recording Simulation Timeline Data](#recording-simulation-timeline-data)<br>
+* [Running trick-jperf](#running-jperf)<br>
+* [The trick-jperf GUI](#jperf-gui)<br>
+
+---
+
+<a id=purpose></a>
+## Purpose
+The purpose of this document is explain how to use **trick-jperf**.
+
+<a id=introduction></a>
+## Introduction
+
+**trick-jperf** is a post-analysis tool that helps one to visualize and analyze the job execution time-line data of a real-time Trick simulation. 
+
+Run interactively, trick-jperf graphically displays the job execution timeline of a realtime Trick simulation. The timeline is displayed as numbered job-frames, each containing (color-coded) jobs within those frames. One can display job statistics for the entire timeline or query the details of individually selected jobs or frames.
+
+trick-jperf can also be run non-interactively from the command line to generate job-statistics reports.
+
+---
+
+<a id=prerequisite-knowledge></a>
+## Prerequisite Knowledge
+One should:
+
+* Complete the [Trick Tutorial](https://nasa.github.io/trick/tutorial/Tutorial), and
+* Read [Trick Realtime Best Practices](https://nasa.github.io/trick/howto_guides/Realtime-Best-Practices).
+
+---
+
+<a id=recording-simulation-timeline-data></a>
+## Recording Simulation Timeline Data
+**trick-jperf** requires timeline data from the simulation in question.
+
+To collect this data, your simulation needs to run in real-time, with frame logging turn on. So, in your Trick sim's input file:
+
+1. Enable realtime: ```trick.real_time_enable()```
+
+2. Enable frame-logging: ```trick.frame_log_on()```
+
+3. We also recommend that you disable itimers: ```trick.itimer_disable()```, or that you simply don't enable them. They are disabled by default. If they enabled when the timeline is collected, your frame boundaries will be ... sloppy.
+
+--
+
+<a id=the-timeline-data-file></a>
+### The Timeline Data File
+
+When you run your sim in real-time with frame logging enabled, a CSV file named ```log_newtimeline.csv``` will be generated in your sims ```RUN_``` directory. This file contains the timeline data for your sim's main thread.
+
+#### Example:
+```
+jobID,startTime,stopTime
+12.03, 0.000000, 0.000003
+12.04, 0.000004, 0.000005
+17.01, 0.000005, 0.000006
+...
+```
+
+Each record in the time-line file consists of JobID, start-time, and stop-time.
+The jobID is the same as the jobID's in the ```S_job_execution``` file. The start and stop times are ```real-time```, that is your simulation computer's system time.
+
+If your simulation has child threads, time-line files will be generated for each of those as well. The first child thread's time-line data file will be named ```log_newtimelineC1.csv```, the second child thread ```log_newtimelineC2.csv``` nad so forth.
+
+--
+
+<a id=s_job_execution></a>
+### ```The S_job_execution``` File
+
+An ```The S_job_execution```, which is generated when your sim is run is also required by trick-jperf. It details the specifications of jobs running in your sim such as class, phase, ID, and name. This file is also required by trick-jperf.
+
+---
+
+<a id=running-jperf></a>
+## Running trick-jperf
+
+**trick-jperf** can run interactively with a GUI (the default) or non-interactively (batch). One might run in batch to automate generation of statistics reports, perhaps for continuuous integration.
+
+### Command-Line Options
+The following are the options for trick-jperf as displayed when one types ```trick-jperf --help```.
+
+```
+usage: trick-jperf [options] <file-name>
+
+options: 
+-h, --help
+    Print this help text and exit.
+-x, --nogui
+    Don't run as a GUI application. Command line only.
+-p, --report
+    Write sorted job statics report to the terminal.
+-s0, --sort=id
+    Sort job statistics by identifier.
+-s1, --sort=mean   [default]
+    Sort job statistics by mean duration.
+-s2, --sort=stddev
+    Sort job statistics by standard deviation of duration.
+-s3, --sort=min
+    Sort job statistics by minimum duration.
+-s4, --sort=max
+    Sort job statistics by maximum duration.
+```
+
+#### Examples
+
+Report job statistics to the terminal, sorting the output by mean (default) run time.
+```% trick-jperf -x RUN_test/log_newtimeline.csv```
+
+Report job statistics to the terminal, sorting the output by Job ID.
+```% trick-jperf -x -s0 RUN_test/log_newtimeline.csv```
+
+
+The default mode of JPerf is GUI / interactive mode.
+
+```% trick-jperf RUN_test/log_newtimeline.csv```
+
+---
+
+<a id=jperf-gui></a>
+## The trick-jperf GUI
+
+```% trick-jperf RUN_test/log_newtimeline.csv```
+
+![Realtime Under Run](images/jperf/trick-jperf.png)
+
+In its main window **trick-jperf** graphically displays realtime software frames. The frame boundaries, that is **Top of Frame** and **End of Frame**, are where simulation time is synchronized to realtime. The jobs that run within frames are each represented as uniquely colored rectangles. The color assigned to each job is [customizable](#job-colors).
+
+<a id=XXX></a>
+### Frames Boundaries
+Within the job-execution timeline, **trick-jperf** deduces the frame boundaries to be:
+
+1. A non-top-of-frame job followed by a top-of-frame job, or
+2. An end-of-frame job followed by a non-end-of-frame job.
+
+&#9888; Take note these, as they can be useful in diagnosing certain kinds of bugs.
+
+The average period between frame boundaries serves as an estimate of the simulation's intended **Frame Size**. This is initially displayed in the upper toolbar. It is used to scale the frames for rendering. If your sim is well behaved, this estimate will be accurate. If your sim has over-runs, the estimate will likely be off. In this case you can change it by entering your simulations's actual realtime software frame in the **Frame Size** text field.
+ 
+The total number of frames in the timeline is displayed in the middle of the upper toolbar. From these, the **Selected Range** specifies the subset of frames to be rendered. Rendering a large number of frames at the one time can slow the responsiveness of the GUI.
+
+The &#9660; and &#9650; buttons move the selected range forward and backward by 50.
+
+<a id=XXX></a>
+### Selecting Frames & Jobs
+
+Left clicking on a job displays information about that job in the lower toolbar. In the following picture, we left clicked on a green box in frame 20. Looking at the lower toolbar we see that this "green job" represents the Job whose ID is 16.01, name is ```crewModule.dyn.calc_derivatives```, and job class is ```derivatiave```. 
+
+![Realtime Under Run](images/jperf/SelectedFrame20.png)
+
+On the left side of the display, the frame number is also selected. This is indicated by the red arrow pointing to red the frame number.
+
+<a id=XXX></a>
+### Frame Details
+
+To get the details of the selected frame, we left-click the **Frame Details** button in the upper toolbar. This opens a window (shown below) with the details of frame 20. That is, it displays which and when each of the jobs within that frame were executed.
+
+![Realtime Under Run](images/jperf/FrameDetails.png)
+
+Frame Details can also be displayed using the **View** menu.
+
+![Realtime Under Run](images/jperf/ViewMenu.png)
+
+<a id=job-statistics></a>
+### Job Statistics
+
+From the **View** menu, we can also display run-time statistics for simulation jobs. 
+
+![Realtime Under Run](images/jperf/JobStats.png)
+
+In the toolbar, at the top of the window, are buttons to sort the table by different statistics. 
+
+---
+
+<a id=job-colors></a>
+### Job Colors & How They Can Be Customized
+
+Every Job is represented by a unique Color. Internally these associations are are stored as a Map of ```<JobID, Color>``` pairs, called the KeyedColorMap. Externally they are stored in a text file named ```IdToColors.txt```. Each row contains a job ID followed by RGB values.
+
+```
+9.03,149,247,37
+17.01,24,96,254
+19.02,247,74,230
+17.02,138,109,140
+17.03,219,82,20
+20.99,171,55,105
+18.99,228,154,65
+...
+```
+
+When Jperf is run, it looks for a ```IdToColors.txt``` file in the same directory as the timeline file. If it exists, then it's read into the KeyedColorMap.
+
+Jperf then checks the that every job ID in the timeline file has an associated color in the KeyedColorMap. If it doesn't, then a unique color is generated. The ```<JobID, Color>``` pair are then added to the KeyedColorMap.
+When timeline processing is complete, the contents of the KeyedColorMap are written to the ```IdToColors.txt``` file.
+
+Since the ```IdToColors.txt``` file is just a text file, it can be customized to use the colors you prefer.
+
+--------------------------------------
+
--- a/docs/howto_guides/Realtime-Best-Practices.md
+++ b/docs/howto_guides/Realtime-Best-Practices.md
@ -217,7 +217,7 @@ When you build your Trick sim, the following data-product files are created for

 ### Other Useful Files Generated by a Trick Sim Run

-| Name | Desscription|
+| Name | Description|
 |:-----|:------------|
 |```RUN_*/S_job_execution```| Lists the simulation jobs by Name, Job ID, Trick Thread ID (PID) Job class, Phase, Start time, Stop time, Cycle, and whether the job is enabled.|
 |```RUN_*/S_run_summary ```|(Should be called build_summary) - Documents the name and path of the executable and the input file, the build time of the simulation executable, and the Trick version. It also contains the list of environment variables used when the simulation was built and the model versions.|
@ -387,7 +387,35 @@ Doing this has several benefits.

 1. The sim will initialize faster because ```default_data``` jobs are compiled rather that interpreted.

-2. If you can test and confirm that your base, default, "empty input file" sim is initialized to a valid state, then it will be easier to identify errors when the sim is customized for different scenarios, via an input file. It saves time and reduces pain.
+2. If you can test and confirm that your base, default, "empty input file" sim is initialized to a valid state, then it will be easier to identify errors when the sim is customized for different scenarios, via an input file. It saves time and reduces pain.
+
+
+#### 1.8 Realtime Software Frame should be based on the realtime requirements of external interfaces.
+
+A Trick simulation should not synchronize simulation-time to realtime more frequently than is required by external interfaces. The [realtime software frame](#realtime-software-frame) should be chosen to service a simulation's highest frequency external interface.
+
+**Example:**
+
+Consider a Trick simulation consisting of :
+
+* A 200 Hz  integration loop.
+* A 100 Hz scheduled job.
+* A 50 Hz scheduled job that services a graphics client that is required to update at 50 Hz.
+* A 25 Hz scheduled job that services a 25 Hz hardware avionics device.
+
+
+The external interfaces are the avionics device and the graphics client. These have **realtime** requirements. The 100 and 200 Hz simulation jobs do not. 
+
+The highest frequency of these external interfaces is 50 Hz. So, the software frame should be set to 0.02 seconds (ie., 50 Hz).
+
+**“What about the 200 Hz and 100 Hz jobs?”**
+
+Since they are not required to service external interfaces, these jobs can run as fast as possible in realtime. Simulation time and realtime are not the same thing, until simulation-time is (slowed down, and) synchronized to realtime. Remember that the [realtime software frame](#realtime-software-frame) specifies how often to synchronize simulation-time to realtime.
+
+**“What if I  set the realtime software frame to 0.005 seconds (i.e., 200 Hz) anyway? Is that a problem?"**
+
+Yes, it could be. The issue is that this wastes computing resources, and unnecessarily increases the probability of realtime over-runs. This is especially true if there is variability in the execution times of these jobs.
+

 ---
 ### 2. User Simulation Software
--- a/docs/howto_guides/images/jperf/FrameDetails.png
+++ b/docs/howto_guides/images/jperf/FrameDetails.png
--- a/docs/howto_guides/images/jperf/JobStats.png
+++ b/docs/howto_guides/images/jperf/JobStats.png
--- a/docs/howto_guides/images/jperf/SelectedFrame20.png
+++ b/docs/howto_guides/images/jperf/SelectedFrame20.png
--- a/docs/howto_guides/images/jperf/ViewMenu.png
+++ b/docs/howto_guides/images/jperf/ViewMenu.png
--- a/docs/howto_guides/images/jperf/trick-jperf.png
+++ b/docs/howto_guides/images/jperf/trick-jperf.png
--- a/include/trick/DRHDF5.hh
+++ b/include/trick/DRHDF5.hh
@ -37,16 +37,6 @@ PROGRAMMERS:

 namespace Trick {

-#ifdef HDF5
-#ifndef TRICK_ICG
-    struct HDF5_INFO {
-        hid_t dataset;
-        Trick::DataRecordBuffer * drb ;
-    };
-#endif
-#endif
-
-
    /**
      The DRHDF5 recording format is an industry conforming HDF5 formatted file.  Files written in this format are named
      log_<group_name>.h5.  The contents of this file type are readable by the Trick Data Products packages from
@ -56,6 +46,9 @@ namespace Trick {
      @verbatim
 GROUP "/" {
    GROUP "header" {
+        DATASET "byte_order" {
+            "little_endian"
+        }
        DATASET "file_names" {
            "param_1_file_name", "param_2_file_name", etc...
        }
@ -133,10 +126,29 @@ GROUP "/" {
        protected:

 #ifdef HDF5
-            std::vector<HDF5_INFO *> parameters;  // trick_io(**)
-
+            /**
+             The HDF5 file handle.
+             */
            hid_t file;  // trick_io(**)
+            /**
+             Root group and header group in the HDF5 file.
+             */
            hid_t root_group, header_group;  // trick_io(**)
+            
+            /** 
+             Parameter names array to be used in the HDF5 packet table.
+             Each array item  is a string of the parameter name that is
+             the copy of the reference name.
+             This is needed so when the dataset is closed, the reference
+             name in rec_buffer is still valid and won't cause double 
+             deleting when variables are removed from rec_buffer.
+             */ 
+            char** param_names;  // trick_io(**)
+         
+            /**
+             The dataset ids for each parameter.
+             */
+            hid_t* param_dataset_ids; // trick_io(**)
 #endif

    } ;
--- a/include/trick/FrameLog.hh
+++ b/include/trick/FrameLog.hh
@ -20,6 +20,8 @@ namespace Trick {
    /** Data to save for each timeline sample.\n */
    struct timeline_t {
        bool trick_job;
+        bool isEndOfFrame;
+        bool isTopOfFrame;
        double id;
        long long start;
        long long stop;
--- a/include/trick/JobData.hh
+++ b/include/trick/JobData.hh
@ -47,6 +47,12 @@ namespace Trick {
            /** Indicates if a scheduler is handling this job */
            bool handled;                   /**< trick_units(--) */

+            /** Indicates whether this is an "top_of_frame" job. */
+            bool isTopOfFrame;              /**< trick_units(--) */
+
+            /** Indicates whether this is an "end_of_frame" job. */
+            bool isEndOfFrame;              /**< trick_units(--) */
+
            /** The cycle time */
            double cycle;                   /**< trick_units(s) */

--- a/libexec/trick/pm/parse_s_define.pm
+++ b/libexec/trick/pm/parse_s_define.pm
@ -716,8 +716,8 @@ sub handle_sim_class_job($$$) {
      $ov_class , $ov_class_self , $sup_class_data, $tag, $job_call, $job_ret, $job_name, $args) = $in_job =~ /
         (?:
           \s*(?:
-             ([Cc][\w\.\-\>]+) |                       # child spec
-             ([Pp][\w\.\-\>]+) |                       # phase spec
+             ([Cc][\w\.\-\>]+)?\s*                       # child spec
+             ([Pp][\w\.\-\>]+)?\s*                       # phase spec
             (?:
              \(
                (?:
--- a/share/trick/makefiles/config_Linux.mk
+++ b/share/trick/makefiles/config_Linux.mk
@ -61,5 +61,9 @@ ifeq "" "c++11"
 TRICK_ADDITIONAL_CXXFLAGS += -std=c++11 -D_HAVE_STL_RANDOM
 endif

-TRICK_ADDITIONAL_TEST_FLAGS += -std=c++11
+ifeq "" "c++14"
+TRICK_ADDITIONAL_CXXFLAGS += -std=c++14 -D_HAVE_STL_RANDOM
+endif
+
+TRICK_ADDITIONAL_TEST_FLAGS += -std=c++14

--- a/test/SIM_mc_generation/S_overrides.mk
+++ b/test/SIM_mc_generation/S_overrides.mk
@ -1,8 +1,9 @@
 TRICK_CFLAGS += -g -Wall -Wextra
-TRICK_CXXFLAGS += -g -std=c++11 -Wall -Wextra
+TRICK_CXXFLAGS += -g -std=c++11 -Wall -Wextra -Wno-error=unused-parameter
 # We can't yet make warnings to be errors on MacOS, because
 # MACOS deprecates and warns about sprintf. But SWIG
 # still generates code containing sprintf..
 ifneq ($(TRICK_HOST_TYPE), Darwin)
 TRICK_CXXFLAGS += -Werror -Wno-stringop-truncation
 endif
+
--- a/test/SIM_stls/S_overrides.mk
+++ b/test/SIM_stls/S_overrides.mk
@ -1,8 +1,8 @@

-TRICK_CFLAGS += -I./models
+TRICK_CFLAGS += -I./models -DTRICK_UNIT_TEST
 TRICK_CXXFLAGS += -I./models

-TRICK_CXXFLAGS += -std=c++11
+TRICK_CXXFLAGS += -std=c++11 -DTRICK_UNIT_TEST

 clean: checkpoint_clean

--- a/test/SIM_stls/models/STLCheckpoint.cpp
+++ b/test/SIM_stls/models/STLCheckpoint.cpp
@ -759,5 +759,6 @@ int STLCheckpoint::test() {
        TRICK_EXPECT_EQ(vec_user_simple[i].d->c, "Here is a test string", test_suite, "vec_user_simple");
    }

+    return 0;
    
 }
--- a/test/SIM_test_dr/Modified_data/dr_bitfHDF5.dr
+++ b/test/SIM_test_dr/Modified_data/dr_bitfHDF5.dr
@ -0,0 +1,43 @@
+global DR_GROUP_ID
+global drg
+try:
+    if DR_GROUP_ID >= 0:
+        DR_GROUP_ID += 1
+except NameError:
+    DR_GROUP_ID = 0
+    drg = []
+
+drg.append(trick.DRHDF5("DR_bitfieldsHDF5"))
+drg[DR_GROUP_ID].set_freq(trick.DR_Always)
+drg[DR_GROUP_ID].set_cycle(0.1)
+drg[DR_GROUP_ID].set_single_prec_only(False)
+drg[DR_GROUP_ID].add_variable("drx.drt.charB.var1")
+drg[DR_GROUP_ID].add_variable("drx.drt.charB.var2")
+drg[DR_GROUP_ID].add_variable("drx.drt.charB.var3")
+drg[DR_GROUP_ID].add_variable("drx.drt.charB.var4")
+drg[DR_GROUP_ID].add_variable("drx.drt.intB.var1")
+drg[DR_GROUP_ID].add_variable("drx.drt.intB.var2")
+drg[DR_GROUP_ID].add_variable("drx.drt.intB.var3")
+drg[DR_GROUP_ID].add_variable("drx.drt.intB.var4")
+drg[DR_GROUP_ID].add_variable("drx.drt.shortB.var1")
+drg[DR_GROUP_ID].add_variable("drx.drt.shortB.var2")
+drg[DR_GROUP_ID].add_variable("drx.drt.shortB.var3")
+drg[DR_GROUP_ID].add_variable("drx.drt.shortB.var4")
+drg[DR_GROUP_ID].add_variable("drx.drt.ucharB.var1")
+drg[DR_GROUP_ID].add_variable("drx.drt.ucharB.var2")
+drg[DR_GROUP_ID].add_variable("drx.drt.ucharB.var3")
+drg[DR_GROUP_ID].add_variable("drx.drt.ucharB.var4")
+drg[DR_GROUP_ID].add_variable("drx.drt.uintB.var1")
+drg[DR_GROUP_ID].add_variable("drx.drt.uintB.var2")
+drg[DR_GROUP_ID].add_variable("drx.drt.uintB.var3")
+drg[DR_GROUP_ID].add_variable("drx.drt.uintB.var4")
+drg[DR_GROUP_ID].add_variable("drx.drt.ushortB.var1")
+drg[DR_GROUP_ID].add_variable("drx.drt.ushortB.var2")
+drg[DR_GROUP_ID].add_variable("drx.drt.ushortB.var3")
+drg[DR_GROUP_ID].add_variable("drx.drt.ushortB.var4")
+drg[DR_GROUP_ID].add_variable("drx.drt.mixB.var1")
+drg[DR_GROUP_ID].add_variable("drx.drt.mixB.var2")
+drg[DR_GROUP_ID].add_variable("drx.drt.mixB.var3")
+drg[DR_GROUP_ID].add_variable("drx.drt.mixB.var4")
+trick.add_data_record_group(drg[DR_GROUP_ID], trick.DR_Buffer)
+drg[DR_GROUP_ID].enable()
--- a/test/SIM_test_dr/Modified_data/dr_typesHDF5.dr
+++ b/test/SIM_test_dr/Modified_data/dr_typesHDF5.dr
@ -0,0 +1,38 @@
+global DR_GROUP_ID
+global drg
+try:
+    if DR_GROUP_ID >= 0:
+        DR_GROUP_ID += 1
+except NameError:
+    DR_GROUP_ID = 0
+    drg = []
+
+drg.append(trick.DRHDF5("DR_typesHDF5"))
+drg[DR_GROUP_ID].set_freq(trick.DR_Always)
+drg[DR_GROUP_ID].set_cycle(0.1)
+drg[DR_GROUP_ID].set_single_prec_only(False)
+drg[DR_GROUP_ID].add_variable("drx.drt.a")
+drg[DR_GROUP_ID].add_variable("drx.drt.b")
+drg[DR_GROUP_ID].add_variable("drx.drt.c")
+drg[DR_GROUP_ID].add_variable("drx.drt.d")
+drg[DR_GROUP_ID].add_variable("drx.drt.e")
+drg[DR_GROUP_ID].add_variable("drx.drt.f")
+drg[DR_GROUP_ID].add_variable("drx.drt.g")
+drg[DR_GROUP_ID].add_variable("drx.drt.h")
+drg[DR_GROUP_ID].add_variable("drx.drt.i")
+drg[DR_GROUP_ID].add_variable("drx.drt.j")
+drg[DR_GROUP_ID].add_variable("drx.drt.k")
+drg[DR_GROUP_ID].add_variable("drx.drt.l")
+drg[DR_GROUP_ID].add_variable("drx.drt.m")
+drg[DR_GROUP_ID].add_variable("drx.drt.n")
+drg[DR_GROUP_ID].add_variable("drx.drt.o")
+drg[DR_GROUP_ID].add_variable("drx.drt.p")
+drg[DR_GROUP_ID].add_variable("drx.drt.q[0]")
+drg[DR_GROUP_ID].add_variable("drx.drt.q[1]")
+drg[DR_GROUP_ID].add_variable("drx.drt.q[2]")
+drg[DR_GROUP_ID].add_variable("drx.drt.q[3]")
+drg[DR_GROUP_ID].add_variable("drx.drt.q[4]")
+drg[DR_GROUP_ID].add_variable("drx.drt.r[0][0]")
+
+trick.add_data_record_group(drg[DR_GROUP_ID], trick.DR_Buffer)
+drg[DR_GROUP_ID].enable()
--- a/test/SIM_test_dr/RUN_test/Ref_Logs/log_DR_bitfieldsHDF5.h5
+++ b/test/SIM_test_dr/RUN_test/Ref_Logs/log_DR_bitfieldsHDF5.h5
--- a/test/SIM_test_dr/RUN_test/Ref_Logs/log_DR_typesHDF5.h5
+++ b/test/SIM_test_dr/RUN_test/Ref_Logs/log_DR_typesHDF5.h5
--- a/test/SIM_test_dr/RUN_test/unit_test.py
+++ b/test/SIM_test_dr/RUN_test/unit_test.py
@ -5,6 +5,10 @@ trick_utest.unit_tests.set_file_name( os.getenv("TRICK_HOME") + "/trick_test/SIM

 trick_utest.unit_tests.set_test_name( "DRTest" )

+has_dhf5 = False
+if hasattr(trick, 'DRHDF5'):
+    has_dhf5 = True
+
 ######################################################################################################################

 test_suite = "drg api"
@ -16,10 +20,18 @@ num_drgs = trick.get_num_data_record_groups()
 TRICK_EXPECT_EQ( num_drgs , 0 , test_suite , "0 drgs before any created" )

 # The first item of each pair is the .dr file name and the second item of each pair is the drg name
-dr_file_name_drg_name_tuple = (('Modified_data/dr_typesASCII.dr', 'DR_typesASCII'), 
-                               ('Modified_data/dr_typesBINARY.dr', 'DR_typesBINARY'), 
-                               ('Modified_data/dr_bitfASCII.dr', 'DR_bitfieldsASCII'), 
-                               ('Modified_data/dr_bitfBINARY.dr', 'DR_bitfieldsBINARY'))
+if has_dhf5:
+    dr_file_name_drg_name_tuple = (('Modified_data/dr_typesASCII.dr', 'DR_typesASCII'), 
+                                   ('Modified_data/dr_typesBINARY.dr', 'DR_typesBINARY'), 
+                                   ('Modified_data/dr_typesHDF5.dr', 'DR_typesHDF5'),
+                                   ('Modified_data/dr_bitfASCII.dr', 'DR_bitfieldsASCII'), 
+                                   ('Modified_data/dr_bitfBINARY.dr', 'DR_bitfieldsBINARY'),
+                                   ('Modified_data/dr_bitfHDF5.dr', 'DR_bitfieldsHDF5'))
+else:
+    dr_file_name_drg_name_tuple = (('Modified_data/dr_typesASCII.dr', 'DR_typesASCII'), 
+                                   ('Modified_data/dr_typesBINARY.dr', 'DR_typesBINARY'), 
+                                   ('Modified_data/dr_bitfASCII.dr', 'DR_bitfieldsASCII'), 
+                                   ('Modified_data/dr_bitfBINARY.dr', 'DR_bitfieldsBINARY'))

 num_files = len(dr_file_name_drg_name_tuple)
 for i in range(num_files):
@ -29,7 +41,10 @@ for i in range(num_files):
 num_drgs = trick.get_num_data_record_groups()

 # Check the result of trick.get_num_data_record_groups()
-TRICK_EXPECT_EQ( num_drgs , 4 , test_suite , "num of dr groups = 4" )
+if has_dhf5:
+    TRICK_EXPECT_EQ( num_drgs , 6 , test_suite , "num of dr groups = 6" )
+else:
+    TRICK_EXPECT_EQ( num_drgs , 4 , test_suite , "num of dr groups = 4" )

 # Test trick.get_data_record_group(<drg_name>) for getting the drg pointer by its name
 # Check the name of the obtained drg instead of the drg pointer
@ -49,7 +64,10 @@ TRICK_EXPECT_TRUE(  is_null, test_suite , "null drg by nonexistent drg name" )
 is_null = False
 if trick.get_data_record_group_by_idx(num_drgs+1) is None :
    is_null = True
-TRICK_EXPECT_TRUE(  is_null, test_suite , "null drg by drg id 5" )
+if has_dhf5:
+    TRICK_EXPECT_TRUE(  is_null, test_suite , "null drg by drg id 7" )
+else:
+    TRICK_EXPECT_TRUE(  is_null, test_suite , "null drg by drg id 5" )

 is_null = False
 if trick.get_data_record_group_by_idx(-1) is None :
--- a/test/SIM_test_sched/S_overrides.mk
+++ b/test/SIM_test_sched/S_overrides.mk
@ -1,4 +1,4 @@

 TRICK_CFLAGS += -I./models
-TRICK_CXXFLAGS += -I./models
+TRICK_CXXFLAGS += -std=c++11 -I./models

--- a/trick_source/java/pom.xml
+++ b/trick_source/java/pom.xml
@ -298,6 +298,22 @@
              <finalName>MM</finalName>
            </configuration>
          </execution>
+          <execution>
+
+            <id>jobperf</id>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <transformers>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                  <mainClass>trick.jobperf.JobPerf</mainClass>
+                </transformer>
+              </transformers>
+              <finalName>JPerf</finalName>
+            </configuration>
+          </execution>

        </executions>
      </plugin> 
--- a/trick_source/java/src/main/java/trick/common/RunTimeTrickApplication.java
+++ b/trick_source/java/src/main/java/trick/common/RunTimeTrickApplication.java
@ -464,11 +464,6 @@ public abstract class RunTimeTrickApplication extends TrickApplication {
        JMenuBar menuBar = super.createMenuBar();
        JMenu menu = menuBar.getMenu(0);

-        // Remove look and feel menu item.
-        for (int i = 0; i < 2; ++i) {
-            menu.remove(0);
-        }
-
        menu.add(new JSeparator(), 0);

        menu.add(new JMenuItem(new AbstractAction("Settings") {
--- a/trick_source/java/src/main/java/trick/common/TrickApplication.java
+++ b/trick_source/java/src/main/java/trick/common/TrickApplication.java
@ -10,6 +10,7 @@ import java.awt.Desktop;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
 import java.awt.Insets;
+import java.awt.Window;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.io.File;
@ -274,7 +275,13 @@ public abstract class TrickApplication extends SingleFrameApplication implements
                public void run() {
                    try {
                        UIManager.setLookAndFeel(finalLafClassName);
-                        SwingUtilities.updateComponentTreeUI(getMainFrame());
+                        // update the UI for all windows with the new look and feel
+                        // this is needed for all the windows that are not
+                        // children of the main frame as well as the children
+                        // of the main frame
+                        for (Window window : Window.getWindows()) {
+                            SwingUtilities.updateComponentTreeUI(window);
+                        }
                    } catch (Exception exception) {
                        JOptionPane.showMessageDialog(getMainFrame(),
                                                      "Can't change look and feel",
--- a/trick_source/java/src/main/java/trick/common/ui/UIUtils.java
+++ b/trick_source/java/src/main/java/trick/common/ui/UIUtils.java
--- a/trick_source/java/src/main/java/trick/common/ui/panels/AnimationPlayer.java
+++ b/trick_source/java/src/main/java/trick/common/ui/panels/AnimationPlayer.java
@ -30,160 +30,214 @@ import trick.common.ui.UIUtils;
 *
 * @since Trick 10
 */
-public class AnimationPlayer extends JPanel {
-	
-	//========================================
-	//	Public data
-	//========================================
-	
-	
-	//========================================
-	//	Protected data
-	//========================================
-	
-	//========================================
-	//	Private Data
-	//========================================
-	 private boolean paused;
-	 private boolean finished; 
-	 private String animationFile;
-	 private JLabel animationLabel;   
-	 private PlayAnimationTask animationTask;
-	 
-	 
-	 private static final long serialVersionUID = 3705588596523798631L;
-	 
-	//========================================
-	//	Constructors
-	//========================================
-	/**
-	 *	Default constructor.
+public class AnimationPlayer extends JPanel 
+{
+    
+    //========================================
+    //    Public data
+    //========================================
+    
+    
+    //========================================
+    //    Protected data
+    //========================================
+    
+    //========================================
+    //    Private Data
+    //========================================
+     private boolean paused;
+     private boolean finished; 
+     private String animationFile;
+     private int animationTimeStep;
+     private JLabel animationLabel;   
+     private PlayAnimationTask animationTask;
+     
+     
+     private static final long serialVersionUID = 3705588596523798631L;
+     
+    //========================================
+    //    Constructors
+    //========================================
+    /**
+     *    Default constructor.
         * @param fileName name of file
-	 */
-	public AnimationPlayer(String fileName) {
-		animationFile = fileName;
-		buildGUI();
-		if (animationTask == null) {
-			animationTask = new PlayAnimationTask();
-		}
-	}
-	
-	//========================================
-	//	Set/Get methods
-	//========================================
-	
-	
-	//========================================
-	//	Methods
-	//========================================	
-	/**
-	 * Starts the animation task. This method has to be called
-	 * in order for the animation to be played.
-	 */
-	public void start() {
-		if (animationTask == null) {
-			animationTask = new PlayAnimationTask();
-		}	
-		animationTask.execute();
-	}
-	
-	/**
-	 * Pauses the animation play.
-	 */
-	public void pause() {
-		paused = true;
-	}
-	
-	/**
-	 * Resumes the animation play.
-	 */
-	public void resume() {
-		paused = false;
-	}
-	
-	/**
-	 * Stops the animation play.
-	 */
-	public void stop() {
-		finished = true;
-	}
-	
-	/**
-	 * Builds the player GUI.
-	 */
-	private void buildGUI() {
+     */
+    public AnimationPlayer(String fileName) 
+    {
+        animationFile = fileName;
+        animationTimeStep = 150;
+        buildGUI();
+        if (animationTask == null) 
+        {
+            animationTask = new PlayAnimationTask();
+        }
+    }
+
+    /**
+     *    Constructor with paramaterized time step.
+         * @param fileName name of file
+         * @param timeStep animation time step
+     */
+    public AnimationPlayer(String fileName, int timeStep) 
+    {
+        animationFile = fileName;
+        animationTimeStep = timeStep;
+        buildGUI();
+        if (animationTask == null) 
+        {
+            animationTask = new PlayAnimationTask();
+        }
+    }
+    
+    //========================================
+    //    Set/Get methods
+    //========================================
+    
+    
+    //========================================
+    //    Methods
+    //========================================    
+    /**
+     * Starts the animation task. This method has to be called
+     * in order for the animation to be played.
+     */
+    public void start() 
+    {
+        if (animationTask == null) 
+        {
+            animationTask = new PlayAnimationTask();
+        }    
+        animationTask.execute();
+    }
+    
+    /**
+     * Pauses the animation play.
+     */
+    public void pause() 
+    {
+        paused = true;
+    }
+    
+    /**
+     * Resumes the animation play.
+     */
+    public void resume() 
+    {
+        paused = false;
+    }
+    
+    /**
+     * Stops the animation play.
+     */
+    public void stop() 
+    {
+        finished = true;
+    }
+    
+    /**
+     * Builds the player GUI.
+     */
+    private void buildGUI() 
+    {
        setLayout(new BorderLayout());
        animationLabel = new JLabel();
        ImageIcon icon = UIUtils.createImageIcon(animationFile);
        // set proper initial size for the label
-        if (icon != null) {
-        	animationLabel.setPreferredSize(new Dimension(icon.getIconWidth(), icon.getIconHeight()));
+        if (icon != null) 
+        {
+            animationLabel.setPreferredSize(new Dimension(icon.getIconWidth(), icon.getIconHeight()));
        }
        add(animationLabel, BorderLayout.CENTER);    
    }
-	
-	//========================================
-	//	Inner Class
-	//========================================	
-	/**
+    
+    //========================================
+    //    Inner Class
+    //========================================    
+    /**
     * Inner class for playing an animation image.
     */
-    private class PlayAnimationTask extends SwingWorker<Void, Void> {
-    	ImageInputStream stream;
-    	
-    	@Override
-    	public Void doInBackground() {   	
-    		
-    		if (animationFile == null) {
-    			return null;
-    		}
-    		
-            try {	         
-	            InputStream input = UIUtils.getInputStreamForFile(animationFile);
-	            stream = ImageIO.createImageInputStream(input);
-	            Iterator readers = ImageIO.getImageReaders(stream);
-	            if (!readers.hasNext()) {
-					throw new RuntimeException("no image reader found");
-				}
-	            ImageReader reader = (ImageReader) readers.next();
-	            reader.setInput(stream); // don't omit this line!
-	            int n = reader.getNumImages(true); // don't use false!
-	            
-	            for (int i = 0; i < n; i++) {
-	                BufferedImage image = reader.read(i);
-	                Image img = image;            
-	                animationLabel.setIcon(new ImageIcon(img));
-	                do {
-	                    try {            
-	                        Thread.sleep(150);
-	                    } catch (InterruptedException ie) {
-	                    }        
-	                }  while (paused);
-	                     
-	                if (finished) {
-	                	break;
-	                } else {
-	                	// rewind
-	                	if (i == n-1) {
-	                		i = 0;                
-	                	}                         
-	                }
-	            }
-	            
-            } catch (IOException ioe) {   
-            	         
+    private class PlayAnimationTask extends SwingWorker<Void, Void> 
+    {
+        ImageInputStream stream;
+        
+        @Override
+        public Void doInBackground() 
+        {       
+            
+            if (animationFile == null) 
+            {
+                return null;
            }
            
-    		return null;
-    	}
+            try 
+            {             
+                InputStream input = UIUtils.getInputStreamForFile(animationFile);
+                stream = ImageIO.createImageInputStream(input);
+                Iterator readers = ImageIO.getImageReaders(stream);
+                if (!readers.hasNext()) 
+                {
+                    throw new RuntimeException("no image reader found");
+                }
+                ImageReader reader = (ImageReader) readers.next();
+                reader.setInput(stream); // don't omit this line!
+                int n = reader.getNumImages(true); // don't use false!
+                
+                int i = 0;
+                while(i < n)
+                {
+                    Image img  = reader.read(i);           
+                    animationLabel.setIcon(new ImageIcon(img));
+                    do 
+                    {
+                        try 
+                        {            
+                            Thread.sleep(animationTimeStep);
+                        } 
+                        catch (InterruptedException ie) 
+                        {
+                        }        
+                    }  while (paused);
+                         
+                    if (finished) 
+                    {
+                        break;
+                    } 
+                    else 
+                    {
+                        // rewind
+                        if (i >= n-1) 
+                        {
+                            i = 0;                
+                        }
+                        else
+                        {
+                            ++i;
+                        }                         
+                    }
+                }
+                
+            } 
+            catch (IOException ioe) 
+            {   
+                         
+            }
            
-    	@Override
-		public void done() {
-    		if (stream != null) {
-                try {
+            return null;
+        }
+            
+        @Override
+        public void done() 
+        {
+            if (stream != null) 
+            {
+                try 
+                {
                    stream.close();
-                } catch (IOException ioe) { }
+                } 
+                catch (IOException ioe) 
+                { 
+                }
            }
-    	}
+        }
    }
 }
--- a/trick_source/java/src/main/java/trick/jobperf/FrameRecord.java
+++ b/trick_source/java/src/main/java/trick/jobperf/FrameRecord.java
@ -0,0 +1,76 @@
+package trick.jobperf;
+import java.util.*;
+
+/**
+* Class CompareByDuration compares two JobExecutionEvent's by their duration.
+*/
+class CompareByDuration implements Comparator<JobExecutionEvent> {
+    public int compare(JobExecutionEvent a, JobExecutionEvent b) {
+        Double dur_a = a.stop - a.start;
+        Double dur_b = b.stop - b.start;
+        if ( dur_a > dur_b) return -1;
+        if ( dur_a < dur_b) return  1;
+        return 0;
+    }
+}
+
+/**
+* Class CompareByDuration compares two JobExecutionEvent's by their start time.
+*/
+class CompareByStartTime implements Comparator<JobExecutionEvent> {
+    public int compare(JobExecutionEvent a, JobExecutionEvent b) {
+        if ( a.start < b.start) return -1;
+        if ( a.start > a.start) return  1;
+        return 0;
+    }
+}
+
+/**
+* Class FrameRecord represents the set of jobs that have been executed during a
+* frame.
+*/
+public class FrameRecord {
+    public ArrayList<JobExecutionEvent> jobEvents;
+    public double start;
+    public double stop;
+    /**
+     * Constructor
+     */
+    public FrameRecord() {
+        start = 0.0;
+        stop  = 0.0;
+        jobEvents = new ArrayList<JobExecutionEvent>();
+    }
+
+    /**
+     * @return the stop time minus the start time.
+     */
+    public double getDuration() {
+        return stop - start;
+    }
+
+    public void SortByJobEventDuration() {
+        Collections.sort( jobEvents, new CompareByDuration());
+    }
+
+    public void SortByStartTime() {
+        Collections.sort( jobEvents, new CompareByStartTime());
+    }
+
+    /**
+     * For each jobEvent in the frame, record the number of times
+     * its start time is contained within
+     * another jobs stop/stop range.
+     */
+    public void CalculateJobContainment() {
+        SortByJobEventDuration();
+        int N = jobEvents.size();
+        for (int i = 0 ; i < (N-1); i++) {
+            for (int j = i+1 ; j < N; j++) {
+                if ( jobEvents.get(i).contains( jobEvents.get(j) )) {
+                    jobEvents.get(j).contained ++ ;
+                }
+            }
+        }
+    }
+}
--- a/trick_source/java/src/main/java/trick/jobperf/FrameViewCanvas.java
+++ b/trick_source/java/src/main/java/trick/jobperf/FrameViewCanvas.java
@ -0,0 +1,99 @@
+package trick.jobperf;
+
+import java.awt.*;
+import java.io.*;
+import java.util.*;
+import javax.swing.*;
+
+public class FrameViewCanvas extends JPanel {
+    private FrameRecord frame;
+    private TraceViewCanvas tvc;
+    private Font headingsFont;
+    private Font dataFont;
+
+    public FrameViewCanvas( TraceViewCanvas tvc, FrameRecord frame ) {
+        this.tvc = tvc;
+        this.frame = frame;
+        dataFont      = new Font("Arial", Font.PLAIN, 18);
+        headingsFont  = new Font("Arial", Font.BOLD, 18);
+
+        setPreferredSize(new Dimension(800, neededPanelHeight()));
+    }
+
+    private void doDrawing(Graphics g) {
+        Graphics2D g2d = (Graphics2D) g;
+
+        RenderingHints rh = new RenderingHints(
+                RenderingHints.KEY_ANTIALIASING,
+                RenderingHints.VALUE_ANTIALIAS_ON);
+
+        rh.put(RenderingHints.KEY_RENDERING,
+               RenderingHints.VALUE_RENDER_QUALITY);
+
+        // Panel Background Color Fill
+        g2d.setPaint(Color.WHITE);
+        g2d.fillRect(0, 0, getWidth(), getHeight());
+
+        // TITLE
+        g2d.setFont(headingsFont);
+        g2d.setPaint( Color.RED );
+        g2d.drawString("Frame Details", 100, 50);
+
+        // Column Headings
+        g2d.setFont(headingsFont);
+        g2d.setPaint( Color.BLUE );
+        g2d.drawString("Job-ID", 100, 80);
+        g2d.drawString("Job-Class", 180, 80);
+        g2d.drawString("Start-Time", 420, 80);
+        g2d.drawString("Stop-Time", 520, 80);
+        g2d.drawString("Duration", 620, 80);
+        g2d.drawString("Job-Name", 740, 80);
+
+        frame.SortByStartTime();
+
+        // For each job in the frame.
+        int jobY = 100;
+        for (JobExecutionEvent jobExec : frame.jobEvents) {
+            g2d.setPaint( tvc.idToColorMap.getColor( jobExec.id ) );
+            g2d.fillRect(50, jobY, 20, 20);
+            g2d.setPaint( Color.BLACK );
+            jobY += 20;
+            double duration = jobExec.stop - jobExec.start;
+
+            g2d.setFont(dataFont);
+            g2d.drawString(jobExec.id, 100, jobY);
+            g2d.drawString( String.format("%12.6f", jobExec.start), 420, jobY);
+            g2d.drawString( String.format("%12.6f", jobExec.stop), 520, jobY);
+            g2d.drawString( String.format("%12.6f", duration), 620, jobY);
+
+            JobSpecification jobSpec = tvc.jobSpecificationMap.getJobSpecification(jobExec.id);
+            if ( jobSpec == null) {
+                g2d.setPaint( Color.RED );
+                g2d.drawString("UNKNOWN", 180, jobY);
+                g2d.drawString("UNKNOWN", 740, jobY);
+            } else {
+                g2d.drawString(jobSpec.jobClass, 180, jobY);
+                g2d.drawString(jobSpec.name, 740, jobY);
+            }
+        }
+        frame.SortByJobEventDuration();
+    }
+
+    /**
+     * Calculate the height of the FrameViewCanvas (JPanel) needed to render the
+     * jobs in the frame.
+     */
+    private int neededPanelHeight() {
+        return 20 * frame.jobEvents.size() + 100;
+    }
+
+    /**
+     * This function paints the FrameViewCanvas (i.e, JPanel) when required.
+     */
+    @Override
+    public void paintComponent(Graphics g) {
+        super.paintComponent(g);
+        doDrawing(g);
+    }
+
+}
--- a/trick_source/java/src/main/java/trick/jobperf/FrameViewWindow.java
+++ b/trick_source/java/src/main/java/trick/jobperf/FrameViewWindow.java
@ -0,0 +1,31 @@
+package trick.jobperf;
+
+import java.awt.*;
+import java.io.*;
+import java.util.*;
+import javax.swing.*;
+
+public class FrameViewWindow extends JFrame {
+    public FrameViewWindow( TraceViewCanvas tvc, FrameRecord frame, int frameNumber ) {
+
+        FrameViewCanvas frameViewCanvas = new FrameViewCanvas(tvc, frame);
+
+        JScrollPane scrollPane = new JScrollPane( frameViewCanvas );
+        scrollPane.getVerticalScrollBar().setUnitIncrement( 20 );
+
+        JPanel scrollingFrameViewCanvas = new JPanel();
+        scrollingFrameViewCanvas.add(scrollPane);
+        scrollingFrameViewCanvas.setLayout(new BoxLayout(scrollingFrameViewCanvas, BoxLayout.X_AXIS));
+
+        setTitle("Frame " + frameNumber);
+        setPreferredSize(new Dimension(1200, 400));
+        add(scrollingFrameViewCanvas);
+        pack();
+        setVisible(true);
+        setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
+        setFocusable(true);
+        setVisible(true);
+
+        frameViewCanvas.repaint();
+    }
+}
--- a/trick_source/java/src/main/java/trick/jobperf/InvalidFrameBoundsExpection.java
+++ b/trick_source/java/src/main/java/trick/jobperf/InvalidFrameBoundsExpection.java
@ -0,0 +1,12 @@
+package trick.jobperf;
+
+/**
+* Class InvalidFrameBoundsExpection is an exception indicating
+* that the user has specified an illegal range for the frames
+* to be rendered.
+*/
+class InvalidFrameBoundsExpection extends Exception {
+    public InvalidFrameBoundsExpection(String message) {
+        super(message);
+    }
+}
--- a/trick_source/java/src/main/java/trick/jobperf/JobExecutionEvent.java
+++ b/trick_source/java/src/main/java/trick/jobperf/JobExecutionEvent.java
@ -0,0 +1,64 @@
+package trick.jobperf;
+
+import java.awt.*;
+import java.awt.event.*;
+import java.awt.image.BufferedImage;
+import java.io.*;
+import java.lang.Math;
+import java.util.*;
+import java.util.List;
+import javax.swing.*;
+import javax.swing.event.*;
+import java.net.URL;
+
+/**
+* Class JobExecutionEvent represents one execution/run of a Trick job.
+* <id> identifies the job. <start> and <stop> specify the
+* clock times at which the job started and finished.
+* <isTOF> indicates whether the job was run as
+* an "top-of-frame" job.
+*/
+class JobExecutionEvent {
+    public String id;
+    public boolean isTOF;
+    public boolean isEOF;
+    public double start;
+    public double stop;
+    public int contained;
+
+    /**
+     * @param identifier identifies the relavant Trick job.
+     * @param isTopOfFrame true if the job is a "top-of-frame" job, otherwise false.
+     * @param isEndOfFrame true if the job is a "end-of-frame" job, otherwise false.
+     * @param start_time the start time (seconds) of the identified job.
+     * @param stop_time the stop time (seconds) of the identified job.
+     */
+    public JobExecutionEvent(String id, boolean isTOF, boolean isEOF, double start, double stop) {
+        this.id = id;
+        this.isTOF = isTOF;
+        this.isEOF = isEOF;
+        this.start = start;
+        this.stop = stop;
+        contained = 1;
+    }
+
+    /**
+    * Determine whether a job's start time is contained
+    * within another jobs stop/stop range.
+    */
+    public boolean contains( JobExecutionEvent other ) {
+        if ((other.start > this.start) &&
+            (other.start < this.stop)) {
+                return true;
+            }
+        return false;
+    }
+
+    /**
+     * Create a String representation of an object of this class.
+     */
+     @Override
+    public String toString() {
+        return ( "JobExecutionEvent: " + id + "," + start + "," + stop );
+    }
+}
--- a/trick_source/java/src/main/java/trick/jobperf/JobPerf.java
+++ b/trick_source/java/src/main/java/trick/jobperf/JobPerf.java
@ -0,0 +1,202 @@
+package trick.jobperf;
+
+import java.awt.*;
+import java.io.*;
+import java.util.*;
+import javax.swing.*;
+
+import java.nio.file.Path;
+import java.nio.file.Paths;
+/**
+* Class JobPerf is an application that renders time-line data from a Trick based
+  simulation. It also generates run-time statistics reports for the simulation
+  jobs. It can be run with or without a GUI.
+*/
+public class JobPerf {
+    ArrayList<JobExecutionEvent> jobExecEvtList;
+    JobStats jobStats;
+
+    /**
+     * Constructor
+     * @param args the command line arguments.
+     */
+    public JobPerf( String[] args ) {
+        TraceViewWindow traceViewWindow;
+        boolean interactive = true;
+        boolean printReport = false;
+        JobStats.SortCriterion sortOrder = JobStats.SortCriterion.MEAN;
+        String timeLineFileName = "in.csv";
+
+        int ii = 0;
+        while (ii < args.length) {
+            switch (args[ii]) {
+                case "-h" :
+                case "--help" : {
+                    printHelpText();
+                    System.exit(0);
+                } break;
+                case "-x" :
+                case "--nogui" : {
+                    interactive = false;
+                    printReport = true;
+                } break;
+                case "-p" :
+                case "--report" : {
+                    printReport = true;
+                } break;
+                case "-s0" :
+                case "--sort=id" : {
+                    sortOrder = JobStats.SortCriterion.ID;
+                } break;
+                case "-s1" :
+                case "--sort=mean" : {
+                    sortOrder = JobStats.SortCriterion.MEAN;
+                } break;
+                case "-s2" :
+                case "--sort=stddev" : {
+                    sortOrder = JobStats.SortCriterion.STDDEV;
+                } break;
+                case "-s3" :
+                case "--sort=max" : {
+                    sortOrder = JobStats.SortCriterion.MAX;
+                } break;
+                case "-s4" :
+                case "--sort=min" : {
+                    sortOrder = JobStats.SortCriterion.MIN;
+                } break;
+                default : {
+                    timeLineFileName = args[ii];
+                } break;
+            } //switch
+            ++ii;
+        } // while
+
+        // All files shall be in the same directory as the timeline file.
+        String filesDir = Paths.get(timeLineFileName).toAbsolutePath().getParent().toString();
+
+        // Generate the JobSpecificationMap from information extracted from the S_job_execution
+        // file, that should be in the same directory as the time-line file.
+        File s_job_execution_file = new File( filesDir + "/S_job_execution" );
+        JobSpecificationMap jobSpecificationMap = null;
+        try {
+            jobSpecificationMap = new JobSpecificationMap( s_job_execution_file );
+        } catch ( java.io.FileNotFoundException e ) {
+            System.out.println("File \"" + s_job_execution_file.toString() + "\" not found.\n");
+            System.exit(0);
+        } catch ( java.io.IOException e ) {
+            System.out.println("IO Exception while attempting to read " + s_job_execution_file.toString() + ".\n");
+            System.exit(0);
+        }
+
+        // Read Color Map
+        KeyedColorMap idToColorMap = null;
+        File colorMapFile = null;
+        try {
+            colorMapFile = new File(filesDir + "/IdToColors.txt");
+            idToColorMap = new KeyedColorMap( colorMapFile.toString());
+            if ( colorMapFile.exists()) {
+                 idToColorMap.readFile();
+            }
+        } catch ( java.io.IOException e ) {
+            System.out.println("IO Exception while attempting to read " + colorMapFile.toString() + ".\n");
+            System.exit(0);
+        }
+
+        jobExecEvtList = getJobExecutionEventList(timeLineFileName, jobSpecificationMap);
+
+        if (printReport) {
+            jobStats = new JobStats(jobExecEvtList);
+            if (sortOrder == JobStats.SortCriterion.ID ) jobStats.SortByID();
+            if (sortOrder == JobStats.SortCriterion.MEAN ) jobStats.SortByMeanValue();
+            if (sortOrder == JobStats.SortCriterion.STDDEV ) jobStats.SortByStdDev();
+            if (sortOrder == JobStats.SortCriterion.MAX ) jobStats.SortByMaxValue();
+            if (sortOrder == JobStats.SortCriterion.MIN ) jobStats.SortByMinValue();
+            jobStats.write( jobSpecificationMap);
+        }
+        if (interactive) {
+            traceViewWindow = new TraceViewWindow(jobExecEvtList, idToColorMap, jobSpecificationMap);
+        }
+    }
+
+    /**
+     * Print the usage instructions to the terminal.
+     */
+    private static void  printHelpText() {
+        System.out.println(
+            "----------------------------------------------------------------------\n"
+            + "usage: trick-jperf [options] <file-name>\n\n"
+            + "options: \n"
+            + "-h, --help\n"
+            + "    Print this help text and exit.\n"
+            + "-x, --nogui\n"
+            + "    Don't run as a GUI application. Command line only.\n"
+            + "-p, --report\n"
+            + "    Write sorted job statics report to the terminal.\n"
+            + "-s0, --sort=id\n"
+            + "    Sort job statistics by identifier.\n"
+            + "-s1, --sort=mean   [default]\n"
+            + "    Sort job statistics by mean duration.\n"
+            + "-s2, --sort=stddev\n"
+            + "    Sort job statistics by standard deviation of duration.\n"
+            + "-s3, --sort=min\n"
+            + "    Sort job statistics by minimum duration.\n"
+            + "-s4, --sort=max\n"
+            + "    Sort job statistics by maximum duration.\n"
+            + "----------------------------------------------------------------------\n"
+          );
+    }
+
+    /**
+     * Read the timeline file, resulting in a ArrayList<JobExecutionEvent>.
+     */
+    private ArrayList<JobExecutionEvent> getJobExecutionEventList( String fileName,
+                                                                   JobSpecificationMap jobSpecificationMap ) {
+        String line;
+        String field[];
+
+        ArrayList<JobExecutionEvent> jobExecEvtList = new ArrayList<JobExecutionEvent>();
+        try {
+            BufferedReader in = new BufferedReader( new FileReader(fileName) );
+
+            // Strip the header line off the CSV file.
+            line = in.readLine();
+
+            // Iterate through and process each of the data lines.
+            while( (line = in.readLine()) !=null) {
+                 boolean isTOF = false;
+                 boolean isEOF = false;
+                 field   = line.split(",");
+
+                 String id    = field[0].trim();
+                 JobSpecification jobSpec = jobSpecificationMap.getJobSpecification(id);
+                 if (jobSpec != null) {
+                     if (jobSpec.jobClass.equals("top_of_frame")) {
+                         isTOF = true;
+                     } else if (jobSpec.jobClass.equals("end_of_frame")) {
+                         isEOF = true;
+                     }
+                 } 
+                 double start = Double.parseDouble( field[1]);
+                 double stop  = Double.parseDouble( field[2]);
+                 if (start < stop) {
+                     JobExecutionEvent evt = new JobExecutionEvent(id, isTOF, isEOF, start, stop);
+                     jobExecEvtList.add( evt);
+                 }
+             }
+         } catch ( java.io.FileNotFoundException e ) {
+             System.out.println("File \"" + fileName + "\" not found.\n");
+             System.exit(0);
+         } catch ( java.io.IOException e ) {
+             System.out.println("IO Exception.\n");
+             System.exit(0);
+         }
+         return jobExecEvtList;
+    }
+
+    /**
+     * Entry point for the Java application.
+     */
+    public static void main(String[] args) {
+        JobPerf jobPerf = new JobPerf( args );
+    }
+}
--- a/trick_source/java/src/main/java/trick/jobperf/JobSpecification.java
+++ b/trick_source/java/src/main/java/trick/jobperf/JobSpecification.java
@ -0,0 +1,33 @@
+package trick.jobperf;
+
+import java.awt.*;
+import java.io.*;
+import java.util.*;
+
+
+/**
+* Class JobSpecification represents ...
+*/
+class JobSpecification {
+    public String name;
+    public String jobClass;
+    public int phase;
+
+    /**
+     * @param name identifies the relevant Trick job.
+     * @param jobClass the Trick job class.
+     * @param phase the Trick phase number of the Trick job.
+     */
+    public JobSpecification(String name, String jobClass, int phase) {
+        this.name = name;
+        this.jobClass = jobClass;
+        this.phase = phase;
+    }
+    /**
+     * Create a String representation of an object of this jobClass.
+     */
+     @Override
+    public String toString() {
+        return ( "JobSpecification: " + name + "," + jobClass + "," + phase );
+    }
+}
--- a/trick_source/java/src/main/java/trick/jobperf/JobSpecificationMap.java
+++ b/trick_source/java/src/main/java/trick/jobperf/JobSpecificationMap.java
@ -0,0 +1,68 @@
+package trick.jobperf;
+
+import java.awt.*;
+import java.io.*;
+import java.util.*;
+import java.nio.file.*;
+
+/**
+* Class JobSpecificationMap associates identifiers with unique RGB colors.
+*/
+public class JobSpecificationMap {
+    private Map<String, JobSpecification> jobSpecMap;
+
+    /**
+    * Constructor
+    */
+    public JobSpecificationMap( File file ) throws IOException, FileNotFoundException {
+        jobSpecMap = new HashMap<String, JobSpecification>();
+        BufferedReader in = new BufferedReader( new FileReader( file.toString()) );
+        String line;
+        String field[];
+
+        while( (line = in.readLine()) != null) {
+            if ( line.matches("\\s+1 [|].*$") ) {
+                field   = line.split("[|]");
+                if (field.length == 9) {
+                    String jobclass = field[2].trim();
+                    int phase = Integer.parseInt( field[3].trim());
+                    String id = String.format("%.2f", Double.parseDouble( field[7].trim()));
+                    String name = field[8].trim();
+                    jobSpecMap.put(id, new JobSpecification(name, jobclass, phase));
+                    //System.out.println("JobSpec = " + id + "," + jobclass + "," + name);
+                }
+            }
+        }
+// TODO:
+// Sometimes job specifications, and therefore their IDs are not recorded in the S_job_execution file.
+// So, when we attempt to find one of these unrecorded Job specs by ID, we get null.
+//       
+// Job IDs are of the form XX.YY (e.g., 12.03). The XX part is associated with
+// a particular component sim object. The YY part identifies a specific job from that
+// sim object.
+// If an unknown ID shares the XX part of the ID, then perhaps we could at least report which
+// simobject the job came from.
+
+        in.close();
+    }
+
+    /**
+    * Add an identifier, and a JobSpecification to the JobSpecificationMap.
+    * @ param identifier  Specifies the key.
+    */
+    public void addKey( String identifier,  JobSpecification jobSpec) {
+        if (!jobSpecMap.containsKey(identifier)) {
+            jobSpecMap.put(identifier, jobSpec);
+        }
+    }
+
+    /**
+    * Given an identifier, return the corresponding JobSpecification.
+    * @param identifier  the key.
+    * @return the JobSpecification associated with the key.
+    */
+    public JobSpecification getJobSpecification(String identifier) {
+        return jobSpecMap.get(identifier);
+    }
+
+} // class JobSpecificationMap
--- a/trick_source/java/src/main/java/trick/jobperf/JobStats.java
+++ b/trick_source/java/src/main/java/trick/jobperf/JobStats.java
@ -0,0 +1,198 @@
+package trick.jobperf;
+
+import java.io.*;
+import java.util.*;
+
+/**
+* Class CompareByID compares two StatisticsRecord's by id.
+*/
+class CompareByID implements Comparator<StatisticsRecord> {
+    public int compare(StatisticsRecord a, StatisticsRecord b) {
+        return a.id.compareTo(b.id);
+    }
+}
+/**
+* Class CompareByMeanValue compares two StatisticsRecord's by meanValue.
+*/
+class CompareByMeanValue implements Comparator<StatisticsRecord> {
+    public int compare(StatisticsRecord a, StatisticsRecord b) {
+        if ( a.meanValue < b.meanValue) return -1;
+        if ( a.meanValue > b.meanValue) return  1;
+        return 0;
+    }
+}
+/**
+* Class CompareByStdDev compares two StatisticsRecord's by stddev.
+*/
+class CompareByStdDev implements Comparator<StatisticsRecord> {
+    public int compare(StatisticsRecord a, StatisticsRecord b) {
+        if ( a.stddev < b.stddev) return -1;
+        if ( a.stddev > b.stddev) return  1;
+        return 0;
+    }
+}
+/**
+* Class CompareByMaxDuration compares two StatisticsRecord's by maxValue.
+*/
+class CompareByMaxDuration implements Comparator<StatisticsRecord> {
+    public int compare(StatisticsRecord a, StatisticsRecord b) {
+        if ( a.maxValue < b.maxValue) return -1;
+        if ( a.maxValue > b.maxValue) return  1;
+        return 0;
+    }
+}
+/**
+* Class CompareByMinDuration compares two StatisticsRecord's by minValue.
+*/
+class CompareByMinDuration implements Comparator<StatisticsRecord> {
+    public int compare(StatisticsRecord a, StatisticsRecord b) {
+        if ( a.minValue > b.minValue) return -1;
+        if ( a.minValue < b.minValue) return  1;
+        return 0;
+    }
+}
+
+/**
+* Class JobStats represents the statistics, i.e., mean, std deviation, max value,
+* and min value of the run-duration of each of the Trick jobs in jobExecList. The
+* statistic records can be sorted by any of the statistics, and by the job id,
+* prior to being written as a report.
+*/
+public class JobStats {
+
+    /**
+     * Enum SortCriterion enumerates the valid ways that JobStats records can be
+     * sorted.
+     */
+    enum SortCriterion {
+        ID {
+            @Override
+            public String toString() { return "Identifier"; }
+        },
+        MEAN {
+            @Override
+            public String toString() { return "Mean Value"; }
+        },
+        STDDEV {
+            @Override
+            public String toString() { return "Standard Deviation"; }
+        },
+        MAX {
+            @Override
+            public String toString() { return "Maximum Value"; }
+        },
+        MIN {
+            @Override
+            public String toString() { return "Minimum Value"; }
+        }
+    }
+
+    public SortCriterion currentSortCriterion = SortCriterion.MEAN;
+    public ArrayList<StatisticsRecord> jobStatisticsList;
+
+    /**
+     * Constructor
+     * @param jobExecList - the timeline data.
+     */
+    public JobStats( ArrayList<JobExecutionEvent> jobExecList ) {
+
+        Map<String, RunRegistry> runRegistryMap
+            = new HashMap<String, RunRegistry>();
+
+        for (JobExecutionEvent jobExec : jobExecList ) {
+            RunRegistry runRegistry = runRegistryMap.get(jobExec.id);
+            if (runRegistry != null) {
+                runRegistry.addTimeSpan(jobExec.start, jobExec.stop);
+            } else {
+                runRegistry = new RunRegistry();
+                runRegistry.addTimeSpan(jobExec.start, jobExec.stop);
+                runRegistryMap.put(jobExec.id, runRegistry);
+            }
+        }
+
+        jobStatisticsList = new ArrayList<StatisticsRecord>();
+
+        for (Map.Entry<String, RunRegistry> entry : runRegistryMap.entrySet()) {
+            String id = entry.getKey();
+            RunRegistry runRegistry = entry.getValue();
+            double mean   = runRegistry.getMeanDuration();
+            double stddev = runRegistry.getStdDev();
+            double min    = runRegistry.getMinDuration();
+            double max    = runRegistry.getMaxDuration();
+
+            jobStatisticsList.add( new StatisticsRecord(id, mean, stddev, min, max));
+        }
+        SortByMeanValue();
+    }
+
+    /**
+     * Sort by mean duration in descending order.
+     */
+    public void SortByID() {
+       Collections.sort( jobStatisticsList, new CompareByID());
+       currentSortCriterion = SortCriterion.ID;
+    }
+
+    /**
+     * Sort by mean duration in descending order.
+     */
+    public void SortByMeanValue() {
+        Collections.sort( jobStatisticsList, Collections.reverseOrder( new CompareByMeanValue()));
+        currentSortCriterion = SortCriterion.MEAN;
+    }
+
+    /**
+     * Sort by standard deviation of duration in descending order.
+     */
+    public void SortByStdDev() {
+        Collections.sort( jobStatisticsList, Collections.reverseOrder( new CompareByStdDev()));
+        currentSortCriterion = SortCriterion.STDDEV;
+    }
+
+    /**
+     * Sort by maximum duration in descending order.
+     */
+    public void SortByMaxValue() {
+        Collections.sort( jobStatisticsList, Collections.reverseOrder( new CompareByMaxDuration()));
+        currentSortCriterion = SortCriterion.MAX;
+    }
+
+    /**
+     * Sort by minimum duration in descending order.
+     */
+    public void SortByMinValue() {
+        Collections.sort( jobStatisticsList, Collections.reverseOrder( new CompareByMinDuration()));
+        currentSortCriterion = SortCriterion.MIN;
+    }
+
+    /**
+    Write a text report to System.out.
+    */
+    public void write( JobSpecificationMap jobSpecificationMap ) {
+
+        System.out.println("           [Job Duration Statistics Sorted by " + currentSortCriterion +"]");
+        System.out.println("--------------------------------------------------------------------------------------------------");
+        System.out.println("  Job Id   Mean Duration     Std Dev      Min Duration   Max Duration  Name");
+        System.out.println("---------- -------------- -------------- -------------- -------------- ---------------------------");
+
+        for (StatisticsRecord jobStatisticsRecord : jobStatisticsList ) {
+
+           JobSpecification jobSpec = jobSpecificationMap.getJobSpecification( jobStatisticsRecord.id);
+           String jobName = null;
+           if (jobSpec != null) {
+               jobName = jobSpec.name;
+           } else {
+               jobName = "UNKNOWN";
+           }
+           System.out.println( String.format("%10s %14.6f %14.6f %14.6f %14.6f %s",
+                                               jobStatisticsRecord.id,
+                                               jobStatisticsRecord.meanValue,
+                                               jobStatisticsRecord.stddev,
+                                               jobStatisticsRecord.minValue,
+                                               jobStatisticsRecord.maxValue,
+                                               jobName
+                                            )
+                             );
+        }
+    }
+}
--- a/trick_source/java/src/main/java/trick/jobperf/JobStatsViewCanvas.java
+++ b/trick_source/java/src/main/java/trick/jobperf/JobStatsViewCanvas.java
@ -0,0 +1,99 @@
+package trick.jobperf;
+
+import java.awt.*;
+import java.io.*;
+import java.util.*;
+import javax.swing.*;
+
+public class JobStatsViewCanvas extends JPanel {
+
+    private Font headingsFont;
+    private Font dataFont;
+    JobStats jobStats;
+    JobSpecificationMap jobSpecificationMap;
+
+    public JobStatsViewCanvas( JobStats jobStats,
+                               JobSpecificationMap jobSpecificationMap ) {
+        this.jobStats = jobStats;
+        this.jobSpecificationMap = jobSpecificationMap;
+
+        dataFont      = new Font("Arial", Font.PLAIN, 18);
+        headingsFont  = new Font("Arial", Font.BOLD, 18);
+
+        setPreferredSize(new Dimension(800, neededPanelHeight()));
+    }
+
+    private void doDrawing(Graphics g) {
+
+        Graphics2D g2d = (Graphics2D) g;
+
+        RenderingHints rh = new RenderingHints(
+                RenderingHints.KEY_ANTIALIASING,
+                RenderingHints.VALUE_ANTIALIAS_ON);
+
+        rh.put(RenderingHints.KEY_RENDERING,
+               RenderingHints.VALUE_RENDER_QUALITY);
+
+        // Panel Background Color Fill
+        g2d.setPaint(Color.WHITE);
+        g2d.fillRect(0, 0, getWidth(), getHeight());
+
+        // Title
+        g2d.setFont(headingsFont);
+        g2d.setPaint( Color.RED );
+        g2d.drawString("Jobs Duration Statistics Sorted by " + jobStats.currentSortCriterion, 100, 50);
+
+        // Column Headings
+        g2d.setFont(headingsFont);
+
+        g2d.setPaint( Color.BLUE );
+        g2d.drawString("Job-ID", 100, 80);
+        g2d.drawString("Mean Dur", 200, 80);
+        g2d.drawString("Std Dev", 300, 80);
+        g2d.drawString("Min Dur", 400, 80);
+        g2d.drawString("Max Dur", 500, 80);
+        g2d.drawString("Job-Name", 600, 80);
+
+        // For each record
+        int jobY = 100;
+        for (StatisticsRecord jobStatisticsRecord : jobStats.jobStatisticsList ) {
+
+            g2d.setFont(dataFont);
+            g2d.setPaint( Color.BLACK );
+
+            g2d.drawString(jobStatisticsRecord.id, 100, jobY);
+            g2d.drawString( String.format("%14.6f", jobStatisticsRecord.meanValue), 180, jobY);
+            g2d.drawString( String.format("%14.6f", jobStatisticsRecord.stddev), 280, jobY);
+            g2d.drawString( String.format("%14.6f", jobStatisticsRecord.minValue), 380, jobY);
+            g2d.drawString( String.format("%14.6f", jobStatisticsRecord.maxValue), 480, jobY);
+
+            JobSpecification jobSpec = jobSpecificationMap.getJobSpecification( jobStatisticsRecord.id);
+            if (jobSpec != null) {
+                g2d.drawString(jobSpec.name, 600, jobY);
+            } else {
+                g2d.setPaint( Color.RED );
+                g2d.drawString("UNKNOWN", 600, jobY);
+            }
+
+            jobY += 20;
+        }
+    }
+
+    /**
+     * Calculate the height of the JobStatsCanvas (JPanel) needed to render the
+     * jobs in the frame.
+     */
+    private int neededPanelHeight() {
+        return 20 * jobStats.jobStatisticsList.size() + 100;
+    }
+
+    /**
+     * This function paints the JobStatsCanvas (i.e, JPanel) when required.
+     */
+    @Override
+    public void paintComponent(Graphics g) {
+        super.paintComponent(g);
+        doDrawing(g);
+    }
+
+}
--- a/trick_source/java/src/main/java/trick/jobperf/JobStatsViewWindow.java
+++ b/trick_source/java/src/main/java/trick/jobperf/JobStatsViewWindow.java
@ -0,0 +1,113 @@
+package trick.jobperf;
+
+import java.awt.*;
+import java.awt.event.*;
+import java.io.*;
+import java.util.*;
+import javax.swing.*;
+
+class SortButtonsToolBar extends JToolBar implements ActionListener {
+    JobStatsViewCanvas statsViewCanvas;
+    private JButton sortByIDButton;
+    private JButton sortByMean;
+    private JButton sortByStdDev;
+    private JButton sortByMin;
+    private JButton sortByMax;
+
+    public SortButtonsToolBar( JobStatsViewCanvas statsViewCanvas ) {
+        this.statsViewCanvas = statsViewCanvas;
+
+        add( new JLabel("Sort by : "));
+        sortByIDButton = new JButton("ID");
+        sortByIDButton.addActionListener(this);
+        sortByIDButton.setActionCommand("sort-by-ID");
+        sortByIDButton.setToolTipText("Sort by Job ID");
+        add(sortByIDButton);
+
+        sortByMean = new JButton("Mean");
+        sortByMean.addActionListener(this);
+        sortByMean.setActionCommand("sort-by-mean");
+        sortByMean.setToolTipText("Sort by Mean Job Run Duration");
+        add(sortByMean);
+
+        sortByStdDev = new JButton("Std Dev");
+        sortByStdDev.addActionListener(this);
+        sortByStdDev.setActionCommand("sort-by-std-dev");
+        sortByStdDev.setToolTipText("Sort by Std Deviation of Job Run Duration");
+        add(sortByStdDev);
+
+        sortByMin = new JButton("Min");
+        sortByMin.addActionListener(this);
+        sortByMin.setActionCommand("sort-by-min");
+        sortByMin.setToolTipText("Sort by Minimum Job Run Duration");
+        add(sortByMin);
+
+        sortByMax = new JButton("Max");
+        sortByMax.addActionListener(this);
+        sortByMax.setActionCommand("sort-by-max");
+        sortByMax.setToolTipText("Sort by Maximum Job Run Duration");
+        add(sortByMax);
+    }
+
+    public void actionPerformed(ActionEvent e) {
+        String s = e.getActionCommand();
+        switch (s) {
+            case "sort-by-ID":
+                statsViewCanvas.jobStats.SortByID();
+                statsViewCanvas.repaint();
+                break;
+            case "sort-by-mean":
+                statsViewCanvas.jobStats.SortByMeanValue();
+                statsViewCanvas.repaint();
+                break;
+            case "sort-by-std-dev":
+                statsViewCanvas.jobStats.SortByStdDev();
+                statsViewCanvas.repaint();
+                break;
+            case "sort-by-min":
+                statsViewCanvas.jobStats.SortByMinValue();
+                statsViewCanvas.repaint();
+            break;
+            case "sort-by-max":
+                statsViewCanvas.jobStats.SortByMaxValue();
+                statsViewCanvas.repaint();
+            break;
+            default:
+                System.out.println("Unknown Action Command:" + s);
+                break;
+        }
+    }
+}
+
+public class JobStatsViewWindow extends JFrame {
+
+    public JobStatsViewWindow( JobStats jobStats, JobSpecificationMap jobSpecificationMap ) {
+
+        JobStatsViewCanvas statsViewCanvas = new JobStatsViewCanvas( jobStats, jobSpecificationMap);
+
+        JScrollPane scrollPane = new JScrollPane( statsViewCanvas );
+        scrollPane.setPreferredSize(new Dimension(800, 400));
+        scrollPane.getVerticalScrollBar().setUnitIncrement( 20 );
+
+        SortButtonsToolBar toolbar = new SortButtonsToolBar( statsViewCanvas);
+
+        JPanel scrollingJobStatsCanvas = new JPanel();
+        scrollingJobStatsCanvas.setPreferredSize(new Dimension(800, 400));
+        scrollingJobStatsCanvas.add(toolbar);
+        scrollingJobStatsCanvas.add(scrollPane);
+
+        scrollingJobStatsCanvas.setLayout( new BoxLayout(scrollingJobStatsCanvas, BoxLayout.Y_AXIS));
+
+        setTitle("Job Statistics");
+        // setSize(800, 500);
+        setPreferredSize(new Dimension(1200, 500));
+        add(scrollingJobStatsCanvas);
+        pack();
+        setVisible(true);
+        setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
+        setFocusable(true);
+        setVisible(true);
+
+        statsViewCanvas.repaint();
+    }
+}
--- a/trick_source/java/src/main/java/trick/jobperf/KeyedColorMap.java
+++ b/trick_source/java/src/main/java/trick/jobperf/KeyedColorMap.java
@ -0,0 +1,125 @@
+package trick.jobperf;
+
+import java.awt.*;
+import java.io.*;
+import java.util.*;
+
+/**
+* Class KeyedColorMap associates identifiers with unique RGB colors.
+*/
+public class KeyedColorMap {
+    private Map<String, Color> colorMap;
+    int minLuminance;
+    String fileName;
+
+    /**
+    * Constructor
+    */
+    public KeyedColorMap(String fileName) {
+        this.fileName = fileName;
+        colorMap = new HashMap<String, Color>();
+        minLuminance = 30;
+    }
+
+    /**
+    * Generate a random color, that's not too dark.
+    * @ return the generated color.
+    */
+    private Color generateColor () {
+        Random rand = new Random();
+        boolean found = false;
+        int R = 0;
+        int G = 0;
+        int B = 0;
+
+        while (!found) {
+            R = rand.nextInt(256);
+            G = rand.nextInt(256);
+            B = rand.nextInt(256);
+            found = true;
+            // Reference: https://www.w3.org/TR/AERT/#color-contrast
+            double luminance = (0.299*R + 0.587*G + 0.114*B);
+            if (luminance < minLuminance ) found = false;
+        }
+        return new Color( R,G,B);
+    }
+
+    /**
+    * Add an identifier, and a generated Color to the KeyedColorMap.
+    * The Color will be generated randomly.
+    * @ param identifier  Specifies the key for which a color will be generated.
+    */
+    public void addKey( String identifier ) {
+        if (!colorMap.containsKey(identifier)) {
+            colorMap.put(identifier, generateColor());
+        }
+    }
+
+    /**
+    * Given an identifier, return its color.
+    * @param identifier  the key.
+    * @return the Color associated with the key.
+    */
+    public Color getColor(String identifier) {
+        return colorMap.get(identifier);
+    }
+
+    /**
+    * Given a color, return the associated key, otherwise return null.
+    * @param searchColor  the Color to search for.
+    * @return the identifier associated with the searchColor.
+    */
+    public String getKeyOfColor(Color searchColor) {
+        for (Map.Entry<String, Color> entry : colorMap.entrySet()) {
+            String id = entry.getKey();
+            Color color = entry.getValue();
+            if (color.getRGB() == searchColor.getRGB()) {
+                return id;
+            }
+        }
+        return null;
+    }
+
+    /**
+    * Write the identifier, color key/value pairs of the KeyedColorMap to a file.
+    * @param fileName
+    */
+    public void writeFile() throws IOException {
+        BufferedWriter out = new BufferedWriter( new FileWriter(fileName) );
+        for (Map.Entry<String, Color> entry : colorMap.entrySet()) {
+            String id = entry.getKey();
+            Color color = entry.getValue();
+            String line = String.format(id + "," + color.getRed() +
+                                             "," + color.getGreen() +
+                                             "," + color.getBlue() + "\n");
+            out.write(line, 0, line.length());
+        }
+        out.flush();
+        out.close();
+    } // method writeFile
+
+    /**
+    * Read identifier, color key-value pairs into the KeyedColorMap from a file.
+    * @param fileName
+    */
+    public void readFile() throws IOException {
+        try {
+            BufferedReader in = new BufferedReader( new FileReader(fileName) );
+            String line;
+            String field[];
+
+            while( (line = in.readLine()) !=null) {
+                field   = line.split(",");
+                String id    = field[0];
+                int R = Integer.parseInt( field[1]);
+                int G = Integer.parseInt( field[2]);
+                int B = Integer.parseInt( field[3]);
+                colorMap.put(id, new Color(R,G,B));
+            }
+            in.close();
+        } catch ( java.io.FileNotFoundException e ) {
+           System.out.println("File \"" + fileName + "\" not found.\n");
+        }
+    } // method readFile
+
+} // class KeyedColorMap
--- a/trick_source/java/src/main/java/trick/jobperf/RunRegistry.java
+++ b/trick_source/java/src/main/java/trick/jobperf/RunRegistry.java
@ -0,0 +1,73 @@
+package trick.jobperf;
+
+import java.lang.Math;
+import java.util.*;
+
+/**
+* Class RunRegistry represents a list of timeSpan's on which we can calculate
+* the average (mean), standard deviation, minimum, and maximum of the timeSpans
+* in the list.
+*/
+public class RunRegistry {
+    ArrayList<TimeSpan> timeSpanList;
+    /*
+    * Constructor
+    */
+    public RunRegistry() {
+        timeSpanList = new ArrayList<TimeSpan>();
+    }
+    void addTimeSpan(double start, double stop) {
+        TimeSpan timeSpan = new TimeSpan(start, stop);
+        timeSpanList.add(timeSpan);
+    }
+    void addTimeSpan(TimeSpan timeSpan) {
+        timeSpanList.add(timeSpan);
+    }
+    double getMeanDuration() {
+        double mean = 0.0;
+        int N = timeSpanList.size();
+        if (N > 0) {
+            double sum = 0.0;
+            for (TimeSpan timeSpan : timeSpanList ) {
+                sum += timeSpan.getDuration();
+            }
+            mean = sum / N;
+        }
+        return mean;
+    }
+    double getStdDev() {
+        double stddev = 0.0;
+        int N = timeSpanList.size();
+        if (N > 0) {
+            double sum = 0.0;
+            double mean = getMeanDuration();
+            for (TimeSpan timeSpan : timeSpanList ) {
+                double duration = timeSpan.getDuration();
+                double difference = duration - mean;
+                sum += difference * difference;
+            }
+            stddev = Math.sqrt( sum / N );
+        }
+        return stddev;
+    }
+    double getMaxDuration() {
+        double maxDuration = Double.MIN_VALUE;
+        for (TimeSpan timeSpan : timeSpanList ) {
+            double duration = timeSpan.getDuration();
+            if (duration > maxDuration) {
+                maxDuration = duration;
+            }
+        }
+        return maxDuration;
+    }
+    double getMinDuration() {
+        double minDuration = Double.MAX_VALUE;
+        for (TimeSpan timeSpan : timeSpanList ) {
+            double duration = timeSpan.getDuration();
+            if (duration < minDuration) {
+                minDuration = duration;
+            }
+        }
+        return minDuration;
+    }
+}
--- a/trick_source/java/src/main/java/trick/jobperf/StatisticsRecord.java
+++ b/trick_source/java/src/main/java/trick/jobperf/StatisticsRecord.java
@ -0,0 +1,28 @@
+package trick.jobperf;
+
+/**
+* Class StatisticsRecord represents the statistics, i.e., mean, std deviation,
+* max value, and min value of the run-duration of an identified Trick job.
+*/
+public class StatisticsRecord {
+    public String id;
+    public double meanValue;
+    public double stddev;
+    public double maxValue;
+    public double minValue;
+    /**
+     * Constructor
+     * @param id - the job identifier.
+     * @param mean - the mean value of job duration.
+     * @param stddev - the standard deviation of job duration.
+     * @param min - the minimum value of job duration.
+     * @param max - the maximum value of job duration.
+     */
+    public StatisticsRecord( String id, double mean, double stddev, double min, double max) {
+        this.id = id;
+        this.meanValue = mean;
+        this.stddev = stddev;
+        this.minValue = min;
+        this.maxValue = max;
+    }
+}
--- a/trick_source/java/src/main/java/trick/jobperf/TimeSpan.java
+++ b/trick_source/java/src/main/java/trick/jobperf/TimeSpan.java
@ -0,0 +1,24 @@
+package trick.jobperf;
+
+/**
+* Class TimeSpan represents a span of time.
+*/
+public class TimeSpan {
+    public double start;
+    public double stop;
+    /**
+     * Constructor
+     * @param begin the start time.
+     * @param end the end time.
+     */
+    public TimeSpan( double begin, double end) {
+        start = begin;
+        stop  = end;
+    }
+    /**
+     * @return the stop time minus the start time.
+     */
+    public double getDuration() {
+        return stop - start;
+    }
+}
--- a/trick_source/java/src/main/java/trick/jobperf/TraceViewCanvas.java
+++ b/trick_source/java/src/main/java/trick/jobperf/TraceViewCanvas.java
@ -0,0 +1,456 @@
+package trick.jobperf;
+
+import java.awt.*;
+import java.awt.event.*;
+import java.awt.image.BufferedImage;
+import java.io.*;
+import java.util.*;
+import java.util.List;
+import javax.swing.*;
+import javax.swing.event.*;
+
+/**
+* Class TraceViewCanvas renders the simulation timeline data stored in
+* an ArrayList of JobExecutionEvent's [jobExecEvtList]. Information regarding
+* mouse clicks are sent to the TraceViewOutputToolBar [outputToolBar.]
+* @author John M. Penn
+*/
+public class TraceViewCanvas extends JPanel {
+
+    public static final int MIN_TRACE_WIDTH = 12;
+    public static final int DEFAULT_TRACE_WIDTH = 18;
+    public static final int MAX_TRACE_WIDTH = 24;
+    public static final int LEFT_MARGIN = 100;
+    public static final int RIGHT_MARGIN = 100;
+    public static final int TOP_MARGIN = 50;
+    public static final int BOTTOM_MARGIN = 20;
+    public static final int DEFAULT_FRAMES_TO_RENDER = 100;
+
+    public KeyedColorMap idToColorMap;
+    public JobSpecificationMap jobSpecificationMap;
+    public JobStats jobStats;
+
+    private int traceWidth;
+    private double frameSize;
+    private double totalDuration;
+    private FrameRecord[] frameArray;
+    private int selectedFrameNumber;
+    private FrameRange frameRenderRange;
+    private BufferedImage image;
+    private TraceViewOutputToolBar outputToolBar;
+    private Cursor crossHairCursor;
+    private Cursor defaultCursor;
+    private Font frameFont12;
+    private Font frameFont18;
+
+    public class FrameRange {
+        public int first;
+        public int last;
+        FrameRange (int first, int last) {
+            this.first = first;
+            this.last = last;
+        }
+        public boolean contains(int n) {
+            return ((first <= n) && (n <= last));
+        }
+        public int size() {
+            return last - first + 1;
+        }
+    }
+
+    /**
+     * Constructor
+     * @param jobExecEvtList the job time line data.
+     * @param outputToolBar the toolbar to which data is to be sent for display.
+     */
+    public TraceViewCanvas( ArrayList<JobExecutionEvent> jobExecEvtList,
+                            TraceViewOutputToolBar outputToolBar,
+                            KeyedColorMap idToColorMap,
+                            JobSpecificationMap jobSpecificationMap ) {
+
+        traceWidth = DEFAULT_TRACE_WIDTH;
+        frameSize = 1.0;
+        image = null;
+        selectedFrameNumber = 0;
+
+        this.outputToolBar = outputToolBar;
+        this.idToColorMap = idToColorMap;
+        this.jobSpecificationMap = jobSpecificationMap;
+
+        jobStats = new JobStats(jobExecEvtList);
+
+        crossHairCursor = new Cursor( Cursor.CROSSHAIR_CURSOR );
+        defaultCursor = new Cursor( Cursor.DEFAULT_CURSOR );
+
+        frameFont12 = new Font("Arial", Font.PLAIN, 12);
+        frameFont18 = new Font("Arial", Font.PLAIN, 18);
+
+        try {
+           boolean wasTOF = false;
+           boolean wasEOF = false;
+
+            List<FrameRecord> frameList = new ArrayList<FrameRecord>();
+            FrameRecord frameRecord = new FrameRecord();
+            for (JobExecutionEvent jobExec : jobExecEvtList ) {
+
+                if ((!wasTOF && jobExec.isTOF) || ( wasEOF && !jobExec.isEOF )) {
+
+                    // Wrap up the previous frame record.
+                     frameRecord.stop = jobExec.start;
+                     frameRecord.CalculateJobContainment();
+                     frameList.add(frameRecord);
+
+                     // Start a new frame record.
+                     frameRecord = new FrameRecord();
+                     frameRecord.start = jobExec.start;
+                 }
+                 frameRecord.jobEvents.add(jobExec);
+
+                 wasTOF = jobExec.isTOF;
+                 wasEOF = jobExec.isEOF;
+
+                 idToColorMap.addKey(jobExec.id);
+            }
+
+             frameArray = frameList.toArray( new FrameRecord[ frameList.size() ]);
+
+            // Determine the total duration and the average frame size. Notice
+            // that we skip the first frame.
+            totalDuration = 0.0;
+            for (int n=1; n < frameArray.length; n++) {
+                totalDuration += frameArray[n].getDuration();
+            }
+            frameSize = totalDuration/(frameArray.length-1);
+
+            // Set the range of frames to be rendered.
+            int last_frame_to_render = frameArray.length-1;
+            if ( frameArray.length > DEFAULT_FRAMES_TO_RENDER) {
+                last_frame_to_render = DEFAULT_FRAMES_TO_RENDER-1;
+            }
+            frameRenderRange = new FrameRange(0, last_frame_to_render);
+
+            // Write the color map to a file.
+            idToColorMap.writeFile();
+
+           // System.out.println("File loaded.\n");
+        } catch ( java.io.IOException e ) {
+           System.out.println("IO Exception.\n");
+           System.exit(0);
+        }
+
+        setPreferredSize(new Dimension(500, neededPanelHeight()));
+
+        ViewListener viewListener = new ViewListener();
+         addMouseListener(viewListener);
+         addMouseMotionListener(viewListener);
+    }
+
+    public int getFrameTotal() {
+        return frameArray.length;
+    }
+
+    public int getFirstRenderFrame() {
+        return frameRenderRange.first;
+    }
+
+    public int getLastRenderFrame() {
+        return frameRenderRange.last;
+    }
+
+    public void moveRenderFrameRangeBy(int advance) {
+        if ( frameArray.length > 50 ) {
+
+            int maxIndex = frameArray.length - 1;
+            int tFirst = frameRenderRange.first + advance;
+            int tLast = frameRenderRange.last + advance;
+
+            if (tLast > maxIndex) {
+                tLast = maxIndex;
+                tFirst = maxIndex - 49;
+            } else if (tFirst < 0) {
+                tFirst = 0;
+                tLast = 49;
+            }
+            frameRenderRange = new FrameRange(tFirst, tLast);
+            setPreferredSize(new Dimension(500, neededPanelHeight()));
+            repaint();
+        }
+    }
+
+    public void setFirstRenderFrame(int first) throws InvalidFrameBoundsExpection {
+        if ( (first >= 0) && (first <= frameRenderRange.last)) {
+            frameRenderRange = new FrameRange(first, frameRenderRange.last);
+            setPreferredSize(new Dimension(500, neededPanelHeight()));
+            repaint();
+        } else {
+            throw new InvalidFrameBoundsExpection("");
+        }
+    }
+
+    public void setLastRenderFrame(int last) throws InvalidFrameBoundsExpection {
+        if ((last >= frameRenderRange.first) && (last < frameArray.length)) {
+            frameRenderRange = new FrameRange(frameRenderRange.first, last);
+            // Re-render this TraceViewCanvas.
+            setPreferredSize(new Dimension(500, neededPanelHeight()));
+            repaint();
+        } else {
+            throw new InvalidFrameBoundsExpection("");
+        }
+    }
+
+    /**
+     * @return the current working frame size (seconds) used for rendering.
+     * Initially this is estimated from the timeline data, but it can be set to
+     * the actual realtime frame size of the user's sim.
+     */
+    public double getFrameSize() {
+        return frameSize;
+    }
+    /**
+     * Set the frame size (seconds) to be used for rendering the timeline data.
+     * @param duration the frame size.
+     */
+    public void setFrameSize(double time) {
+        frameSize = time;
+        repaint();
+    }
+
+    /**
+     * Increment the width to be used to render the job traces if the current
+     * trace width is less than MAX_TRACE_WIDTH.
+     */
+    public void incrementTraceWidth() {
+        if (traceWidth < MAX_TRACE_WIDTH) {
+            traceWidth ++;
+            repaint();
+        }
+    }
+
+    /**
+     * Decrement the width to be used to render the job traces if the current
+     * trace width is greater than MIN_TRACE_WIDTH.
+     */
+    public void decrementTraceWidth() {
+        if (traceWidth > MIN_TRACE_WIDTH) {
+            traceWidth --;
+            repaint();
+        }
+    }
+
+    /**
+     *
+     */
+    public void displaySelectedFrame() {
+        FrameViewWindow window = new FrameViewWindow( this, frameArray[selectedFrameNumber], selectedFrameNumber);
+    }
+
+    /**
+     *
+     */
+    public void displayJobStatsWindow() {
+        JobStatsViewWindow window = new JobStatsViewWindow( jobStats, jobSpecificationMap);
+    }
+
+    /**
+     * @return true if the trace rectangle contains the point <x,y>, otherwise
+     * false.
+     */
+    private boolean traceRectContains(int x, int y) {
+        int traceRectXMax = getWidth() - RIGHT_MARGIN;
+        if ( x < (LEFT_MARGIN)) return false;
+        if ( x > (traceRectXMax)) return false;
+        if (( y < TOP_MARGIN) || (y > (TOP_MARGIN + traceRectHeight()))) return false;
+        return true;
+    }
+
+    /**
+     * Class ViewListener monitors mouse activity within the TraceViewCanvas.
+     */
+    private class ViewListener extends MouseInputAdapter {
+
+        @Override
+        public void mouseReleased(MouseEvent e) {
+            int x = e.getX();
+            int y = e.getY();
+            Color color = new Color ( image.getRGB(x,y) );
+
+            // Get and display the ID of the job associated with the color.
+            String id = idToColorMap.getKeyOfColor( color );
+            outputToolBar.setJobID(id);
+
+            // Get and display the job name associated with the ID.
+            JobSpecification jobSpec = jobSpecificationMap.getJobSpecification(id);
+            if (jobSpec != null) {
+                outputToolBar.setJobName(jobSpec.name);
+                outputToolBar.setJobClass(jobSpec.jobClass);
+            }
+
+            // Determine the frame number that we clicked on from the y-
+            // coordinate of the click position.
+            if ( y > TOP_MARGIN) {
+                selectedFrameNumber = (y - TOP_MARGIN) / traceWidth + frameRenderRange.first;
+            }
+
+            // Determine the subframe-time where we clicked from the x-coordinate
+            // of the click position.
+            double subFrameClickTime = 0.0;
+            if ( traceRectContains(x, y)) {
+                double pixelsPerSecond = (double)traceRectWidth() / frameSize;
+                subFrameClickTime = (x - LEFT_MARGIN) / pixelsPerSecond;
+            }
+
+            /**
+             * If we clicked on a job trace (above), show the start and stop
+             * times of the job, otherwise clear the start and stop fields.
+             */
+            if (id != null) {
+                FrameRecord frame = frameArray[selectedFrameNumber];
+                Double clickTime = frame.start + subFrameClickTime;
+                for (JobExecutionEvent jobExec : frame.jobEvents) {
+                    if (id.equals( jobExec.id) &&
+                        clickTime >= jobExec.start &&
+                        clickTime <= jobExec.stop ) {
+                        outputToolBar.setJobTimes(jobExec.start, jobExec.stop);
+                    }
+                }
+                repaint();
+            } else {
+                outputToolBar.clearJobFields();
+            }
+        }
+
+        /**
+         * Set the cursor to a crossHairCursor if it's over the frame traces,
+         * otherwise, set it to the defaultCursor.
+         */
+        @Override
+        public void mouseMoved(MouseEvent e) {
+            int x = e.getX();
+            int y = e.getY();
+            if ( traceRectContains(x, y)) {
+                setCursor(crossHairCursor);
+            } else {
+                setCursor(defaultCursor);
+            }
+        }
+    }
+
+    /**
+     * @return the height of the trace rectangle.
+     */
+    private int traceRectHeight() {
+        return traceWidth * frameRenderRange.size();
+    }
+
+    /**
+     * @return the width of the trace rectangle.
+     */
+    private int traceRectWidth() {
+        return ( getWidth() - LEFT_MARGIN - RIGHT_MARGIN);
+    }
+
+    /**
+     * Calculate the height of the TraceViewCanvas (JPanel) needed to render the
+     * selected range of frames.
+     */
+    private int neededPanelHeight() {
+        return traceWidth * frameRenderRange.size() + TOP_MARGIN + BOTTOM_MARGIN;
+    }
+
+    /**
+     * Render the job execution traces in the jobExecEvtList.
+     */
+    private void doDrawing(Graphics g) {
+        Graphics2D g2d = (Graphics2D) g;
+
+        RenderingHints rh = new RenderingHints(
+                RenderingHints.KEY_ANTIALIASING,
+                RenderingHints.VALUE_ANTIALIAS_ON);
+
+        rh.put(RenderingHints.KEY_RENDERING,
+               RenderingHints.VALUE_RENDER_QUALITY);
+
+        int traceRectHeight = traceRectHeight();
+        int traceRectWidth = traceRectWidth();
+        double pixelsPerSecond = (double)traceRectWidth / frameSize;
+
+        // Panel Background Color Fill
+        g2d.setPaint(Color.WHITE);
+        g2d.fillRect(0, 0, getWidth(), getHeight());
+
+        // Frame Trace Rectangle Fill
+        g2d.setPaint(Color.BLACK);
+        g2d.fillRect(LEFT_MARGIN, TOP_MARGIN, traceRectWidth, traceRectHeight());
+
+        if (traceWidth >= DEFAULT_TRACE_WIDTH) {
+            g2d.setFont(frameFont18);
+        } else {
+            g2d.setFont(frameFont12);
+        }
+
+        FontMetrics fm = g2d.getFontMetrics();
+        int TX = 0;
+
+        String FN_text = "Frame #";
+        TX = (LEFT_MARGIN - fm.stringWidth(FN_text))/2;
+        g2d.drawString (FN_text, TX, 40);
+
+        g2d.drawString ("Top of Frame", LEFT_MARGIN, 40);
+
+        String EOF_text = "End of Frame";
+        TX = LEFT_MARGIN + traceRectWidth - fm.stringWidth(EOF_text);
+        g2d.drawString (EOF_text, TX, 40);
+
+        // Draw each frame in the selected range of frames to be rendered.
+        for (int n = frameRenderRange.first;
+                 n <= frameRenderRange.last;
+                 n++) {
+
+            FrameRecord frame = frameArray[n];
+            int jobY = TOP_MARGIN + (n - frameRenderRange.first) * traceWidth;
+
+            // Draw frame number.
+            if (n == selectedFrameNumber) {
+                g2d.setPaint(Color.RED);
+                // g2d.drawString ( "\u25b6", 20, jobY + traceWidth - 2);
+                g2d.drawString ( "\u25c0", 80, jobY + traceWidth - 2);
+                // g2d.fillRect(LEFT_MARGIN-traceWidth, jobY, traceWidth, traceWidth);
+            } else {
+                g2d.setPaint(Color.BLACK);
+            }
+
+            g2d.drawString ( String.format("%d", n), 40, jobY + traceWidth - 2);
+
+            // Draw the frame
+            // NOTE that the jobEvents within the frame are expected to be sorted in duration-order,
+            // so that smaller sub-jobs are not obscurred.
+
+            for (JobExecutionEvent jobExec : frame.jobEvents) {
+                int jobStartX = (int)((jobExec.start - frame.start) * pixelsPerSecond) + LEFT_MARGIN;
+                int jobWidth  = (int)((jobExec.stop - jobExec.start) * pixelsPerSecond);
+                g2d.setPaint( idToColorMap.getColor( jobExec.id ) );
+                int jobHeight = traceWidth - 2;
+                if (jobExec.contained > 1) {
+                    jobHeight = traceWidth / jobExec.contained;
+                }
+
+                // int jobStartY = jobY + (traceWidth - 2) - jobHeight;
+                g2d.fillRect(jobStartX, jobY, jobWidth, jobHeight);
+
+            }
+        }
+    }
+
+    /**
+     * This function paints the TraceViewCanvas (i.e, JPanel) when required.
+     */
+    @Override
+    public void paintComponent(Graphics g) {
+        super.paintComponent(g);
+        image = new BufferedImage(getWidth(), getHeight(), BufferedImage.TYPE_INT_RGB);
+        Graphics2D g2 = image.createGraphics();
+        doDrawing(g2);
+        g.drawImage(image, 0, 0, this);
+        g2.dispose();
+    }
+}
--- a/trick_source/java/src/main/java/trick/jobperf/TraceViewInputToolBar.java
+++ b/trick_source/java/src/main/java/trick/jobperf/TraceViewInputToolBar.java
@ -0,0 +1,176 @@
+package trick.jobperf;
+
+import java.awt.*;
+import java.awt.event.*;
+import java.awt.image.BufferedImage;
+import java.io.*;
+
+import javax.imageio.ImageIO;
+import javax.swing.*;
+import java.net.URL;
+
+/**
+* Class TraceViewInputToolBar initially displays an estimate of the frame size
+* for the JobPerf input timeline data. A user may also enter the intended frame
+* size into the JTextField, and pressing the "Set" button, which calls
+* traceView.setFrameSize( newFrameSize );
+*
+* Class TraceViewInputToolBar aggregates the following GUI components:
+* TraceViewInputToolBar (isa JToolBar)
+*     JLabel ()
+*     JTextField [frameSizeField]
+*     JLabel
+*     JLabel
+*     JTextField [firstRenderFrameField]
+*     JLabel
+*     JTextField [lastRenderFrameField]
+*/
+public class TraceViewInputToolBar extends JToolBar implements ActionListener {
+
+    private TraceViewCanvas traceView;
+    private JTextField frameSizeField;
+    private JButton frameDetailsButton;
+    private JButton advanceRangeButton;
+    private JButton retreatRangeButton;
+    private JTextField firstRenderFrameField;
+    private JTextField lastRenderFrameField;
+    /**
+     * Constructor
+     * @param tvc TraceViewCanvas to be controlled.
+     */
+    public TraceViewInputToolBar (TraceViewCanvas tvc) {
+        traceView = tvc;
+
+        add( new JLabel("           Frame Size (Avg): "));
+        frameSizeField = new JTextField(10);
+        frameSizeField.setText( String.format("%8.4f", traceView.getFrameSize()) );
+        add(frameSizeField);
+        frameSizeField.addKeyListener( new KeyAdapter() {
+            @Override
+            public void keyPressed(KeyEvent e) {
+                if (e.getKeyCode() == KeyEvent.VK_ENTER) {
+                    setFrameSize();
+                }
+            }
+        });
+
+        frameDetailsButton = new JButton("Frame Details");
+        frameDetailsButton.addActionListener(this);
+        frameDetailsButton.setActionCommand("display-frame-details");
+        frameDetailsButton.setToolTipText("Display the job details of the selected frame.");
+        add(frameDetailsButton);
+
+        add( new JLabel( String.format("          Frames : [%d ... %d]", 0, traceView.getFrameTotal()-1 )));
+
+        add( new JLabel("    Selected Range: "));
+
+        firstRenderFrameField = new JTextField(10);
+        firstRenderFrameField.setText( String.format("%d", traceView.getFirstRenderFrame()) );
+        add(firstRenderFrameField);
+        firstRenderFrameField.addKeyListener( new KeyAdapter() {
+            @Override
+            public void keyPressed(KeyEvent e) {
+                if (e.getKeyCode() == KeyEvent.VK_ENTER) {
+                     setFirstRenderFrame();
+                }
+            }
+        });
+
+        add( new JLabel("..."));
+        lastRenderFrameField = new JTextField(10);
+        lastRenderFrameField.setText( String.format("%d", traceView.getLastRenderFrame()) );
+        add(lastRenderFrameField);
+        lastRenderFrameField.addKeyListener( new KeyAdapter() {
+            @Override
+            public void keyPressed(KeyEvent e) {
+                if (e.getKeyCode() == KeyEvent.VK_ENTER) {
+                     setLastRenderFrame();
+                }
+            }
+        });
+
+        advanceRangeButton = new JButton("\u25bc");
+        advanceRangeButton.addActionListener(this);
+        advanceRangeButton.setActionCommand("advance-frame-range");
+        advanceRangeButton.setToolTipText("Advance the selected range of frames to be displayed.");
+        add(advanceRangeButton);
+
+        retreatRangeButton = new JButton("\u25b2");
+        retreatRangeButton.addActionListener(this);
+        retreatRangeButton.setActionCommand("retreat-frame-range");
+        retreatRangeButton.setToolTipText("Retreat the selected range of frames to be displayed.");
+        add(retreatRangeButton);
+
+        add( new JLabel("               "));
+
+        // Add Trick LOGO.
+        try { 
+            BufferedImage image = ImageIO.read(getClass().getResource("/trick/common/resources/trick_small.gif"));
+            add( new JLabel( new ImageIcon(image)));
+        } catch (IOException e) {
+            System.out.println("Failed to load image.");
+        }
+        
+    }
+
+    @Override
+    public void actionPerformed(ActionEvent e) {
+        String s = e.getActionCommand();
+        switch (s) {
+            case "display-frame-details":
+                traceView.displaySelectedFrame();
+            break;
+            case "advance-frame-range":
+                moveRenderFrameRangeBy(50);
+            break;
+            case "retreat-frame-range":
+                moveRenderFrameRangeBy(-50);
+            break;
+            default:
+                System.out.println("Unknown Action Command:" + s);
+            break;
+        }
+    }
+
+    private void moveRenderFrameRangeBy(int advance) {
+        traceView.moveRenderFrameRangeBy(advance);
+        firstRenderFrameField.setText( String.format("%d", traceView.getFirstRenderFrame()));
+        lastRenderFrameField.setText( String.format("%d", traceView.getLastRenderFrame()));
+    }
+
+    private void setFirstRenderFrame() {
+        int newStartFrame = 0;
+        try {
+            newStartFrame = Integer.parseInt( firstRenderFrameField.getText() );
+            traceView.setFirstRenderFrame( newStartFrame );
+        } catch ( NumberFormatException e) {
+            firstRenderFrameField.setText( String.format("%d", traceView.getFirstRenderFrame()));
+        } catch ( InvalidFrameBoundsExpection e) {
+            firstRenderFrameField.setText( String.format("%d", traceView.getFirstRenderFrame()));
+        }
+    }
+
+    private void setLastRenderFrame() {
+        int newFinalFrame = 0;
+        try {
+            newFinalFrame = Integer.parseInt( lastRenderFrameField.getText() );
+            traceView.setLastRenderFrame( newFinalFrame );
+        } catch ( NumberFormatException e) {
+            lastRenderFrameField.setText( String.format("%d", traceView.getLastRenderFrame()));
+        } catch (InvalidFrameBoundsExpection e) {
+            lastRenderFrameField.setText( String.format("%d", traceView.getLastRenderFrame()));
+        }
+    }
+
+    private void setFrameSize() {
+        double newFrameSize = 0.0;
+        try {
+            newFrameSize = Double.parseDouble( frameSizeField.getText() );
+        } catch ( NumberFormatException e) {
+            frameSizeField.setText( String.format("%8.4f", traceView.getFrameSize()) );
+        }
+        if ( newFrameSize > 0.0) {
+            traceView.setFrameSize( newFrameSize );
+        }
+    }
+}
--- a/trick_source/java/src/main/java/trick/jobperf/TraceViewMenuBar.java
+++ b/trick_source/java/src/main/java/trick/jobperf/TraceViewMenuBar.java
@ -0,0 +1,98 @@
+package trick.jobperf;
+
+import java.awt.*;
+import java.awt.event.*;
+import java.io.*;
+import javax.swing.*;
+
+/**
+* Class TraceViewMenuBar represents the menu bar of the JobPerf application.
+* It aggregates the following GUI components:
+* JMenuBar [this]
+*     JMenu [fileMenu]
+*         JMenuItem [fileMenuExit], Action: Call System.exit(0);
+*     JMenu [viewMenu]
+*         JMenu [traceSizeMenu]
+*             JMenuItem [traceSizeIncrease], Action: Call traceView.incrementTraceWidth().
+*             JMenuItem [traceSizeDecrease], Action: Call traceView.decrementTraceWidth()
+*/
+public class TraceViewMenuBar extends JMenuBar implements ActionListener {
+
+    private TraceViewCanvas traceView;
+
+    /**
+     * Constructor
+     * @param tvc the TraceViewCanvas to be controlled by this menu bar.
+     */
+    public TraceViewMenuBar(TraceViewCanvas tvc) {
+        traceView = tvc;
+
+        JMenu fileMenu = new JMenu("File");
+        JMenuItem fileMenuExit = new JMenuItem("Exit");
+        fileMenuExit.setActionCommand("exit");
+        KeyStroke ctrlQ  = KeyStroke.getKeyStroke('Q', InputEvent.CTRL_MASK );
+        fileMenuExit.setAccelerator(ctrlQ);
+        fileMenuExit.addActionListener(this);
+        fileMenu.add(fileMenuExit);
+        add(fileMenu);
+
+        JMenu viewMenu = new JMenu("View");
+
+        JMenuItem traceSizeIncrease = new JMenuItem("Increase Trace Width");
+        traceSizeIncrease.setActionCommand("increase-trace_width");
+        KeyStroke ctrlPlus  = KeyStroke.getKeyStroke('=', InputEvent.CTRL_MASK );
+        traceSizeIncrease.setAccelerator(ctrlPlus);
+        traceSizeIncrease.addActionListener(this);
+        viewMenu.add(traceSizeIncrease);
+
+        JMenuItem traceSizeDecrease = new JMenuItem("Decrease Trace Width");
+        traceSizeDecrease.setActionCommand("decrease-trace_width");
+        KeyStroke ctrlMinus = KeyStroke.getKeyStroke('-', InputEvent.CTRL_MASK);
+        traceSizeDecrease.setAccelerator(ctrlMinus);
+        traceSizeDecrease.addActionListener(this);
+        viewMenu.add(traceSizeDecrease);
+
+        viewMenu.addSeparator();
+
+        JMenuItem showFrame = new JMenuItem("Frame Details ...");
+        showFrame.setActionCommand("expand-selected-frame");
+        KeyStroke ctrlF = KeyStroke.getKeyStroke('F', InputEvent.CTRL_MASK);
+        showFrame.setAccelerator(ctrlF);
+        showFrame.addActionListener(this);
+        viewMenu.add(showFrame);
+
+        JMenuItem showStats = new JMenuItem("Job Statistics ...");
+        showStats.setActionCommand("show-job-stats");
+        KeyStroke ctrlV = KeyStroke.getKeyStroke('V', InputEvent.CTRL_MASK);
+        showStats.setAccelerator(ctrlV);
+        showStats.addActionListener(this);
+        viewMenu.add(showStats);
+
+        add(viewMenu);
+
+    }
+    @Override
+    public void actionPerformed(ActionEvent e) {
+        String s = e.getActionCommand();
+        switch (s) {
+            case "increase-trace_width":
+                traceView.incrementTraceWidth();
+            break;
+            case "decrease-trace_width":
+                traceView.decrementTraceWidth();
+            break;
+            case "expand-selected-frame":
+                traceView.displaySelectedFrame();
+            break;
+            case "show-job-stats":
+                traceView.jobStats.SortByID();
+                traceView.displayJobStatsWindow();
+            break;
+            case "exit":
+                System.exit(0);
+            default:
+                System.out.println("Unknown Action Command:" + s);
+            break;
+        }
+    }
+}
--- a/trick_source/java/src/main/java/trick/jobperf/TraceViewOutputToolBar.java
+++ b/trick_source/java/src/main/java/trick/jobperf/TraceViewOutputToolBar.java
@ -0,0 +1,104 @@
+package trick.jobperf;
+
+import java.awt.*;
+import javax.swing.*;
+
+/**
+* Class TraceViewOutputToolBar displays information output from a
+* TraceViewCanvas.
+*/
+class TraceViewOutputToolBar extends JToolBar {
+    private JTextField IDField;
+    private JTextField nameField;
+    private JTextField classField;
+    private JTextField startField;
+    private JTextField stopField;
+    // private JTextField frameNumberField;
+    private JTextField durationField;
+
+    /**
+     * Constructor
+     */
+    public TraceViewOutputToolBar () {
+
+        add( new JLabel(" Job ID: "));
+        IDField = new JTextField(5);
+        IDField.setEditable(false);
+        IDField.setText( "");
+        add(IDField);
+
+        add( new JLabel(" Name: "));
+        nameField = new JTextField(25);
+        nameField.setEditable(false);
+        nameField.setText( "");
+        add(nameField);
+
+        add( new JLabel(" Class: "));
+        classField = new JTextField(12);
+        classField.setEditable(false);
+        classField.setText( "");
+        add(classField);
+
+        add( new JLabel(" Start: "));
+        startField = new JTextField(6);
+        startField.setEditable(false);
+        startField.setText( "");
+        add(startField);
+
+        add( new JLabel(" Stop: "));
+        stopField = new JTextField(6);
+        stopField.setEditable(false);
+        stopField.setText( "");
+        add(stopField);
+
+        add( new JLabel(" Duration: "));
+        durationField = new JTextField(6);
+        durationField.setEditable(false);
+        durationField.setText( "");
+        add(durationField);
+    }
+
+    /**
+     * @param id job identifier to display.
+     */
+    public void setJobID(String id) {
+        IDField.setText( id );
+    }
+
+    /**
+     * @param id job identifier to display.
+     */
+    public void setJobName(String name) {
+        nameField.setText(name);
+    }
+
+    /**
+     * @param id job class to display.
+     */
+    public void setJobClass(String name) {
+        classField.setText(name);
+    }
+
+    /**
+     * @param time to be displayed in the job start field.
+     */
+    public void setJobTimes(Double start_time, Double stop_time) {
+        startField.setText( String.format("%8.4f", start_time) );
+        stopField.setText( String.format("%8.4f", stop_time) );
+        Double duration = stop_time - start_time;
+        durationField.setText( String.format("%8.4f", duration) );
+    }
+
+    /**
+     * Clear the startField and stopField.
+     */
+    public void clearJobFields() {
+        nameField.setText("");
+        classField.setText("");
+        startField.setText("");
+        stopField.setText("");
+        durationField.setText("");
+        IDField.setText("");
+    }
+
+}
--- a/trick_source/java/src/main/java/trick/jobperf/TraceViewWindow.java
+++ b/trick_source/java/src/main/java/trick/jobperf/TraceViewWindow.java
@ -0,0 +1,65 @@
+package trick.jobperf;
+
+import java.awt.*;
+import java.util.*;
+import javax.swing.*;
+
+/**
+* Class TraceViewWindow represents the main window of the JobPerf application.
+* It aggregates the following GUI components:
+*
+* - TraceViewMenuBar [menuBar]
+* - TraceViewInputToolBar [toolbar]
+* - JPanel [mainPanel]
+*     - JPanel [tracePanel]
+*         - JScrollPane [scrollPane]
+*             - TraceViewCanvas [traceViewCanvas]
+* - TraceViewOutputToolBar [outputToolBar]
+*/
+public class TraceViewWindow extends JFrame {
+
+    /**
+     * Constructor
+     * @param jobExecList an ArrayList of JobExecutionEvent, i.e., the job timeline data.
+     */
+    public TraceViewWindow( ArrayList<JobExecutionEvent> jobExecList,
+                            KeyedColorMap idToColorMap,
+                            JobSpecificationMap jobSpecificationMap ) {
+
+        TraceViewOutputToolBar outputToolBar = new TraceViewOutputToolBar();
+
+        TraceViewCanvas traceViewCanvas = new TraceViewCanvas( jobExecList, outputToolBar, idToColorMap, jobSpecificationMap);
+
+        TraceViewMenuBar menuBar = new TraceViewMenuBar( traceViewCanvas);
+        setJMenuBar(menuBar);
+
+        TraceViewInputToolBar nToolBar = new TraceViewInputToolBar( traceViewCanvas );
+        add(nToolBar, BorderLayout.NORTH);
+
+        JScrollPane scrollPane = new JScrollPane( traceViewCanvas );
+        scrollPane.setPreferredSize(new Dimension(800, 400));
+        scrollPane.getVerticalScrollBar().setUnitIncrement( 20 );
+
+        JPanel tracePanel = new JPanel();
+        tracePanel.setPreferredSize(new Dimension(800, 400));
+        tracePanel.add(scrollPane);
+        tracePanel.setLayout(new BoxLayout(tracePanel, BoxLayout.X_AXIS));
+
+        JPanel mainPanel  = new JPanel();
+        mainPanel.setLayout(new BoxLayout(mainPanel, BoxLayout.Y_AXIS));
+        mainPanel.add(tracePanel);
+
+        add(outputToolBar, BorderLayout.SOUTH);
+
+        setTitle("JobPerf");
+        setSize(800, 500);
+        add(mainPanel);
+        pack();
+        setVisible(true);
+        setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+        setFocusable(true);
+        setVisible(true);
+
+        traceViewCanvas.repaint();
+    }
+}
--- a/trick_source/java/src/main/java/trick/simcontrol/SimControlApplication.java
+++ b/trick_source/java/src/main/java/trick/simcontrol/SimControlApplication.java
@ -927,7 +927,19 @@ public class SimControlApplication extends TrickApplication implements PropertyC
        	trickLogoName = UIUtils.getTrickLogo();
        }

-        logoImagePanel = new AnimationPlayer(trickLogoName);
+        if (UIUtils.getTrickLogoStep() != null) {
+            try {
+                int timeStep = Integer.parseInt(UIUtils.getTrickLogoStep());
+                logoImagePanel = new AnimationPlayer(trickLogoName, timeStep);
+            }
+            catch (NumberFormatException e) {
+                logoImagePanel = new AnimationPlayer(trickLogoName);
+            }
+        }
+        else {
+            logoImagePanel = new AnimationPlayer(trickLogoName);
+        }
+        
        logoImagePanel.setToolTipText("Trick Version " + UIUtils.getTrickVersion());

        JSplitPane topPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, litePanel, logoImagePanel);
--- a/trick_source/java/src/main/java/trick/tv/TVApplication.java
+++ b/trick_source/java/src/main/java/trick/tv/TVApplication.java
@ -368,6 +368,18 @@ public class TVApplication extends RunTimeTrickApplication implements VariableLi
        }
    };

+    /** reset the variable table to its default order */
+    protected AbstractAction resetSortingAction = new AbstractAction("Reset Table Sorting",
+      new ImageIcon(TVApplication.class.getResource("resources/resetsorting.png"))) {
+        {
+        putValue(SHORT_DESCRIPTION, "Reset the variable table to its default order.");
+        putValue(MNEMONIC_KEY, KeyEvent.VK_B);
+        }
+        public void actionPerformed(ActionEvent actionEvent) {
+            variableTable.getRowSorter().setSortKeys(null);
+        }
+    };
+
    /** clear logs action */
    protected AbstractAction clearLogsAction = new AbstractAction("Clear All Logged Values") {
        {
@ -405,7 +417,12 @@ public class TVApplication extends RunTimeTrickApplication implements VariableLi

        // Initialze the variable tree.
        variableTree = new TVVariableTree() {{
-            setEnabled(false);
+            // don't disable it here due to a known issue with the Apple Aqua Look and Feel 
+            // when using custom Look and Feel components on Mac. The NullPointerException 
+            // occurs in the AquaMenuPainter class when it tries to paint a border but 
+            // gets a null value from com.apple.laf.AquaMenuPainter$RecyclableBorder.get() 
+            // returns null
+            // setEnabled(false);

            try {
                setSorting(Enum.valueOf(Sorting.class, trickProperties.getProperty(
@ -440,7 +457,14 @@ public class TVApplication extends RunTimeTrickApplication implements VariableLi
        searchPanel = new SearchPanel() {{
            setVisible(Boolean.parseBoolean(trickProperties.getProperty(
              searchPanelVisibleKey, Boolean.toString(true))));
-            setEnabled(false);
+
+            // don't disable it here due to a known issue with the Apple Aqua Look and Feel 
+            // when using custom Look and Feel components on Mac. The NullPointerException 
+            // occurs in the AquaMenuPainter class when it tries to paint a border but 
+            // gets a null value from com.apple.laf.AquaMenuPainter$RecyclableBorder.get() 
+            // returns null
+            // setEnabled(false);
+
            setFontSize(Float.parseFloat(trickProperties.getProperty(
              fontSizeKey, Integer.toString(getFont().getSize()))));
            setAction(new AbstractAction("Add") {
@ -1609,6 +1633,7 @@ public class TVApplication extends RunTimeTrickApplication implements VariableLi
            add(new JMenuItem(monitorAction));
            add(new JMenuItem(stripChartAction));
            add(new JMenuItem(removeAction));
+            add(new JMenuItem(resetSortingAction));
            add(new JMenuItem(clearLogsAction));
        }}, 1);

@ -1667,6 +1692,7 @@ public class TVApplication extends RunTimeTrickApplication implements VariableLi
            add(Box.createHorizontalGlue());
            add(stripChartAction);
            add(removeAction);
+            add(resetSortingAction);
        }};
    }

@ -1933,12 +1959,6 @@ public class TVApplication extends RunTimeTrickApplication implements VariableLi
        return Sorting.None;
    }

-    @Override
-    protected void changeLookAndFeel(String lookAndFeelName) {
-        // Some of TV's elements don't respond well to look and feel changes,
-        // so I'm not supporting it for now.
-    }
-
    @Override
    protected void shutdown() {
        trickProperties.setProperty(positionKey, position.toString());
--- a/trick_source/java/src/main/resources/trick/tv/resources/resetsorting.png
+++ b/trick_source/java/src/main/resources/trick/tv/resources/resetsorting.png
--- a/trick_source/sim_services/DataRecord/DRHDF5.cpp
+++ b/trick_source/sim_services/DataRecord/DRHDF5.cpp
@ -5,6 +5,7 @@ PROGRAMMERS:
     ((Warwick Woodard) (NASA) (February 2010) (--) (Initial version))
 */

+#include <cstring>
 #include <iostream>
 #include <stdlib.h>

@ -13,6 +14,7 @@ PROGRAMMERS:
 #include "trick/command_line_protos.h"
 #include "trick/memorymanager_c_intf.h"
 #include "trick/message_proto.h"
+#include "trick/bitfield_proto.h"

 Trick::DRHDF5::DRHDF5( std::string in_name, Trick::DR_Type dr_type ) : Trick::DataRecordGroup(in_name, dr_type) {
    register_group_with_mm(this, "Trick::DRHDF5") ;
@ -38,7 +40,6 @@ int Trick::DRHDF5::format_specific_init() {

 #ifdef HDF5
    unsigned int ii ;
-    HDF5_INFO *hdf5_info ;
    hsize_t chunk_size = 1024;
    hid_t byte_id ;
    hid_t file_names_id, param_types_id, param_units_id, param_names_id ;
@ -58,11 +59,21 @@ int Trick::DRHDF5::format_specific_init() {
        return -1 ;
    }

+    // Check file validity first
+    if (H5Iis_valid(file) <= 0) {
+        message_publish(MSG_ERROR, "File handle invalid, id=%lld\n", (long long)file);
+        return -1;
+    }
    // All HDF5 objects live in the top-level "/" (root) group.
    root_group = H5Gopen(file, "/", H5P_DEFAULT);

    // Create a new group named "header" at the root ("/") level.
    header_group = H5Gcreate(file, "/header", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    // Validate header group
+    if (H5Iis_valid(header_group) <= 0) {
+        message_publish(MSG_ERROR, "Header group invalid, id=%lld\n", (long long)header_group);
+        return -1;
+    }
    // Create a packet table (PT) that stores byte order.
    byte_id = H5PTcreate_fl(header_group, "byte_order", s256, chunk_size, 1) ;
    // Add the byte order value to the byte packet table.
@ -76,11 +87,14 @@ int Trick::DRHDF5::format_specific_init() {
    // Create a packet table (PT) that stores each parameter's name.
    param_names_id =  H5PTcreate_fl(header_group, "param_names", s256, chunk_size, 1) ;

+    // Allocate memory for the parameter names
+    param_names = new char*[rec_buffer.size()];
+    // Allocate memory for the dataset ids
+    param_dataset_ids = new hid_t[rec_buffer.size()];
+
    // Create a table for each requested parameter.
    for (ii = 0; ii < rec_buffer.size(); ii++) {

-        hdf5_info = (HDF5_INFO *)malloc(sizeof(HDF5_INFO));
-
        /* Case statements taken from "parameter_types.h."
         *  HDF5 Native types found in "H5Tpublic.h." */
        switch (rec_buffer[ii]->ref->attr->type) {
@ -128,9 +142,9 @@ int Trick::DRHDF5::format_specific_init() {
                }
                break;
            case TRICK_UNSIGNED_BITFIELD:
-                if (rec_buffer[ii]->ref->attr->size == sizeof(int)) {
+                if (rec_buffer[ii]->ref->attr->size == sizeof(unsigned int)) {
                    datatype = H5T_NATIVE_UINT;
-                } else if (rec_buffer[ii]->ref->attr->size == sizeof(short)) {
+                } else if (rec_buffer[ii]->ref->attr->size == sizeof(unsigned short)) {
                    datatype = H5T_NATIVE_USHORT;
                } else {
                    datatype = H5T_NATIVE_UCHAR;
@ -150,7 +164,6 @@ int Trick::DRHDF5::format_specific_init() {
 #endif
                break;
            default:
-                free(hdf5_info);
                continue;
        }

@ -170,18 +183,19 @@ int Trick::DRHDF5::format_specific_init() {
         * RETURN:
         *     Returns an identifier for the new packet table, or H5I_BADID on error.
         */
-        hdf5_info->dataset = H5PTcreate_fl(root_group, rec_buffer[ii]->ref->reference, datatype, chunk_size, 1) ;
-
-        if ( hdf5_info->dataset == H5I_BADID ) {
+        // Allocate memory for the parameter names
+        param_names[ii] = (char *)malloc(strlen(rec_buffer[ii]->ref->reference) + 1);
+        // Copy the parameter name to the list
+        strcpy(param_names[ii], rec_buffer[ii]->ref->reference);
+        // Create a packet table for each parameter
+        param_dataset_ids[ii] = H5PTcreate_fl(root_group, param_names[ii], datatype, chunk_size, 1) ;
+        // Validate the dataset
+        if ( param_dataset_ids[ii] == H5I_BADID ) {
            message_publish(MSG_ERROR, "An error occured in data record group \"%s\" when adding \"%s\".\n",
-             group_name.c_str() , rec_buffer[ii]->ref->reference) ;
+             group_name.c_str() , param_names[ii]) ;
+            continue;
        }

-        hdf5_info->drb = rec_buffer[ii] ;
-        /* Add the new parameter element to the end of the vector.
-         *  This effectively increases the vector size by one. */
-        parameters.push_back(hdf5_info);
-
        // As a bonus, add a header entry for each parameter.
        /* File Name */
        buf = "log_" + group_name ;
@ -210,6 +224,105 @@ int Trick::DRHDF5::format_specific_init() {
    return(0);
 }

+#ifdef HDF5
+/**
+ * Helper function to append specified data records for one variable to its dataset(packet table).
+ */
+void append_var_packet_table(Trick::DataRecordBuffer *drb, char* buf, size_t records, hid_t param_ds) {
+    // Data records to be appended to the packet table
+    void* data = 0;
+    int bf;
+
+    switch (drb->ref->attr->type) {
+        case TRICK_CHARACTER:
+        case TRICK_UNSIGNED_CHARACTER:
+        case TRICK_STRING:
+        case TRICK_SHORT:
+        case TRICK_UNSIGNED_SHORT:
+        case TRICK_ENUMERATED:
+        case TRICK_INTEGER:
+        case TRICK_UNSIGNED_INTEGER:
+        case TRICK_LONG:
+        case TRICK_UNSIGNED_LONG:
+        case TRICK_FLOAT:
+        case TRICK_DOUBLE:
+            H5PTappend(param_ds, records , buf);
+            break;
+        case TRICK_BITFIELD:
+            bf = GET_BITFIELD(buf, drb->ref->attr->size, drb->ref->attr->index[0].start, drb->ref->attr->index[0].size);
+            data = malloc(records * sizeof(bf));
+            
+            // Extract bitfield for each record from different segments of buf
+            for (size_t j = 0; j < records; j++) {               
+                // Calculate the correct offset in buf for each record
+                // Each record in buf has size of rec_buffer[ii]->ref->attr->size
+                size_t offset = j * drb->ref->attr->size;
+
+                if (drb->ref->attr->size == sizeof(int)) {
+                    ((int *)data)[j] = extract_bitfield_any(
+                                                    *(int *)(buf+offset), drb->ref->attr->size,
+                                                    drb->ref->attr->index[0].start, drb->ref->attr->index[0].size);
+                } else if (drb->ref->attr->size == sizeof(short)) {
+                    ((short *)data)[j] = extract_bitfield_any(
+                                                    *(short *)(buf+offset), drb->ref->attr->size,
+                                                    drb->ref->attr->index[0].start, drb->ref->attr->index[0].size);
+                } else if (drb->ref->attr->size == sizeof(char)) {
+                    ((char *)data)[j] = extract_bitfield_any(
+                                                    *(char *)(buf+offset), drb->ref->attr->size,
+                                                    drb->ref->attr->index[0].start, drb->ref->attr->index[0].size);
+                } else {
+                    ((int*)data)[j] = extract_bitfield_any(
+                                                    *(int *)(buf+offset), drb->ref->attr->size,
+                                                    drb->ref->attr->index[0].start, drb->ref->attr->index[0].size);
+                }
+            }
+            H5PTappend(param_ds, records, data);
+            break;
+        case TRICK_UNSIGNED_BITFIELD:
+            bf = GET_UNSIGNED_BITFIELD(buf, drb->ref->attr->size, drb->ref->attr->index[0].start, drb->ref->attr->index[0].size);
+            data = malloc(records * sizeof(bf));
+
+            // Extract bitfield for each record from different segments of buf
+            for (size_t j = 0; j < records; j++) {               
+                // Calculate the correct offset in buf for each record
+                // Each record in buf has size of rec_buffer[ii]->ref->attr->size
+                size_t offset = j * drb->ref->attr->size;  // record_size would be the size of one record in buf
+
+                if (drb->ref->attr->size == sizeof(int)) {
+                    ((unsigned int *)data)[j] = extract_unsigned_bitfield_any(
+                                                    *(unsigned int *)(buf+offset), drb->ref->attr->size,
+                                                    drb->ref->attr->index[0].start, drb->ref->attr->index[0].size);
+                } else if (drb->ref->attr->size == sizeof(short)) {
+                    ((unsigned short *)data)[j] = extract_unsigned_bitfield_any(
+                                                    *(unsigned short *)(buf+offset), drb->ref->attr->size,
+                                                    drb->ref->attr->index[0].start, drb->ref->attr->index[0].size);
+                } else if (drb->ref->attr->size == sizeof(char)) {
+                    ((unsigned char *)data)[j] = extract_unsigned_bitfield_any(
+                                                    *(unsigned char *)(buf+offset), drb->ref->attr->size,
+                                                    drb->ref->attr->index[0].start, drb->ref->attr->index[0].size);
+                } else {
+                    ((int *)data)[j] = extract_unsigned_bitfield_any(
+                                                    *(int *)(buf+offset), drb->ref->attr->size,
+                                                    drb->ref->attr->index[0].start, drb->ref->attr->index[0].size);
+                }
+            }
+            H5PTappend(param_ds, records, data);
+            break;
+        case TRICK_LONG_LONG:
+        case TRICK_UNSIGNED_LONG_LONG:
+        case TRICK_BOOLEAN:
+        default:
+            H5PTappend(param_ds, records , buf);
+            break;
+
+        if (data != 0) {
+            free(data);
+            data = 0;
+        }
+    }
+}
+#endif
+
 /*
   HDF5 logging is done on a per variable basis instead of per time step like the
   other recording methods.  This write_data routine overrides the default in
@ -223,6 +336,8 @@ int Trick::DRHDF5::write_data(bool must_write) {
    unsigned int num_to_write ;
    unsigned int ii;
    char *buf = 0;
+    size_t ds_records1;
+    size_t ds_records2;

    if ( record and inited and (buffer_type == DR_No_Buffer or must_write)) {

@ -238,31 +353,28 @@ int Trick::DRHDF5::write_data(bool must_write) {
        writer_num = local_buffer_num - num_to_write ;

        if ( writer_num != local_buffer_num ) {
+            unsigned int writer_offset = writer_num % max_num ;
            // Test if the writer pointer to the right of the buffer pointer in the ring
            if ( (writer_num % max_num) > (local_buffer_num % max_num) ) {
-               // we have 2 segments to write per variable
-               for (ii = 0; ii < parameters.size(); ii++) {
-                   HDF5_INFO * hi = parameters[ii] ;
-                   unsigned int writer_offset = writer_num % max_num ;
-                   buf = hi->drb->buffer + (writer_offset * hi->drb->ref->attr->size) ;
+                ds_records1 = max_num - writer_offset;
+                ds_records2 = local_buffer_num % max_num;

-                   /* Append all of the data on the end of the buffer to the packet table. */
-                   H5PTappend( hi->dataset, max_num - writer_offset , buf );
+                // we have 2 segments to write per variable
+                for (ii = 0; ii < rec_buffer.size(); ii++) {
+                    //unsigned int writer_offset = writer_num % max_num ;
+                    buf = rec_buffer[ii]->buffer + (writer_offset * rec_buffer[ii]->ref->attr->size) ;
+                    append_var_packet_table(rec_buffer[ii], buf, ds_records1, param_dataset_ids[ii]);

-                   buf = hi->drb->buffer ;
-                   /* Append all of the data at the beginning of the buffer to the packet table. */
-                   H5PTappend( hi->dataset, local_buffer_num % max_num , buf );
-               }
+                    buf = rec_buffer[ii]->buffer ;
+                    append_var_packet_table(rec_buffer[ii], buf, ds_records2, param_dataset_ids[ii]);
+                }
            }  else {
-               // we have 1 continous segment to write per variable
-               for (ii = 0; ii < parameters.size(); ii++) {
-                   HDF5_INFO * hi = parameters[ii] ;
-                   unsigned int writer_offset = writer_num % max_num ;
-                   buf = hi->drb->buffer + (writer_offset * hi->drb->ref->attr->size) ;
-
-                   /* Append all of the data to the packet table. */
-                   H5PTappend( hi->dataset, local_buffer_num - writer_num , buf );
-
+                ds_records1 = local_buffer_num - writer_num;
+                // we have 1 continous segment to write per variable
+                for (ii = 0; ii < rec_buffer.size(); ii++) {
+                    //unsigned int writer_offset = writer_num % max_num ;
+                    buf = rec_buffer[ii]->buffer + (writer_offset * rec_buffer[ii]->ref->attr->size) ;
+                    append_var_packet_table(rec_buffer[ii], buf, ds_records1, param_dataset_ids[ii]);
               }
            }
            writer_num = local_buffer_num ;
@ -290,16 +402,13 @@ int Trick::DRHDF5::format_specific_write_data(unsigned int writer_offset __attri
    char *buf = 0;

    /* Loop through each parameter. */
-    for (ii = 0; ii < parameters.size(); ii++) {
+    for (ii = 0; ii < rec_buffer.size(); ii++) {

        /* Each parameters[] element contains a DataRecordBuffer class.
         * So there is a seperate DataRecordBuffer per variable.
         * Point to the value to be recorded. */
-        HDF5_INFO * hi = parameters[ii] ;
-        buf = hi->drb->buffer + (writer_offset * hi->drb->ref->attr->size) ;
-
-        /* Append 1 value to the packet table. */
-        H5PTappend( hi->dataset, 1, buf );
+        buf = rec_buffer[ii]->buffer + (writer_offset * rec_buffer[ii]->ref->attr->size) ;
+        append_var_packet_table(rec_buffer[ii], buf, 1, param_dataset_ids[ii]);

    }
 #endif
@ -320,11 +429,26 @@ int Trick::DRHDF5::format_specific_shutdown() {
    unsigned int ii ;

    if ( inited ) {
-        for (ii = 0; ii < parameters.size(); ii++) {
-            HDF5_INFO * hi = parameters[ii] ;
-            H5PTclose( hi->dataset );
+        for (ii = 0; ii < rec_buffer.size(); ii++) {
+            // Free parameter names memory
+            free(param_names[ii]);
+            // Close the parameter dataset
+            if (param_dataset_ids[ii] != H5I_BADID) {
+                H5PTclose(param_dataset_ids[ii]);
+            }
        }
+        // Free the parameter names array
+        delete[] param_names;
+        // Set the pointer to NULL
+        param_names = nullptr;
+        // Free the dataset ids array
+        delete[] param_dataset_ids;
+        // Set the pointer to NULL
+        param_dataset_ids = nullptr;
+
+        // Close root group
        H5Gclose(root_group);
+        // Close file handle
        H5Fclose(file);

    }
--- a/trick_source/sim_services/DataTypes/testing/makefile
+++ b/trick_source/sim_services/DataTypes/testing/makefile
@ -1,13 +1,20 @@

 RM = rm -rf
 CC = cc
-CPP = c++
+CPP = /usr/bin/g++

 DECL_DIR = ..

-GTEST_HOME = /usr/local
+GTEST_HOME=/usr/local
+UNAME_S = $(shell uname -s)
+UNAME_M = $(shell uname -m)
+ifeq ($(UNAME_S),Darwin)
+    ifeq ($(UNAME_M),arm64)
+        GTEST_HOME=/opt/homebrew
+    endif
+endif

-CFLAGS += -g -Wall -Wextra -I$(GTEST_HOME)/include -I$(DECL_DIR)/include
+CFLAGS += -std=c++14 -g -Wall -Wextra -I$(GTEST_HOME)/include -I$(DECL_DIR)/include

 LIBS = -L${DECL_DIR}/lib -lDecl -L${GTEST_HOME}/lib -lgtest -lgtest_main -lpthread

--- a/trick_source/sim_services/FrameLog/FrameLog.cpp
+++ b/trick_source/sim_services/FrameLog/FrameLog.cpp
@ -112,6 +112,7 @@ void Trick::FrameLog::add_recording_vars_for_jobs() {
             (! all_jobs_vector[ii]->job_class_name.compare("integration")) ||
             (! all_jobs_vector[ii]->job_class_name.compare("derivative")) ||
             (! all_jobs_vector[ii]->job_class_name.compare("dynamic_event")) ||
+             (! all_jobs_vector[ii]->job_class_name.compare("pre_integration")) ||
             (! all_jobs_vector[ii]->job_class_name.compare("post_integration")) ||
             (! all_jobs_vector[ii]->job_class_name.compare("system_thread_sync")) ||
             (! all_jobs_vector[ii]->job_class_name.compare("top_of_frame")) ||
@ -384,6 +385,7 @@ int Trick::FrameLog::frame_clock_stop(Trick::JobData * curr_job) {
                    mode = Run;
                }
            }
+
            /** @li Save all cyclic job start & stop times for this frame into timeline structure. */
            if ((mode==Run) || (mode==Step)) {                            // cyclic job
                if (tl_count[thread] < tl_max_samples) {
@ -391,6 +393,8 @@ int Trick::FrameLog::frame_clock_stop(Trick::JobData * curr_job) {
                    timeline[thread][tl_count[thread]].start = target_job->rt_start_time;
                    timeline[thread][tl_count[thread]].stop  = target_job->rt_stop_time;
                    timeline[thread][tl_count[thread]].trick_job = target_job->tags.count("TRK");
+                    timeline[thread][tl_count[thread]].isEndOfFrame = target_job->isEndOfFrame;
+                    timeline[thread][tl_count[thread]].isTopOfFrame = target_job->isTopOfFrame;
                    tl_count[thread]++;
                }
            /** @li Save all non-cyclic job start & stop times for this frame into timeline_other structure. */
@ -582,8 +586,41 @@ int Trick::FrameLog::shutdown() {
        return(0) ;
    }

+
+// ================================================================
+// NEW Time-line for Jperf
+// ================================================================
+    for (int thread_num = 0; thread_num < num_threads; thread_num ++) {
+
+        if (thread_num == 0) {
+            snprintf(log_buff, sizeof(log_buff), "%s/log_newtimeline.csv", command_line_args_get_output_dir());
+        } else {
+            snprintf(log_buff, sizeof(log_buff), "%s/log_newtimelineC%d.csv", command_line_args_get_output_dir(), thread_num);
+        }
+
+        FILE *fp_log;
+        if ((fp_log = fopen(log_buff, "w")) == NULL) {
+            message_publish(MSG_ERROR, "Could not open log_timeline.csv file for Job Timeline Logging\n") ;
+            exit(0);
+        }
+
+        fprintf(fp_log,"jobID,startTime,stopTime\n");
+
+        time_scale = 1.0 / exec_get_time_tic_value();
+        tl = timeline[thread_num];
+        for ( ii = 0 ; ii < tl_count[thread_num] ; ii++ ) {
+            start = tl[ii].start * time_scale;
+            stop =  tl[ii].stop  * time_scale;
+            fprintf(fp_log,"%5.2f, %f, %f\n", tl[ii].id, start, stop);
+        }
+        fflush(fp_log);
+        fclose(fp_log);
+    }
+
    /** @li Manually create the log_timeline and log_timeline_init files from saved timeline data. */
    if (fp_time_main == NULL) {
+
+
        snprintf(log_buff, sizeof(log_buff), "%s/log_timeline.csv", command_line_args_get_output_dir());
        if ((fp_time_main = fopen(log_buff, "w")) == NULL) {
            message_publish(MSG_ERROR, "Could not open log_timeline.csv file for Job Timeline Logging\n") ;
@ -591,11 +628,14 @@ int Trick::FrameLog::shutdown() {
        }
        fprintf(fp_time_main, "trick_frame_log.frame_log.job_time {s},");
        fprintf(fp_time_main, "trick_frame_log.frame_log.job_trick_id {--},frame_log.frame_log.job_user_id {--}");
+
        for (jj=1; jj<num_threads; jj++) {
            fprintf(fp_time_main, ",trick_frame_log.frame_log.job_userC%d_id {--}",jj);
        }
        fprintf(fp_time_main, "\n");

+
+
        snprintf(log_buff, sizeof(log_buff), "%s/log_timeline_init.csv", command_line_args_get_output_dir());
        if ((fp_time_other = fopen(log_buff, "w")) == NULL) {
            message_publish(MSG_ERROR, "Could not open log_timeline_init.csv file for Job Timeline Logging\n") ;
@ -603,6 +643,9 @@ int Trick::FrameLog::shutdown() {
        }
        fprintf(fp_time_other, "trick_frame_log.frame_log.job_init_time {s},");
        fprintf(fp_time_other, "trick_frame_log.frame_log.job_trickinit_id {--},trick_frame_log.frame_log.job_userinit_id {--}\n");
+
+
+
    }

    time_scale = 1.0 / exec_get_time_tic_value();
@ -614,17 +657,20 @@ int Trick::FrameLog::shutdown() {
            //               stop  job time, 0, 0
    /** @li print a 0 id before each start time & after each stop time for a stairstep effect in plot. */
    // cyclic jobs
+
    for ( thread = 0 ; thread < num_threads ; thread++ ) {
        tl = timeline[thread];
        for ( ii = 0 ; ii < tl_count[thread] ; ii++ ) {
            // start & stop time are in tics, so convert to seconds
            start = tl[ii].start * time_scale;
            stop =  tl[ii].stop  * time_scale;
+
            fprintf(fp_time_main,      "%f,0", start);        // start stairstep
            for (jj=0; jj<num_threads; jj++) {
                fprintf(fp_time_main,  ",0");
            }
            fprintf(fp_time_main,      "\n");
+
            if (tl[ii].trick_job) {
                fprintf(fp_time_main, "%f,%f", start, tl[ii].id);    // trick job start
                for (jj=0; jj<num_threads; jj++) {
@ -713,11 +759,6 @@ int Trick::FrameLog::create_DP_files() {
 int Trick::FrameLog::create_DP_Product_dir() {
    int ret=0;
    DP_dir = "DP_Product";
-    if (std::string(command_line_args_get_user_output_dir()) != std::string(command_line_args_get_output_dir())) {
-        if (!std::string(command_line_args_get_user_output_dir()).empty()) {
-            DP_dir = std::string(command_line_args_get_user_output_dir()) + "/DP_Product";
-        }
-    } 
    ret = mkdir(DP_dir.c_str(), 0777);
    if (ret == -1) {
        if (errno == EEXIST) {
--- a/trick_source/web/dashboard/package-lock.json
+++ b/trick_source/web/dashboard/package-lock.json