Merge pull request #33 from pixie16/dev

Merge of dev work from pixie16 group.

Author: ksmith0

CMakeLists.txt

@@ -10,10 +10,10 @@ if (CMAKE_COMPILER_IS_GNUCXX)
 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdiagnostics-color=auto")
 	endif()
 
-        if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
-          set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
-        endif()
-
+	if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
+	   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
+	endif()
+	
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic")
 endif()
 
@@ -89,7 +89,12 @@ if (NOT ${CORE_ONLY})
 	link_directories(${PXI_LIBRARY_DIR})
 	#The following configuration file path is hardcoded into the PXI software :-(
 	install(FILES ${PXI_ROOT_DIR}/test/pxisys.ini DESTINATION ${CMAKE_INSTALL_PREFIX})
-        install(FILES Setup/source/pixie.cfg DESTINATION ${CMAKE_INSTALL_PREFIX})
+
+	#Create pixie.cfg and copy slot_def.set as well as default.set to current.set
+	PXI_CONFIG()
+	#Use the cmake script created by PXI_CONFIG to install the files it created when make config is typed
+	add_custom_target(config ${CMAKE_COMMAND} -P pixie_cfg.cmake)	
+
 endif()
 
 add_subdirectory(Core)
@@ -99,14 +104,14 @@ if (NOT ${CORE_ONLY})
 	include_directories(Interface/include)
 	add_subdirectory(Interface/source)
 
+	include_directories(MCA/include)
+	add_subdirectory(MCA)
+
 	if (USE_SETUP) 
 		include_directories(Setup/include)
 		add_subdirectory(Setup/source)
 	endif()
 
-	include_directories(MCA/include)
-	add_subdirectory(MCA)
-
 	add_subdirectory(Poll)
 
 	add_subdirectory(PxiDump/source)

Core/include/CTerminal.h

@@ -7,9 +7,9 @@
   *
   * \author Cory R. Thornsberry
   * 
-  * \date May 13th, 2015
+  * \date Oct. 1st, 2015
   * 
-  * \version 1.1.06
+  * \version 1.2.02
 */
 
 #ifndef CTERMINAL_H
@@ -23,13 +23,11 @@
 ///Default size of terminal scroll back buffer in lines.
 #define SCROLLBACK_SIZE 1000
 
-#define CTERMINAL_VERSION "1.1.06"
-#define CTERMINAL_DATE "May 13th, 2015"
+#define CTERMINAL_VERSION "1.2.02"
+#define CTERMINAL_DATE "Oct. 2nd, 2015"
 
 #include <curses.h>
 
-extern bool SIGNAL_INTERRUPT;
-
 extern std::string CPP_APP_VERSION;
 
 template <typename T>
