//
// 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.
//
//===----------------------------------------------------------------------===//
//
//
//===----------------------------------------------------------------------===//
+#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, bool wait,
+ GraphProgram::Name program) {
+ std::string ErrMsg;
#if HAVE_GRAPHVIZ
sys::Path Graphviz(LLVM_PATH_GRAPHVIZ);
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... ";
+ if (sys::Program::ExecuteAndWait(Graphviz, &args[0],0,0,0,0,&ErrMsg)) {
+ cerr << "Error viewing graph " << Filename << ": " << ErrMsg << "\n";
+ }
+ else {
+ Filename.eraseFromDisk();
}
-#elif (HAVE_GV && HAVE_DOT)
+
+#elif (HAVE_GV && (HAVE_DOT || HAVE_FDP || HAVE_NEATO || \
+ HAVE_TWOPI || HAVE_CIRCO))
sys::Path PSFilename = Filename;
PSFilename.appendSuffix("ps");
-
- sys::Path dot(LLVM_PATH_DOT);
+
+ sys::Path prog;
+
+ // Set default grapher
+#if HAVE_CIRCO
+ prog = sys::Path(LLVM_PATH_CIRCO);
+#endif
+#if HAVE_TWOPI
+ prog = sys::Path(LLVM_PATH_TWOPI);
+#endif
+#if HAVE_NEATO
+ prog = sys::Path(LLVM_PATH_NEATO);
+#endif
+#if HAVE_FDP
+ prog = sys::Path(LLVM_PATH_FDP);
+#endif
+#if HAVE_DOT
+ prog = sys::Path(LLVM_PATH_DOT);
+#endif
+
+ // Find which program the user wants
+#if HAVE_DOT
+ if (program == GraphProgram::DOT) {
+ prog = sys::Path(LLVM_PATH_DOT);
+ }
+#endif
+#if (HAVE_FDP)
+ if (program == GraphProgram::FDP) {
+ prog = sys::Path(LLVM_PATH_FDP);
+ }
+#endif
+#if (HAVE_NEATO)
+ if (program == GraphProgram::NEATO) {
+ prog = sys::Path(LLVM_PATH_NEATO);
+ }
+#endif
+#if (HAVE_TWOPI)
+ if (program == GraphProgram::TWOPI) {
+ prog = sys::Path(LLVM_PATH_TWOPI);
+ }
+#endif
+#if (HAVE_CIRCO)
+ if (program == GraphProgram::CIRCO) {
+ prog = sys::Path(LLVM_PATH_CIRCO);
+ }
+#endif
std::vector<const char*> args;
- args.push_back(dot.c_str());
+ args.push_back(prog.c_str());
args.push_back("-Tps");
args.push_back("-Nfontname=Courier");
args.push_back("-Gsize=7.5,10");
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 '" << prog << "' program... ";
+
+ if (sys::Program::ExecuteAndWait(prog, &args[0],0,0,0,0,&ErrMsg)) {
+ cerr << "Error viewing graph " << Filename << ": '" << 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(PSFilename.c_str());
+ args.push_back("-spartan");
args.push_back(0);
- sys::Program::ExecuteAndWait(gv, &args[0]);
+ ErrMsg.clear();
+ if (wait) {
+ if (sys::Program::ExecuteAndWait(gv, &args[0],0,0,0,0,&ErrMsg)) {
+ cerr << "Error viewing graph: " << ErrMsg << "\n";
+ }
+ Filename.eraseFromDisk();
+ PSFilename.eraseFromDisk();
+ }
+ else {
+ sys::Program::ExecuteNoWait(gv, &args[0],0,0,0,&ErrMsg);
+ cerr << "Remember to erase graph files: " << Filename << " " << PSFilename << "\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... ";
+ if (sys::Program::ExecuteAndWait(dotty, &args[0],0,0,0,0,&ErrMsg)) {
+ cerr << "Error viewing graph " << Filename << ": " << 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
+ Filename.eraseFromDisk();
}
#endif
-
- Filename.eraseFromDisk();
}
-
-} // End llvm namespace