Changeset a0da83 in git

Timestamp:

Mar 31, 2015, 3:36:56 PM (9 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

06cff955d56f17b8a3199fd8db5e3f4a6be98f35

Parents:

56225c216f0df9632a02f7b745efacd6da070754

Message:

test for a code coverage tool: via smon.out

Location:

Singular

Files:

• feOpt.cc (modified) (3 diffs)
• feOptTab.h (modified) (1 diff)
• fevoices.cc (modified) (2 diffs)
• misc_ip.cc (modified) (1 diff)
• sprof.c (added)

Singular/feOpt.cc

@@ -27 +27 @@
 
 
-const char SHORT_OPTS_STRING[] = "bdhqstvxec:r:u:";
+const char SHORT_OPTS_STRING[] = "bdhpqstvxec:r:u:";
 
 //////////////////////////////////////////////////////////////
@@ -213 +213 @@
         return NULL;
 
+      case FE_OPT_PROFILE:
+         traceit=1024;
+         return NULL;
+
       case FE_OPT_QUIET:
         if (feOptSpec[FE_OPT_QUIET].value)
@@ -252 +256 @@
       case FE_OPT_RANDOM:
         siRandomStart = (unsigned int) ((unsigned long)
-                                          (feOptSpec[FE_OPT_RANDOM].value));
+                                          (feOptSpec[FE_OPT_RANDOM].value));
         siSeed=siRandomStart;
         factoryseed(siRandomStart);

Singular/feOptTab.h

@@ -82 +82 @@
 
   {"echo",              optional_argument,  'e',
-   "VAL",       "Set value of variable `echo' to (integer) VAL",        feOptInt,    0,      0},
+   "VAL",       "Set value of variable `echo' to (integer) VAL",       feOptInt,    0,      0},
 
   {"help",              no_argument,        'h',
    0,          "Print help message and exit",                          feOptUntyped,    0,      0},
 
+  {"profile",           no_argument,        'p',
+   0,          "Collect profiling data in smon.out",                   feOptBool,    0,      0},
   {"quiet",             no_argument,        'q',
    0,          "Do not print start-up banner and lib load messages",   feOptBool,    0,      0},

Singular/fevoices.cc

@@ -35 +35 @@
 
 char fe_promptstr[] ="  ";
+FILE *File_Profiling=NULL;
 
 // output/print buffer:
@@ -458 +459 @@
     Print("{%d}",yylineno);
     mflush();
+  }
+  else if (traceit&TRACE_PROFILING)
+  {
+    if (File_Profiling==NULL)
+      File_Profiling=fopen("smon.out","a");
+    if (File_Profiling==NULL)
+      traceit &= (~TRACE_PROFILING);
+    else
+    {
+      if (currentVoice->filename==NULL)
+        fprintf(File_Profiling,"(none) %d\n",yylineno);
+      else
+        fprintf(File_Profiling,"%s %d\n",currentVoice->filename,yylineno);
+    }
   }
 #ifdef HAVE_SDB

Singular/misc_ip.cc

@@ -1076 +1076 @@
   if (!m2_end_called)
   {
+    extern FILE* File_Profiling;
+    if (File_Profiling!=NULL) { fclose(File_Profiling); File_Profiling=NULL; }
     m2_end_called = TRUE;
 #ifdef HAVE_SIMPLEIPC