@@ -219,6 +217,7 @@ class Terminal{
 	std::string prompt;
 	///The tab complete flag
 	bool enableTabComplete;
+	float commandTimeout_; ///<Time in seconds to wait for command.
 
 	short tabCount;
 
@@ -289,6 +288,9 @@ class Terminal{
 	void EnableTabComplete(bool enable = true);
 	void TabComplete(std::vector<std::string> matches);
 
+	///Enable a timeout while waiting fro a command.
+	void EnableTimeout(float timeout = 0.5);
+
 	/** Set the command filename for storing previous commands This command will 
 	  * clear all current commands from the history if overwrite_ is set to true. */
 	void SetCommandFilename(std::string input_, bool overwrite_=false);

Core/include/Unpacker.hpp

@@ -17,9 +17,6 @@ class Unpacker{
 
 	unsigned int event_width; /// The width of the raw event in pixie clock ticks (8 ns).
 
-	bool raw_event_mode; /// Placeholder bool for dumping raw events to file.
-	bool use_hires_time; /// Placeholder bool for using high resolution pulse fitting.
-	
 	bool debug_mode; /// True if debug mode is set.
 	bool init; /// True if the class has been properly initialized.
 
@@ -74,7 +71,7 @@ class Unpacker{
 	/** Initialize the Unpacker object. Does nothing useful if not overloaded
 	 * by a derived class.
 	 */
-	virtual bool Initialize();
+	virtual bool Initialize(std::string prefix_="");
 
 	/** Initialize the root output. Does nothing useful if not overloaded
 	 * by a derived class.
@@ -86,7 +83,7 @@ class Unpacker{
 
 	/// Toggle debug mode on / off.
 	bool SetDebugMode(bool state_=true){ return (debug_mode = state_); }
-	
+
 	/// Set the width of events in pixie16 clock ticks.
 	unsigned int SetEventWidth(unsigned int width_){ return (event_width = width_); }
 
@@ -96,9 +93,22 @@ class Unpacker{
 	 */	
 	bool ReadSpill(unsigned int *data, unsigned int nWords, bool is_verbose=true);
 
-	virtual bool SetRawEventMode(bool state_=true){ return (raw_event_mode = state_); }
+	/// Return the syntax string for this program.
+	virtual void SyntaxStr(const char *name_, std::string prefix_=""){ std::cout << prefix_ << "SYNTAX: " << std::string(name_) << " <options> <input>\n"; }
+
+	/// Print a help dialogue.
+	virtual void Help(std::string prefix_=""){}
 
-	virtual bool SetHiResMode(bool state_=true){ return (use_hires_time = state_); }
+	/// Scan input arguments and set class variables.
+	virtual bool SetArgs(std::deque<std::string> &args_, std::string &filename_){ return true; }
+
+	/// Print a status message.
+	virtual void PrintStatus(std::string prefix_=""){}
+
+	/// Empty the raw event and the event list.
+	void Close();
 };
 
+extern Unpacker *GetCore(); /// External function which returns a pointer to a class derived from Unpacker.
+
 #endif

Core/include/hribf_buffers.h

@@ -14,9 +14,9 @@
   *
   * \author Cory R. Thornsberry
   * 
-  * \date June 27th, 2015
+  * \date Sept. 29th, 2015
   * 
-  * \version 1.2.03
+  * \version 1.2.04
 */
 
 #ifndef HRIBF_BUFFERS_H
@@ -25,8 +25,10 @@
 #include <fstream>
 #include <vector>
 
-#define HRIBF_BUFFERS_VERSION "1.2.03"
-#define HRIBF_BUFFERS_DATE "June 27th, 2015"
+#define HRIBF_BUFFERS_VERSION "1.2.04"
+#define HRIBF_BUFFERS_DATE "Sept. 29th, 2015"
+
+class Client;
 
 class BufferType{
   protected:
@@ -324,7 +326,7 @@ class PollOutputFile{
 
 	/** Build a data spill notification message for broadcast onto the network
 	  * Return the total number of bytes in the packet upon success, and -1 otherwise */
-	int BuildPacket(char *&output);
+	int SendPacket(Client *cli_);
 
 	/// Close the current file, if one is open, and open a new file for data output
 	bool OpenNewFile(std::string title_, int &run_num_, std::string prefix, std::string output_dir="./", bool continueRun = false);

Core/source/CMakeLists.txt

@@ -7,8 +7,12 @@ add_library(PixieCoreObjects OBJECT ${PixieCore_SOURCES})
 
 add_library(PixieCore SHARED $<TARGET_OBJECTS:PixieCoreObjects>)
 
+target_link_libraries(PixieCore ${CMAKE_THREAD_LIBS_INIT})
+
 add_library(PixieCoreStatic STATIC $<TARGET_OBJECTS:PixieCoreObjects>)
 
+target_link_libraries(PixieCoreStatic ${CMAKE_THREAD_LIBS_INIT})
+
 if (${CURSES_FOUND})
 	target_link_libraries(PixieCore ${CURSES_LIBRARIES})
 	target_link_libraries(PixieCoreStatic ${CURSES_LIBRARIES})

Core/source/CTerminal.cpp

@@ -7,15 +7,16 @@
   *
   * \author Cory R. Thornsberry
   * 
-  * \date May 13th, 2015
+  * \date Oct. 2nd, 2015
   * 
-  * \version 1.1.06
+  * \version 1.2.02
 */
 
 #include <iostream>
 #include <fstream>
 #include <unistd.h>
 #include <vector>
+#include <ctime>
 
 #ifdef USE_NCURSES
 
@@ -30,7 +31,9 @@
 
 #ifdef USE_NCURSES
 
+bool SIGNAL_SEGFAULT = false;
 bool SIGNAL_INTERRUPT = false;
+bool SIGNAL_TERMSTOP = false;
 bool SIGNAL_RESIZE = false;
 
 #endif
@@ -273,26 +276,48 @@ void CommandString::Pop(unsigned int index_){
 // Terminal
 ///////////////////////////////////////////////////////////////////////////////
 
+void sig_segv_handler(int ignore_){
+	SIGNAL_SEGFAULT = true;
+}
+
 void sig_int_handler(int ignore_){
 	SIGNAL_INTERRUPT = true;
 }
 
+void sig_tstp_handler(int ignore_){
+	SIGNAL_TERMSTOP = true;
+}
+
 void signalResize(int ignore_) {
 	SIGNAL_RESIZE = true;
 }
 
 
 // Setup the interrupt signal intercept
 void setup_signal_handlers(){ 
+	// Handle segmentation faults press (SIGSEGV)
+	if(signal(SIGSEGV, SIG_IGN) != SIG_IGN){	
+		if(signal(SIGSEGV, sig_segv_handler) == SIG_ERR){
+			throw std::runtime_error(" Error setting up SIGSEGV signal handler!");
+		}
+	}
+
+	// Handle ctrl-c press (SIGINT)
 	if(signal(SIGINT, SIG_IGN) != SIG_IGN){	
 		if(signal(SIGINT, sig_int_handler) == SIG_ERR){
-			throw std::runtime_error(" Error setting up signal handler!");
+			throw std::runtime_error(" Error setting up SIGINT signal handler!");
+		}
+	}
+
+	// Handle ctrl-z press (SIGTSTP)
+	if(signal(SIGTSTP, SIG_IGN) != SIG_IGN){
+		if(signal(SIGTSTP, sig_tstp_handler) == SIG_ERR){
+			throw std::runtime_error(" Error setting up SIGTSTP signal handler!");
 		}
 	}
 
 	//Handle resize signal
 	signal(SIGWINCH, signalResize);
-
 }
 void Terminal::resize_() {
 	//end session and then refresh to get new window sizes.
@@ -524,6 +549,7 @@ bool Terminal::save_commands_(){
 Terminal::Terminal() :
 	status_window(NULL),
 	_statusWindowSize(0),
+	commandTimeout_(0),
 	_scrollbackBufferSize(SCROLLBACK_SIZE),
 	_scrollPosition(0)
 {
@@ -721,6 +747,17 @@ void Terminal::EnableTabComplete(bool enable) {
 	enableTabComplete = enable;
 }
 
+/**By enabling the timeout the GetCommand() routine returns after a set
+ * timesout period has passed. The current typed text is stored for the next
+ * GetCommand call.
+ *
+ * \param[in] timeout The amount of time to wait before timeout in seconds
+ * 	defaults to 0.5 s.
+ */
+void Terminal::EnableTimeout(float timeout/*=0.5*/) {
+	commandTimeout_ = timeout;
+}
+
 /**Take the list of matching tab complete values and output resulting tab completion.
  * If the list is empty nothing happens, if a unique value is given the command is completed. If there are multiple
  * matches the common part of the matches is determined and printed to the input. If there is no common part of the
@@ -780,6 +817,9 @@ void Terminal::TabComplete(std::vector<std::string> matches) {
 
 std::string Terminal::GetCommand(){
 	std::string output = "";
+	time_t commandRequestTime;
+	time_t currentTime;
+	time(&commandRequestTime);
 
 	//Update status message
 	if (status_window) {
@@ -788,40 +828,58 @@ std::string Terminal::GetCommand(){
 	}
 
 	while(true){
+		if(SIGNAL_SEGFAULT){ // segmentation fault (SIGSEGV)
+			Close();
+			return "_SIGSEGV_";
+		}
 		if(SIGNAL_INTERRUPT){ // ctrl-c (SIGINT)
 			SIGNAL_INTERRUPT = false;
 			output = "CTRL_C";
 			text_length = 0;
 			break;
 		}
+		else if(SIGNAL_TERMSTOP){ // ctrl-z (SIGTSTP)
+			SIGNAL_TERMSTOP = false;
+			output = "CTRL_Z";
+			text_length = 0;
+			break;
+		}
 
 		flush(); // If there is anything in the stream, dump it to the screen
+
+		//Time out if there is no command within the set interval (default 0.5 s). 
+		if (commandTimeout_ > 0) {
+			time(&currentTime);
+			//If the timeout has passed we simply return the empty output string.
+			if (currentTime > commandRequestTime + commandTimeout_) {
+				break;
+			}
+		}
 
 		int keypress = wgetch(input_window);
 
 		// Check for internal commands
-		if(keypress == 10){ // Enter key (10)
+		if(keypress == ERR){ } // No key was pressed in the interval
+		else if(keypress == 10){ // Enter key (10)
 			std::string temp_cmd = cmd.Get();
-			if(temp_cmd != ""){ 
-				//Reset the position in the history.
-				commands.Reset();
-				if(temp_cmd != commands.PeekPrev()){ // Only save this command if it is different than the previous command
-					commands.Push(temp_cmd);
-				}
-				output = temp_cmd;
-				std::cout << prompt.c_str() << output << "\n";
-				flush();
-				text_length = 0;
-				_scrollPosition = 0;
-				clear_();
-				tabCount = 0;
-				return output;
+			//Reset the position in the history.
+			commands.Reset();
+			if(temp_cmd != "" && temp_cmd != commands.PeekPrev()){ // Only save this command if it is different than the previous command
+				commands.Push(temp_cmd);
 			}
+			output = temp_cmd;
+			std::cout << prompt << output << "\n";
+			flush();
+			text_length = 0;
+			_scrollPosition = 0;
+			clear_();
+			tabCount = 0;
+			break;
 		} 
 		else if(keypress == '\t' && enableTabComplete) {
 			tabCount++;
 			output = cmd.Get().substr(0,cursX - offset) + "\t";
-			return output;
+			break;
 		}
 		else if(keypress == 4){ // ctrl-d (EOT)
 			output = "CTRL_D";
@@ -893,7 +951,6 @@ std::string Terminal::GetCommand(){
 		else if(keypress == KEY_RESIZE) {
 			//Do nothing with the resize key
 		}
-		else if(keypress == ERR){ } // No key was pressed in the interval
 		else{ 
 			in_char_((char)keypress); 
 			cmd.Put((char)keypress, cursX - offset - 1);