Changes to OTF:

- fixed Coverity CIDs: 72269, 743285, 743294, 743295, 993125

This commit was SVN r28231.

ompi/contrib/vt/vt/extlib/otf/tools/otfprofile/collect_dispersion.cpp

@@ -601,8 +601,7 @@ static void share_profiledata( AllData& alldata ) {
           }
     }
     delete[] buffer;
-    if(callpath_length > 0)
-        delete[] callpath;
+    delete[] callpath;
 }
 #endif /* OTFPROFILE_MPI */
 

ompi/contrib/vt/vt/extlib/otf/tools/otfprofile/create_latex.cpp

@@ -908,6 +908,9 @@ static void write_Dispersion(fstream& tex, struct AllData& alldata)
   tex << "\\end{tikzpicture}" << endl;
   tex << "}" << endl;
 
+  const std::ios_base::fmtflags tex_flags_sav = tex.flags();
+  const std::streamsize tex_prec_sav = tex.precision();
+
   tex.setf(ios::fixed, ios::floatfield);
   tex.precision(7);
 
@@ -1023,6 +1026,9 @@ static void write_Dispersion(fstream& tex, struct AllData& alldata)
 
   tex << "\\end{flushleft}" << endl << endl;
   tex << "\\newpage" << endl << endl;
+
+  tex.setf(tex_flags_sav);
+  tex.precision(tex_prec_sav);
 }
 
  /*
@@ -1495,6 +1501,9 @@ static void write_Dispersion_callpath(fstream& tex, struct AllData& alldata) {
 
             label[countc] = func_name;
             if ((factor <= 0) | (lowq < 0) | (median < 0) | (topq < 0)) {
+                const std::ios_base::fmtflags cout_flags_sav = std::cout.flags();
+                const std::streamsize cout_prec_sav = std::cout.precision();
+
                 cout.setf(ios::scientific, ios::floatfield);
                 cout.precision(5);
 
@@ -1507,6 +1516,9 @@ static void write_Dispersion_callpath(fstream& tex, struct AllData& alldata) {
                         << itc->second.excl_time_top_quartile << ", "
                         << "maximum: " << itc->second.excl_time_maximum << endl;
 
+                cout.setf(cout_flags_sav);
+                cout.precision(cout_prec_sav);
+
                 countc++;
                 itc++;
                 continue;

ompi/contrib/vt/vt/extlib/otf/tools/otfprofile/datastructs.h

@@ -167,7 +167,17 @@ struct Progress {
 #endif /* OTFPROFILE_MPI */
 
     Progress()
-        : cur_bytes(0), max_bytes(0) {}
+        : cur_bytes(0), max_bytes(0) {
+#ifdef OTFPROFILE_MPI
+        send_request   = MPI_REQUEST_NULL;
+        recv_buffers   = NULL;
+        recv_requests  = NULL;
+        recv_statuses  = NULL;
+        recv_indices   = NULL;
+        rank_cur_bytes = NULL;
+        ranks_left     = 0;
+#endif /* OTFPROFILE_MPI */
+    }
 };
 
 

ompi/contrib/vt/vt/extlib/otf/tools/otfprofile/otfprofile.cpp

@@ -826,6 +826,8 @@ static bool assign_procs(AllData& alldata) {
             cerr << "ERROR: Unable to open file '"
                     << alldata.params.input_file_prefix << ".otf' for reading."
                     << endl;
+            OTF_MasterControl_close(master);
+            OTF_FileManager_close(manager);
             error = true;
         }
     }