ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2025-06-06 09:21:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into Issue595

Browse Source
This commit is contained in:
John M. Penn 2018-04-10 16:07:46 -05:00
commit ad05aad2d2
10 changed files with 707 additions and 511 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/trick/DRBinary.hh
View File

@ -117,7 +117,7 @@ namespace Trick {
private: private:
/** The log file.\n */ /** The log file.\n */
int fp ; /**< trick_io(**) trick_units(--) */ int fd ; /**< trick_io(**) trick_units(--) */
} ; } ;

6
include/trick/DataRecordDispatcher.hh
View File

@ -100,6 +100,12 @@ namespace Trick {
/** @brief Disable a group or all groups */ /** @brief Disable a group or all groups */
int record_now_group( const char * in_name ) ; int record_now_group( const char * in_name ) ;
/** @brief set max file size for group */
int set_group_max_file_size(const char * in_name, uint64_t bytes) ;
/** @brief set max file size for all groups */
int set_max_file_size(uint64_t bytes) ;
// override the default Schduler::add_sim_object // override the default Schduler::add_sim_object
virtual int add_sim_object( Trick::SimObject * in_object ) ; virtual int add_sim_object( Trick::SimObject * in_object ) ;

17
include/trick/DataRecordGroup.hh
View File

@ -115,6 +115,12 @@ namespace Trick {
/** Current write to file record number.\n */ /** Current write to file record number.\n */
unsigned int writer_num; /**< trick_io(**) trick_units(--) */ unsigned int writer_num; /**< trick_io(**) trick_units(--) */
/** Maximum file size for data record file in bytes.\n */
uint64_t max_file_size; /**< trick_io(**) trick_units(--) */
/** Current file size for data record file in bytes.\n */
uint64_t total_bytes_written; /**< trick_io(**) trick_units(--) */
/** Buffer to hold formatted data ready for disk or other destination.\n */ /** Buffer to hold formatted data ready for disk or other destination.\n */
char * writer_buff ; /**< trick_io(**) trick_units(--) */ char * writer_buff ; /**< trick_io(**) trick_units(--) */
@ -207,6 +213,17 @@ namespace Trick {
*/ */
virtual int set_buffer_type(int buffer_type) ; virtual int set_buffer_type(int buffer_type) ;
/**
@brief @userdesc Command to set the max file size in bytes.
This tells the data record group when it stops writing to the disk.
@par Python Usage:
@code <dr_group>.set_max_file_size(<buffer_type>) @endcode
@param type - the file size in bytes
@return always 0
*/
virtual int set_max_file_size(uint64_t bytes) ;
/** /**
@brief @userdesc Command to print double variable values as single precision (float) in the log file to save space. @brief @userdesc Command to print double variable values as single precision (float) in the log file to save space.
@par Python Usage: @par Python Usage:

3
include/trick/data_record_proto.h
View File

@ -14,7 +14,10 @@ int dr_disable() ;
int dr_enable_group( const char * in_name ) ; int dr_enable_group( const char * in_name ) ;
int dr_disable_group( const char * in_name ) ; int dr_disable_group( const char * in_name ) ;
int dr_record_now_group( const char * in_name ) ; int dr_record_now_group( const char * in_name ) ;
int dr_set_max_file_size ( uint64_t bytes ) ;
void remove_all_data_record_groups() ; void remove_all_data_record_groups() ;
int set_max_size_record_group (const char * in_name, uint64_t bytes ) ;
#ifdef __cplusplus #ifdef __cplusplus
int add_data_record_group( Trick::DataRecordGroup * in_group, Trick::DR_Buffering buffering = Trick::DR_Not_Specified ) ; int add_data_record_group( Trick::DataRecordGroup * in_group, Trick::DR_Buffering buffering = Trick::DR_Not_Specified ) ;

334
trick_source/java/src/trick/dre/DreApplication.java
View File

@ -7,41 +7,6 @@ package trick.dre;
//======================================== //========================================
// Imports // Imports
//======================================== //========================================
import java.awt.BorderLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.FileWriter;
import java.io.IOException;
import java.util.Collection;
import java.util.Vector;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import javax.swing.Box;
import javax.swing.JCheckBoxMenuItem;
import javax.swing.JComponent;
import javax.swing.JLabel;
import javax.swing.JMenu;
import javax.swing.JMenuBar;
import javax.swing.JMenuItem;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JPopupMenu;
import javax.swing.JRadioButtonMenuItem;
import javax.swing.JSeparator;
import javax.swing.JSplitPane;
import javax.swing.JTextField;
import javax.swing.JToolBar;
import javax.swing.tree.TreePath;
import javax.xml.parsers.ParserConfigurationException;
import org.jdesktop.application.Action; import org.jdesktop.application.Action;
import org.jdesktop.application.Application; import org.jdesktop.application.Application;
@ -49,23 +14,35 @@ import org.jdesktop.application.View;
import org.jdesktop.swingx.JXLabel; import org.jdesktop.swingx.JXLabel;
import org.xml.sax.InputSource; import org.xml.sax.InputSource;
import org.xml.sax.SAXException; import org.xml.sax.SAXException;
import trick.common.TrickApplication; import trick.common.TrickApplication;
import trick.common.ui.UIUtils; import trick.common.ui.UIUtils;
import trick.common.ui.components.NumberTextField; import trick.common.ui.components.NumberTextField;
import trick.common.ui.panels.ListPanel; import trick.common.ui.panels.ListPanel;
import trick.sie.utils.SearchPanel; import trick.sie.utils.*;
import trick.sie.utils.SieResourceDomParser;
import trick.sie.utils.SieTemplate; import javax.swing.*;
import trick.sie.utils.SieTreeModel; import javax.swing.tree.TreePath;
import trick.sie.utils.SieVariableTree; import javax.xml.parsers.ParserConfigurationException;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.io.*;
import java.util.Collection;
import java.util.StringTokenizer;
import java.util.Vector;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
/** /**
* Dre - data recording editor application. * Dre - data recording editor application.
* *
* @author Hong Chen * @author Hong Chen
* @author Scott Fennell
* @since Trick 10 * @since Trick 10
* @since Trick 17
*/ */
public class DreApplication extends TrickApplication { public class DreApplication extends TrickApplication {
//======================================== //========================================
@ -87,33 +64,58 @@ public class DreApplication extends TrickApplication {
private String buffering; private String buffering;
private Vector<String> variables = new Vector<String>(); private Vector<String> variables = new Vector<String>();
/** The menu check box for Single Precision. */ /**
* The menu check box for Single Precision.
*/
private JCheckBoxMenuItem singlePrecisionCheckBox; private JCheckBoxMenuItem singlePrecisionCheckBox;
/** Popup window for clicking a tree node **/ /**
* Popup window for clicking a tree node
**/
private JPopupMenu treePopup = null; private JPopupMenu treePopup = null;
/** S_sie.resource xml parser */ /** S_sie.resource xml parser */
//private SieResourceXMLParser sieXMLParser; //private SieResourceXMLParser sieXMLParser;
/** The sim objects top level instances */ /**
* The sim objects top level instances
*/
private Collection<SieTemplate> rootTemplates; private Collection<SieTemplate> rootTemplates;
/** The variable (sim objects) tree */ /**
* The variable (sim objects) tree
*/
private SieVariableTree varTree; private SieVariableTree varTree;
/** The search panel for the variable tree */ /**
* The search panel for the variable tree
*/
private SearchPanel searchPanel; private SearchPanel searchPanel;
/** The selected variable list */ /**
* The selected variable list
*/
private ListPanel selectedVarList; private ListPanel selectedVarList;
/** The text field that contains the group name */ /**
* The text field that contains the group name
*/
private JTextField nameField; private JTextField nameField;
/** The text field that contains the cycle frequency for recording */ /**
* The text field that contains the cycle frequency for recording
*/
private NumberTextField cycleField; private NumberTextField cycleField;
/**
* The text field that contains the max file size for the group
*/
private NumberTextField maxFileSizeField;
private JComboBox<String> sizeUnitsBox;
private JCheckBox unlimitedSizeBox;
private JRadioButtonMenuItem DRAscii_item; private JRadioButtonMenuItem DRAscii_item;
private JRadioButtonMenuItem DRBinary_item; private JRadioButtonMenuItem DRBinary_item;
private JRadioButtonMenuItem DRHDF5_item; private JRadioButtonMenuItem DRHDF5_item;
@ -284,17 +286,19 @@ public class DreApplication extends TrickApplication {
} }
} }
//======================================== //========================================
// Set/Get methods // Set/Get methods
//======================================== //========================================
//======================================== //========================================
// Methods // Methods
//======================================== //========================================
/** /**
* Main method for this application. * Main method for this application.
*
* @param args command line arguments * @param args command line arguments
*/ */
public static void main(String[] args) { public static void main(String[] args) {
@ -316,20 +320,14 @@ public class DreApplication extends TrickApplication {
resourceFile = new File(sieResourcePath); resourceFile = new File(sieResourcePath);
} }
//sieXMLParser = null; //sieXMLParser = null;
if (resourceFile != null && !resourceFile.exists()) { if (!resourceFile.exists()) {
System.out.println(resourceFile.getName() + " file does not exist. Exit!!!"); System.out.println(resourceFile.getName() + " file does not exist. Exit!!!");
System.exit(0); System.exit(0);
} }
try { try {
rootTemplates = SieResourceDomParser.parse(new InputSource(new FileInputStream(resourceFile))); rootTemplates = SieResourceDomParser.parse(new InputSource(new FileInputStream(resourceFile)));
} catch (FileNotFoundException e) { } catch (ParserConfigurationException | SAXException | IOException e) {
e.printStackTrace();
} catch (ParserConfigurationException e) {
e.printStackTrace();
} catch (SAXException e) {
e.printStackTrace();
} catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
} }
@ -364,8 +362,10 @@ public class DreApplication extends TrickApplication {
view.setComponent(createMainPanel()); view.setComponent(createMainPanel());
view.setMenuBar(createMenuBar()); view.setMenuBar(createMenuBar());
view.setToolBar(createToolBar()); view.setToolBar(createToolBar());
getMainFrame().setMinimumSize(getMainFrame().getPreferredSize());
show(view); show(view);
} }
/** /**
@ -505,8 +505,11 @@ public class DreApplication extends TrickApplication {
*/ */
@Override @Override
protected JToolBar createToolBar() { protected JToolBar createToolBar() {
String[] toolbarActionNames = {"openDR", "saveDR"};
JToolBar toolBar = new JToolBar(); JToolBar toolBar = new JToolBar();
// add buttons
String[] toolbarActionNames = {"openDR", "saveDR"};
for (String actionName : toolbarActionNames) { for (String actionName : toolbarActionNames) {
if (actionName.equals("---")) { if (actionName.equals("---")) {
toolBar.addSeparator(); toolBar.addSeparator();
@ -514,22 +517,62 @@ public class DreApplication extends TrickApplication {
toolBar.add(createButton(actionName, false)); toolBar.add(createButton(actionName, false));
} }
} }
nameFieldInit();
cycleFieldInit();
maxFileSizeFieldInit();
sizeUnitsBoxInit();
unlimitedSizeBoxInit();
toolBar.addSeparator(); toolBar.addSeparator();
toolBar.add(new JLabel("DR Name (NO SPACE): ")); toolBar.add(new JLabel("DR Name (NO SPACE): "));
toolBar.add(nameField);
toolBar.add(Box.createHorizontalStrut(10));
toolBar.add(new JLabel("DR Cycle: "));
toolBar.add(cycleField);
toolBar.addSeparator();
toolBar.add(new JLabel(" Max File Size: "));
toolBar.add(maxFileSizeField);
toolBar.add(sizeUnitsBox);
toolBar.addSeparator();
toolBar.add(unlimitedSizeBox);
toolBar.setSize(toolBar.getPreferredSize());
toolBar.addSeparator();
return toolBar;
}
private void nameFieldInit() {
nameField = new JTextField(15); nameField = new JTextField(15);
nameField.setMinimumSize(nameField.getPreferredSize()); nameField.setMinimumSize(nameField.getPreferredSize());
nameField.setPreferredSize(nameField.getPreferredSize()); nameField.setPreferredSize(nameField.getPreferredSize());
nameField.setMaximumSize(nameField.getPreferredSize()); nameField.setMaximumSize(nameField.getPreferredSize());
toolBar.add(nameField); }
toolBar.add(Box.createHorizontalStrut(10)); private void cycleFieldInit() {
toolBar.add(new JLabel("DR Cycle: "));
cycleField = new NumberTextField("0.1", 5); cycleField = new NumberTextField("0.1", 5);
cycleField.setMinimumSize(cycleField.getPreferredSize()); cycleField.setMinimumSize(cycleField.getPreferredSize());
toolBar.add(cycleField); }
return toolBar; private void maxFileSizeFieldInit() {
maxFileSizeField = new NumberTextField("1", 10);
maxFileSizeField.setMinimumSize((maxFileSizeField.getPreferredSize()));
}
private void sizeUnitsBoxInit() {
String[] units = {"B", "KiB", "MiB", "GiB"};
sizeUnitsBox = new JComboBox<>(units);
sizeUnitsBox.setSelectedItem(sizeUnitsBox.getItemAt(3));
}
private void unlimitedSizeBoxInit() {
unlimitedSizeBox = new JCheckBox("Unlimited File Size", false);
unlimitedSizeBox.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
updateUnlimited();
}
});
} }
/** /**
@ -538,11 +581,11 @@ public class DreApplication extends TrickApplication {
* @param string String the string read in from the opened file. * @param string String the string read in from the opened file.
*/ */
private void readFrequency(String string) { private void readFrequency(String string) {
if (string.indexOf("trick.DR_Always") != -1) { if (string.contains("trick.DR_Always")) {
selectDRAlways(); selectDRAlways();
} else if (string.indexOf("trick.DR_Changes") != -1) { } else if (string.contains("trick.DR_Changes")) {
selectDRChanges(); selectDRChanges();
} else if (string.indexOf("trick.DR_Step_Changes") != -1) { } else if (string.contains("trick.DR_Step_Changes")) {
selectDRStepChanges(); selectDRStepChanges();
} else { } else {
System.out.println("Frequency Type is not recognized, defaulting to DR_Always"); System.out.println("Frequency Type is not recognized, defaulting to DR_Always");
@ -556,13 +599,13 @@ public class DreApplication extends TrickApplication {
* @param string String the string read in from the opened file. * @param string String the string read in from the opened file.
*/ */
private void readBuffering(String string) { private void readBuffering(String string) {
if (string.indexOf("trick.DR_Buffer") != -1) { if (string.contains("trick.DR_Buffer")) {
selectDRBuffer(); selectDRBuffer();
} else if (string.indexOf("trick.DR_No_Buffer") != -1) { } else if (string.contains("trick.DR_No_Buffer")) {
selectDRNoBuffer(); selectDRNoBuffer();
} else if (string.indexOf("trick.DR_Ring_Buffer") != -1) { } else if (string.contains("trick.DR_Ring_Buffer")) {
selectDRRingBuffer(); selectDRRingBuffer();
} else if (string.indexOf("trick.DR_Thread_Buffer") != -1) { } else if (string.contains("trick.DR_Thread_Buffer")) {
selectDRThreadBuffer(); selectDRThreadBuffer();
} else { } else {
System.out.println("Buffering Type is not recognized, defaulting to DR_Buffer"); System.out.println("Buffering Type is not recognized, defaulting to DR_Buffer");
@ -576,11 +619,11 @@ public class DreApplication extends TrickApplication {
* @param string String the string read in from the opened file. * @param string String the string read in from the opened file.
*/ */
private void readFormat(String string) { private void readFormat(String string) {
if (string.indexOf("DRBinary") != -1) { if (string.contains("DRBinary")) {
selectDRBinary(); selectDRBinary();
} else if (string.indexOf("DRAscii") != -1) { } else if (string.contains("DRAscii")) {
selectDRAscii(); selectDRAscii();
} else if (string.indexOf("DRHDF5") != -1) { } else if (string.contains("DRHDF5")) {
selectDRHDF5(); selectDRHDF5();
} else { } else {
System.out.println("Format Type is not recognized, defaulting to DR_Binary"); System.out.println("Format Type is not recognized, defaulting to DR_Binary");
@ -588,6 +631,63 @@ public class DreApplication extends TrickApplication {
} }
} }
/**
* routine to read the Max File Size from the opened file.
*
* @param subs String the string read in from the opened file.
*/
private void readFileSize(String subs) {
StringTokenizer st = new StringTokenizer(subs);
String quantity = st.nextToken("*").trim();
maxFileSizeField.setText(quantity);
if (maxFileSizeField.getText().equals("0")) {
unlimitedSizeBox.setSelected(true);
updateUnlimited();
} else {
unlimitedSizeBox.setSelected(false);
maxFileSizeField.setEnabled(true);
sizeUnitsBox.setEnabled(true);
}
if (st.hasMoreElements()) {
String shift = st.nextToken("*").trim();
switch (shift) {
case "1024":
sizeUnitsBox.setSelectedItem("KiB");
break;
case "1048576":
sizeUnitsBox.setSelectedItem("MiB");
break;
case "1073741824":
sizeUnitsBox.setSelectedItem("GiB");
break;
}
} else {
sizeUnitsBox.setSelectedItem("B");
}
}
/**
* helper method to update GUI after unlimited file size is checked.
*/
private static String previousFileSize;
private static int previousUnitIndex;
private void updateUnlimited() {
if (unlimitedSizeBox.isSelected()) {
previousFileSize = maxFileSizeField.getText();
previousUnitIndex = sizeUnitsBox.getSelectedIndex();
maxFileSizeField.setText("0");
maxFileSizeField.setEnabled(false);
sizeUnitsBox.setSelectedIndex(0);
sizeUnitsBox.setEnabled(false);
} else {
maxFileSizeField.setEnabled(true);
sizeUnitsBox.setEnabled(true);
maxFileSizeField.setText(previousFileSize);
sizeUnitsBox.setSelectedIndex(previousUnitIndex);
}
}
/** /**
* routine to read the contents of the opened file * routine to read the contents of the opened file
* *
@ -600,42 +700,40 @@ public class DreApplication extends TrickApplication {
BufferedReader reader = new BufferedReader(new FileReader(file)); BufferedReader reader = new BufferedReader(new FileReader(file));
try { try {
for (String line = reader.readLine(); line != null; line = reader.readLine()) { for (String line = reader.readLine(); line != null; line = reader.readLine()) {
if (line.indexOf("append") != -1) { if (line.contains("append")) {
String[] segment = line.split("\""); String[] segment = line.split("\"");
readFormat(line); readFormat(line);
nameField.setText(segment[1]); nameField.setText(segment[1]);
} else if (line.indexOf("add_data_record_group") != -1) { } else if (line.contains("add_data_record_group")) {
readBuffering(line); readBuffering(line);
} else if (line.indexOf("drg[DR_GROUP_ID]") != -1) { } else if (line.contains("drg[DR_GROUP_ID]")) {
int indx = line.indexOf("("); int indx = line.indexOf("(");
int len = line.length(); int len = line.length();
if (line.indexOf("set_freq") != -1) { if (line.contains("set_freq")) {
readFrequency(line); readFrequency(line);
} else if (line.indexOf("enable") != -1) { } else if (line.contains("enable")) {
; ;
} else if (line.indexOf("set_cycle") != -1) { } else if (line.contains("set_cycle")) {
cycleField.setText(line.substring(indx + 1, len - 1)); cycleField.setText(line.substring(indx + 1, len - 1));
} else if (line.indexOf("add_variable") != -1) { } else if (line.contains("add_variable")) {
selectedVarList.addData(line.substring(indx + 2, len - 2)); selectedVarList.addData(line.substring(indx + 2, len - 2));
variables.add(line.substring(indx + 2, len - 2)); variables.add(line.substring(indx + 2, len - 2));
} else if (line.indexOf("set_single_prec_only") != -1) { } else if (line.contains("set_single_prec_only")) {
if (line.substring(indx + 1, len - 1).equals("True")) { if (line.substring(indx + 1, len - 1).equals("True")) {
singlePrecisionCheckBox.setState(true); singlePrecisionCheckBox.setState(true);
} else { } else {
singlePrecisionCheckBox.setState(false); singlePrecisionCheckBox.setState(false);
} }
} else if (line.contains("set_max_file_size")) {
readFileSize(line.substring(line.indexOf("(") + 1, line.indexOf(")")));
} }
} }
} }
} } finally {
finally {
if (reader != null) {
reader.close(); reader.close();
} }
} } catch (Exception e) {
}
catch (Exception e) {
JOptionPane.showMessageDialog(getMainFrame(), e.toString(), "Error Reading File", JOptionPane.ERROR_MESSAGE); JOptionPane.showMessageDialog(getMainFrame(), e.toString(), "Error Reading File", JOptionPane.ERROR_MESSAGE);
} }
} }
@ -662,24 +760,44 @@ public class DreApplication extends TrickApplication {
writer.write("drg[DR_GROUP_ID].set_cycle(" + cycleField.getText() + ")\n"); writer.write("drg[DR_GROUP_ID].set_cycle(" + cycleField.getText() + ")\n");
writer.write("drg[DR_GROUP_ID].set_single_prec_only(" + single_prec_only + ")\n"); writer.write("drg[DR_GROUP_ID].set_single_prec_only(" + single_prec_only + ")\n");
for (int i = 0; i < variables.size(); i++) { for (String variable : variables) {
writer.write("drg[DR_GROUP_ID].add_variable(\"" + variables.get(i) + "\")\n"); writer.write("drg[DR_GROUP_ID].add_variable(\"" + variable + "\")\n");
} }
writer.write("drg[DR_GROUP_ID].set_max_file_size(" + maxFileSizeField.getText().trim() + getMultiplier((String) sizeUnitsBox.getSelectedItem()));
writer.write("trick.add_data_record_group(drg[DR_GROUP_ID], trick." + buffering + ")\n"); writer.write("trick.add_data_record_group(drg[DR_GROUP_ID], trick." + buffering + ")\n");
writer.write("drg[DR_GROUP_ID].enable()\n"); writer.write("drg[DR_GROUP_ID].enable()\n");
} } finally {
finally {
if (writer != null) {
writer.close(); writer.close();
} }
} } catch (Exception e) {
}
catch (Exception e) {
JOptionPane.showMessageDialog(getMainFrame(), e.toString(), JOptionPane.showMessageDialog(getMainFrame(), e.toString(),
"Error Saving File", JOptionPane.ERROR_MESSAGE); "Error Saving File", JOptionPane.ERROR_MESSAGE);
} }
} }
/**
* helper method to convert ComboBox index to a multiplier for filesize units
*/
private String getMultiplier(String unit) {
String multiplier = null;
switch (unit) {
case "B":
multiplier = ")\n";
break;
case "KiB":
multiplier = " * 1024) # multiply converts KiB to B --Dr. Dre\n";
break;
case "MiB":
multiplier = " * 1048576) # multiply converts MiB to B --Dr. Dre\n";
break;
case "GiB":
multiplier = " * 1073741824) # multiply converts GiB to B --Dr. Dre\n";
break;
}
return multiplier;
}
/** /**
* routine to add the subscripts to the variable name being created * routine to add the subscripts to the variable name being created
* *
@ -723,10 +841,10 @@ public class DreApplication extends TrickApplication {
private void addVariable(String name) { private void addVariable(String name) {
String[] segments = name.split("\\."); String[] segments = name.split("\\.");
for (int i = 0; i < segments.length ; i++) { for (String segment : segments) {
VariableName tempName = new VariableName(); VariableName tempName = new VariableName();
Matcher matcher = Pattern.compile("\\[.\\]").matcher(segments[i]); Matcher matcher = Pattern.compile("\\[.\\]").matcher(segment);
tempName.name = segments[i].replaceFirst("\\[.*\\]",""); tempName.name = segment.replaceFirst("\\[.*\\]", "");
while (matcher.find()) { while (matcher.find()) {
String str_idx = matcher.group().substring(1, matcher.group().length() - 1); String str_idx = matcher.group().substring(1, matcher.group().length() - 1);
@ -741,17 +859,19 @@ public class DreApplication extends TrickApplication {
addName(nameSegment.get(i).name); addName(nameSegment.get(i).name);
addSubscript(i); addSubscript(i);
} }
for (int i=0; i<fullName.size(); i++) { for (String aFullName : fullName) {
variables.add(fullName.get(i)); variables.add(aFullName);
selectedVarList.addData(fullName.get(i)); selectedVarList.addData(aFullName);
} }
fullName.clear(); fullName.clear();
nameSegment.clear(); nameSegment.clear();
} }
//======================================== //========================================
// Inner classes // Inner classes
//======================================== //========================================
/** /**
* private class to contain the name and the * private class to contain the name and the
* dimensions for each segment of variable added. * dimensions for each segment of variable added.
@ -772,6 +892,7 @@ public class DreApplication extends TrickApplication {
//======================================== //========================================
// MouseListener methods // MouseListener methods
//======================================== //========================================
/** /**
* Invoked when the mouse button has been clicked (pressed * Invoked when the mouse button has been clicked (pressed
* and released) on a component. * and released) on a component.
@ -779,8 +900,7 @@ public class DreApplication extends TrickApplication {
* @param e MouseEvent sent from system. * @param e MouseEvent sent from system.
*/ */
@Override @Override
public void mouseClicked(MouseEvent e) public void mouseClicked(MouseEvent e) {
{
SieTemplate clickedNode = null; SieTemplate clickedNode = null;
if (UIUtils.isDoubleClick(e) || UIUtils.isRightMouseClick(e)) { if (UIUtils.isDoubleClick(e) || UIUtils.isRightMouseClick(e)) {
TreePath clickedPath = varTree.getClosestPathForLocation(e.getX(), e.getY()); TreePath clickedPath = varTree.getClosestPathForLocation(e.getX(), e.getY());
@ -794,7 +914,7 @@ public class DreApplication extends TrickApplication {
} }
JMenuItem firstItem = new JMenuItem(SieTreeModel.getPathName(clickedPath) + clickedNode); JMenuItem firstItem = new JMenuItem(SieTreeModel.getPathName(clickedPath) + clickedNode);
if (clickedNode != null && varTree.getModel().isLeaf(clickedNode) && clickedNode.isTrickManaged()) { if (varTree.getModel().isLeaf(clickedNode) && clickedNode.isTrickManaged()) {
firstItem.addActionListener(new ActionListener() { firstItem.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
addVariable(e.getActionCommand()); addVariable(e.getActionCommand());

11
trick_source/sim_services/DataRecord/DRAscii.cpp
View File

@ -46,6 +46,7 @@ int Trick::DRAscii::format_specific_header( std::fstream & out_st ) {
int Trick::DRAscii::format_specific_init() { int Trick::DRAscii::format_specific_init() {
unsigned int jj ; unsigned int jj ;
std::streampos before_write;
/* Store log information in csv/txt file */ /* Store log information in csv/txt file */
if ( ! delimiter.empty() && delimiter.compare(",") != 0 ) { if ( ! delimiter.empty() && delimiter.compare(",") != 0 ) {
@ -70,7 +71,7 @@ int Trick::DRAscii::format_specific_init() {
record = false ; record = false ;
return -1 ; return -1 ;
} }
before_write = out_stream.tellp();
// Write out the title line of the recording file // Write out the title line of the recording file
/* Start with the 1st item in the buffer which should be "sys.exec.out.time" */ /* Start with the 1st item in the buffer which should be "sys.exec.out.time" */
out_stream << rec_buffer[0]->ref->reference ; out_stream << rec_buffer[0]->ref->reference ;
@ -81,6 +82,7 @@ int Trick::DRAscii::format_specific_init() {
out_stream << " {" << rec_buffer[0]->ref->attr->units << "}" ; out_stream << " {" << rec_buffer[0]->ref->attr->units << "}" ;
} }
} }
/* Write out specified recorded parameters */ /* Write out specified recorded parameters */
for (jj = 1; jj < rec_buffer.size() ; jj++) { for (jj = 1; jj < rec_buffer.size() ; jj++) {
out_stream << delimiter << rec_buffer[jj]->ref->reference ; out_stream << delimiter << rec_buffer[jj]->ref->reference ;
@ -94,7 +96,7 @@ int Trick::DRAscii::format_specific_init() {
} }
} }
out_stream << std::endl ; out_stream << std::endl ;
total_bytes_written += out_stream.tellp() - before_write;
return(0) ; return(0) ;
} }
@ -105,6 +107,7 @@ int Trick::DRAscii::format_specific_init() {
-# Write out each of the other parameter values preceded by the delimiter to the temporary #writer_buff -# Write out each of the other parameter values preceded by the delimiter to the temporary #writer_buff
-# Write #writer_buff to the output file -# Write #writer_buff to the output file
-# Flush the output file stream -# Flush the output file stream
-# Return the number of bytes written
*/ */
int Trick::DRAscii::format_specific_write_data(unsigned int writer_offset) { int Trick::DRAscii::format_specific_write_data(unsigned int writer_offset) {
unsigned int ii ; unsigned int ii ;
@ -128,8 +131,8 @@ int Trick::DRAscii::format_specific_write_data(unsigned int writer_offset) {
/*! Flush the output */ /*! Flush the output */
out_stream.flush() ; out_stream.flush() ;
/*! +1 for endl */
return(0) ; return(strlen(writer_buff) + 1) ;
} }
/** /**

39
trick_source/sim_services/DataRecord/DRBinary.cpp
View File

@ -53,6 +53,8 @@ int Trick::DRBinary::format_specific_init() {
unsigned int jj ; unsigned int jj ;
int write_value ; int write_value ;
/* number of bytes written to data record */
int bytes = 0 ;
union { union {
long l; long l;
@ -72,45 +74,48 @@ int Trick::DRBinary::format_specific_init() {
writer_buff[record_size * rec_buffer.size() - 1] = 1 ; writer_buff[record_size * rec_buffer.size() - 1] = 1 ;
/* start header information in trk file */ /* start header information in trk file */
if ((fp = creat(file_name.c_str(), S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)) == -1) { if ((fd = creat(file_name.c_str(), S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)) == -1) {
record = false ; record = false ;
return (-1) ; return (-1) ;
} }
/* Check to see if data is being recorded in little endian /* Check to see if data is being recorded in little endian
* byte order, and add little endian line if so. * byte order, and add little endian line if so.
*/ */
byte_order_union.l = 1 ; byte_order_union.l = 1 ;
if (byte_order_union.c[sizeof(long)-1] != 1) { if (byte_order_union.c[sizeof(long)-1] != 1) {
write( fp , "Trick-10-L", (size_t)10 ) ; bytes += write( fd , "Trick-10-L", (size_t)10 ) ;
} else { } else {
write( fp , "Trick-10-B", (size_t)10 ) ; bytes += write( fd , "Trick-10-B", (size_t)10 ) ;
} }
write_value = rec_buffer.size() ; write_value = rec_buffer.size() ;
write( fp , &write_value , sizeof(int) ) ; bytes += write( fd , &write_value , sizeof(int) ) ;
for (jj = 0; jj < rec_buffer.size(); jj++) { for (jj = 0; jj < rec_buffer.size(); jj++) {
/* name */ /* name */
write_value = strlen(rec_buffer[jj]->ref->reference) ; write_value = strlen(rec_buffer[jj]->ref->reference) ;
write( fp , &write_value , sizeof(int)) ; bytes += write( fd , &write_value , sizeof(int)) ;
write( fp , rec_buffer[jj]->ref->reference , write_value ) ; bytes += write( fd , rec_buffer[jj]->ref->reference , write_value ) ;
/* units */ /* units */
if ( rec_buffer[jj]->ref->attr->mods & TRICK_MODS_UNITSDASHDASH ) { if ( rec_buffer[jj]->ref->attr->mods & TRICK_MODS_UNITSDASHDASH ) {
write_value = strlen("--") ; write_value = strlen("--") ;
write( fp , &write_value , sizeof(int)) ; bytes += write( fd , &write_value , sizeof(int)) ;
write( fp , "--" , write_value ) ; bytes += write( fd , "--" , write_value ) ;
} else { } else {
write_value = strlen(rec_buffer[jj]->ref->attr->units) ; write_value = strlen(rec_buffer[jj]->ref->attr->units) ;
write( fp , &write_value , sizeof(int)) ; bytes += write( fd , &write_value , sizeof(int)) ;
write( fp , rec_buffer[jj]->ref->attr->units , write_value ) ; bytes += write( fd , rec_buffer[jj]->ref->attr->units , write_value ) ;
} }
write_value = rec_buffer[jj]->ref->attr->type ; write_value = rec_buffer[jj]->ref->attr->type ;
write( fp , &write_value , sizeof(int)) ; bytes += write( fd , &write_value , sizeof(int)) ;
write( fp , &rec_buffer[jj]->ref->attr->size , sizeof(int)) ; bytes += write( fd , &rec_buffer[jj]->ref->attr->size , sizeof(int)) ;
} }
total_bytes_written += bytes;
return(0) ; return(0) ;
} }
@ -119,6 +124,7 @@ int Trick::DRBinary::format_specific_init() {
-# While there is data in memory that has not been written to disk -# While there is data in memory that has not been written to disk
-# Write out each of the other parameter values to the temporary #writer_buff -# Write out each of the other parameter values to the temporary #writer_buff
-# Write #writer_buff to the output file -# Write #writer_buff to the output file
-# return the number of bytes written
*/ */
int Trick::DRBinary::format_specific_write_data(unsigned int writer_offset) { int Trick::DRBinary::format_specific_write_data(unsigned int writer_offset) {
@ -171,9 +177,7 @@ int Trick::DRBinary::format_specific_write_data(unsigned int writer_offset) {
} }
write( fp , writer_buff , len) ; return write( fd , writer_buff , len) ;
return(0) ;
} }
/** /**
@ -183,8 +187,7 @@ int Trick::DRBinary::format_specific_write_data(unsigned int writer_offset) {
int Trick::DRBinary::format_specific_shutdown() { int Trick::DRBinary::format_specific_shutdown() {
if ( inited ) { if ( inited ) {
close(fp) ; close(fd) ;
} }
return(0) ; return(0) ;
} }

18
trick_source/sim_services/DataRecord/DataRecordDispatcher.cpp
View File

@ -313,6 +313,23 @@ int Trick::DataRecordDispatcher::record_now_group( const char * in_name ) {
return 0 ; return 0 ;
} }
int Trick::DataRecordDispatcher::set_group_max_file_size(const char * in_name, uint64_t bytes){
unsigned int ii ;
for ( ii = 0 ; ii < groups.size() ; ii++ ) {
if ( in_name == NULL or !groups[ii]->get_group_name().compare(in_name) )
groups[ii]->set_max_file_size(bytes) ;
}
return 0 ;
}
int Trick::DataRecordDispatcher::set_max_file_size(uint64_t bytes) {
unsigned int ii ;
for ( ii = 0 ; ii < groups.size() ; ii++ ) {
groups[ii]->set_max_file_size(bytes) ;
}
return 0 ;
}
/** /**
@details @details
-# Call every group's init job - only needed when restoring checkpoint -# Call every group's init job - only needed when restoring checkpoint
@ -325,3 +342,4 @@ int Trick::DataRecordDispatcher::init_groups() {
} }
return 0 ; return 0 ;
} }

20
trick_source/sim_services/DataRecord/DataRecordGroup.cpp
View File

@ -71,6 +71,8 @@ Trick::DataRecordGroup::DataRecordGroup( std::string in_name ) :
max_num(100000), max_num(100000),
buffer_num(0), buffer_num(0),
writer_num(0), writer_num(0),
max_file_size(1<<30), // 1 GB
total_bytes_written(0),
writer_buff(NULL), writer_buff(NULL),
single_prec_only(false), single_prec_only(false),
buffer_type(DR_Buffer), buffer_type(DR_Buffer),
@ -193,6 +195,15 @@ int Trick::DataRecordGroup::set_buffer_type( int in_buffer_type ) {
return(0) ; return(0) ;
} }
int Trick::DataRecordGroup::set_max_file_size( uint64_t bytes ) {
if(bytes == 0) {
max_file_size = UINT64_MAX ;
} else {
max_file_size = bytes ;
}
return(0) ;
}
int Trick::DataRecordGroup::set_single_prec_only( bool in_single_prec_only ) { int Trick::DataRecordGroup::set_single_prec_only( bool in_single_prec_only ) {
single_prec_only = in_single_prec_only ; single_prec_only = in_single_prec_only ;
return(0) ; return(0) ;
@ -248,7 +259,7 @@ int Trick::DataRecordGroup::add_variable( std::string in_name , std::string alia
} }
void Trick::DataRecordGroup::remove_variable( std::string in_name ) { void Trick::DataRecordGroup::remove_variable( std::string in_name ) {
// Trim leading spaces // Trim leading spaces++
in_name.erase( 0, in_name.find_first_not_of( " \t" ) ); in_name.erase( 0, in_name.find_first_not_of( " \t" ) );
// Trim trailing spaces // Trim trailing spaces
in_name.erase( in_name.find_last_not_of( " \t" ) + 1); in_name.erase( in_name.find_last_not_of( " \t" ) + 1);
@ -342,7 +353,7 @@ int Trick::DataRecordGroup::init() {
int ret ; int ret ;
// reset counter here so we can "re-init" our recording // reset counter here so we can "re-init" our recording
buffer_num = writer_num = 0 ; buffer_num = writer_num = total_bytes_written = 0 ;
output_dir = command_line_args_get_output_dir() ; output_dir = command_line_args_get_output_dir() ;
/* this is the common part of the record file name, the format specific will add the correct suffix */ /* this is the common part of the record file name, the format specific will add the correct suffix */
@ -632,7 +643,7 @@ int Trick::DataRecordGroup::write_data(bool must_write) {
unsigned int num_to_write ; unsigned int num_to_write ;
unsigned int writer_offset ; unsigned int writer_offset ;
if ( record and inited and (buffer_type == DR_No_Buffer or must_write)) { if ( record and inited and (buffer_type == DR_No_Buffer or must_write) and (total_bytes_written <= max_file_size)) {
// buffer_mutex is used in this one place to prevent forced calls of write_data // buffer_mutex is used in this one place to prevent forced calls of write_data
// to not overwrite data being written by the asynchronous thread. // to not overwrite data being written by the asynchronous thread.
@ -649,7 +660,8 @@ int Trick::DataRecordGroup::write_data(bool must_write) {
while ( writer_num != local_buffer_num ) { while ( writer_num != local_buffer_num ) {
writer_offset = writer_num % max_num ; writer_offset = writer_num % max_num ;
format_specific_write_data(writer_offset) ; //! keep record of bytes written to file. Default max is 1GB
total_bytes_written += format_specific_write_data(writer_offset) ;
writer_num++ ; writer_num++ ;
} }

14
trick_source/sim_services/DataRecord/data_record_utilities.cpp
View File

@ -78,3 +78,17 @@ extern "C" Trick::DataRecordGroup * get_data_record_group( std::string in_name )
} }
return NULL ; return NULL ;
} }
extern "C" int set_max_size_record_group (const char * in_name, uint64_t bytes ) {
if ( the_drd != NULL ) {
return the_drd->set_group_max_file_size(in_name, bytes ) ;
}
return -1 ;
}
extern "C" int dr_set_max_file_size ( uint64_t bytes ) {
if ( the_drd != NULL ) {
return the_drd->set_max_file_size( bytes ) ;
}
return -1 ;
}