Changeset 6a4859e in rtems-tools for tester/covoar/covoar.cc

Timestamp:

08/26/17 08:15:56 (6 years ago)

Author:

Cillian O'Donnell <cpodonnell8@…>

Branches:

5, master

Children:

4600903

Parents:

4cee5c3

git-author:

Cillian O'Donnell <cpodonnell8@…> (08/26/17 08:15:56)

git-committer:

Chris Johns <chrisj@…> (08/29/17 08:06:11)

Message:

covoar: Use rld tempfile and add signals to clean up in event of crash.

Use rld tempfile for temporary files and add fatal signal handling to clean
them up in the event of a crash.

File:

• tester/covoar/covoar.cc (modified) (8 diffs)

tester/covoar/covoar.cc

@@ -23 +23 @@
 #include "TargetFactory.h"
 #include "GcovData.h"
+
+#include "rld-process.h"
 
 /*
@@ -46 +48 @@
 const char*                          format = NULL;
 FILE*                                gcnosFile = NULL;
-Gcov::GcovData*                      gcovFile;
+Gcov::GcovData*          gcovFile;
 
 /*
@@ -147 +149 @@
 }
 
+static void
+fatal_signal( int signum )
+{
+  signal( signum, SIG_DFL );
+
+  rld::process::temporaries_clean_up();
+
+  /*
+   * Get the same signal again, this time not handled, so its normal effect
+   * occurs.
+   */
+  kill( getpid(), signum );
+}
+
+static void
+setup_signals( void )
+{
+  if ( signal( SIGINT, SIG_IGN ) != SIG_IGN )
+    signal( SIGINT, fatal_signal );
+#ifdef SIGHUP
+  if ( signal( SIGHUP, SIG_IGN ) != SIG_IGN )
+    signal( SIGHUP, fatal_signal );
+#endif
+  if ( signal( SIGTERM, SIG_IGN ) != SIG_IGN )
+    signal( SIGTERM, fatal_signal );
+#ifdef SIGPIPE
+  if ( signal( SIGPIPE, SIG_IGN ) != SIG_IGN )
+    signal( SIGPIPE, fatal_signal );
+#endif
+#ifdef SIGCHLD
+  signal( SIGCHLD, SIG_DFL );
+#endif
+}
+
 int main(
   int    argc,
@@ -159 +195 @@
   int                                            opt;
   const char*                                    singleExecutable = NULL;
+  rld::process::tempfile                         objdumpFile( ".dmp" );
+  rld::process::tempfile                         err( ".err" );
+  bool                                           debug = false;
+
+  setup_signals();
 
   CoverageConfiguration = new Configuration::FileReader(Options);
@@ -167 +208 @@
   progname = argv[0];
 
-  while ((opt = getopt(argc, argv, "C:1:L:e:c:g:E:f:s:T:O:p:v")) != -1) {
+  while ((opt = getopt(argc, argv, "C:1:L:e:c:g:E:f:s:T:O:p:v:d")) != -1) {
     switch (opt) {
       case 'C': CoverageConfiguration->processFile( optarg ); break;
@@ -182 +223 @@
       case 'v': Verbose               = true;   break;
       case 'p': projectName           = optarg; break;
+      case 'd': debug                 = true;   break;
       default: /* '?' */
         usage();
@@ -395 +437 @@
 
     // Load the objdump for the symbols in this executable.
-    objdumpProcessor->load( *eitr );
+    objdumpProcessor->load( *eitr, objdumpFile, err );
   }
 
@@ -504 +546 @@
   }
 
+  //Leave tempfiles around if debug flag (-d) is enabled.
+  if ( debug ) {
+        objdumpFile.override( "objdump_file" );
+        objdumpFile.keep();
+        err.override( "objdump_exec_log" );
+        err.keep();
+  }
   return 0;
 }