X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=lib%2FSupport%2FGraphWriter.cpp;h=aad1818372a35bc59f0d4e81f438342328acf085;hb=befc9c16fae1719cafe9f54ab2b67219db44dc11;hp=73126e29258c76c579ada9c8723604f37f50aecf;hpb=9d5b532de9bdca37810a59a93a69128441b02c55;p=oota-llvm.git

diff --git a/lib/Support/GraphWriter.cpp b/lib/Support/GraphWriter.cpp
index 73126e29258..aad1818372a 100644
--- a/lib/Support/GraphWriter.cpp
+++ b/lib/Support/GraphWriter.cpp
@@ -2,8 +2,8 @@
 //
 //                     The LLVM Compiler Infrastructure
 //
-// This file was developed by the LLVM research group and is distributed under
-// the University of Illinois Open Source License. See LICENSE.TXT for details.
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
@@ -11,18 +11,15 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "llvm/Support/GraphWriter.h"
+#include "llvm/Support/Streams.h"
 #include "llvm/System/Path.h"
 #include "llvm/System/Program.h"
 #include "llvm/Config/config.h"
-
-#include <iostream>
-
 using namespace llvm;
 
-namespace llvm {
-
-void DisplayGraph(const sys::Path& Filename)
-{
+void llvm::DisplayGraph(const sys::Path &Filename) {
+  std::string ErrMsg;
 #if HAVE_GRAPHVIZ
   sys::Path Graphviz(LLVM_PATH_GRAPHVIZ);
 
@@ -31,9 +28,9 @@ void DisplayGraph(const sys::Path& Filename)
   args.push_back(Filename.c_str());
   args.push_back(0);
   
-  std::cerr << "Running 'Graphviz' program... " << std::flush;
-  if (sys::Program::ExecuteAndWait(Graphviz, &args[0])) {
-    std::cerr << "Error viewing graph: 'Graphviz' not in path?\n";
+  cerr << "Running 'Graphviz' program... " << std::flush;
+  if (sys::Program::ExecuteAndWait(Graphviz, &args[0],0,0,0,0,&ErrMsg)) {
+    cerr << "Error viewing graph: " << ErrMsg << "\n";
   }
 #elif (HAVE_GV && HAVE_DOT)
   sys::Path PSFilename = Filename;
@@ -51,33 +48,38 @@ void DisplayGraph(const sys::Path& Filename)
   args.push_back(PSFilename.c_str());
   args.push_back(0);
   
-  std::cerr << "Running 'dot' program... " << std::flush;
-  if (sys::Program::ExecuteAndWait(dot, &args[0])) {
-    std::cerr << "Error viewing graph: 'dot' not in path?\n";
+  cerr << "Running 'dot' program... " << std::flush;
+  if (sys::Program::ExecuteAndWait(dot, &args[0],0,0,0,0,&ErrMsg)) {
+    cerr << "Error viewing graph: '" << ErrMsg << "\n";
   } else {
-    std::cerr << " done. \n";
+    cerr << " done. \n";
 
     sys::Path gv(LLVM_PATH_GV);
     args.clear();
     args.push_back(gv.c_str());
+    args.push_back("--spartan");
     args.push_back(PSFilename.c_str());
     args.push_back(0);
     
-    sys::Program::ExecuteAndWait(gv, &args[0]);
+    ErrMsg.clear();
+    if (sys::Program::ExecuteAndWait(gv, &args[0],0,0,0,0,&ErrMsg)) {
+      cerr << "Error viewing graph: " << ErrMsg << "\n";
+    }
   }
   PSFilename.eraseFromDisk();
 #elif HAVE_DOTTY
   sys::Path dotty(LLVM_PATH_DOTTY);
 
   std::vector<const char*> args;
+  args.push_back(dotty.c_str());
   args.push_back(Filename.c_str());
   args.push_back(0);
   
-  std::cerr << "Running 'dotty' program... " << std::flush;
-  if (sys::Program::ExecuteAndWait(dotty, &args[0])) {
-    std::cerr << "Error viewing graph: 'dotty' not in path?\n";
+  cerr << "Running 'dotty' program... " << std::flush;
+  if (sys::Program::ExecuteAndWait(dotty, &args[0],0,0,0,0,&ErrMsg)) {
+    cerr << "Error viewing graph: " << ErrMsg << "\n";
   } else {
-#ifdef __MINGW32__ // Dotty spawns another app and doesn't wait until it returns.
+#ifdef __MINGW32__ // Dotty spawns another app and doesn't wait until it returns
     return;
 #endif
   }
@@ -85,5 +87,3 @@ void DisplayGraph(const sys::Path& Filename)
   
   Filename.eraseFromDisk();
 }
-
-} // End llvm namespace