Changes in directory llvm/lib/Analysis:
CFGPrinter.cpp updated: 1.14 -> 1.15 --- Log message: For PR798: http://llvm.cs.uiuc.edu/PR798 : Add support for Graphviz. Patch contributed by Anton Korobeynikov. --- Diffs of the changes: (+66 -14) CFGPrinter.cpp | 80 +++++++++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 66 insertions(+), 14 deletions(-) Index: llvm/lib/Analysis/CFGPrinter.cpp diff -u llvm/lib/Analysis/CFGPrinter.cpp:1.14 llvm/lib/Analysis/CFGPrinter.cpp:1.15 --- llvm/lib/Analysis/CFGPrinter.cpp:1.14 Thu Aug 4 09:16:48 2005 +++ llvm/lib/Analysis/CFGPrinter.cpp Mon Jun 5 10:44:46 2006 @@ -24,6 +24,8 @@ #include "llvm/Assembly/Writer.h" #include "llvm/Support/CFG.h" #include "llvm/Support/GraphWriter.h" +#include "llvm/System/Path.h" +#include "llvm/System/Program.h" #include "llvm/Config/config.h" #include <sstream> #include <fstream> @@ -139,7 +141,14 @@ /// void Function::viewCFG() const { #ifndef NDEBUG - std::string Filename = "/tmp/cfg." + getName() + ".dot"; + char pathsuff[9]; + + sprintf(pathsuff, "%06u", unsigned(rand())); + + sys::Path TempDir = sys::Path::GetTemporaryDirectory(); + sys::Path Filename = TempDir; + + Filename.appendComponent("cfg" + getName() + "." + pathsuff + ".dot"); std::cerr << "Writing '" << Filename << "'... "; std::ofstream F(Filename.c_str()); @@ -152,34 +161,77 @@ F.close(); std::cerr << "\n"; -#ifdef HAVE_GRAPHVIZ +#if HAVE_GRAPHVIZ + sys::Path Graphviz(LLVM_PATH_GRAPHVIZ); + std::vector<const char*> args; + args.push_back(Graphviz.c_str()); + args.push_back(Filename.c_str()); + args.push_back(0); + std::cerr << "Running 'Graphviz' program... " << std::flush; - if (system((LLVM_PATH_GRAPHVIZ " " + Filename).c_str())) { + if (sys::Program::ExecuteAndWait(Graphviz, &args[0])) { std::cerr << "Error viewing graph: 'Graphviz' not in path?\n"; } else { - system(("rm " + Filename).c_str()); + Filename.eraseFromDisk(); return; } -#endif // HAVE_GRAPHVIZ +#elif (HAVE_GV && HAVE_DOT) + sys::Path PSFilename = TempDir; + PSFilename.appendComponent(std::string("cfg.tempgraph") + "." + pathsuff + ".ps"); + + sys::Path dot(LLVM_PATH_DOT); + std::vector<const char*> args; + args.push_back(dot.c_str()); + args.push_back("-Tps"); + args.push_back("-Nfontname=Courier"); + args.push_back("-Gsize=7.5,10"); + args.push_back(Filename.c_str()); + args.push_back("-o"); + args.push_back(PSFilename.c_str()); + args.push_back(0); -#ifdef HAVE_GV std::cerr << "Running 'dot' program... " << std::flush; - if (system(("dot -Tps -Nfontname=Courier -Gsize=7.5,10 " + Filename - + " > /tmp/cfg.tempgraph.ps").c_str())) { - std::cerr << "Error running dot: 'dot' not in path?\n"; + if (sys::Program::ExecuteAndWait(dot, &args[0])) { + std::cerr << "Error viewing graph: 'dot' not in path?\n"; } else { std::cerr << "\n"; - system("gv /tmp/cfg.tempgraph.ps"); + + sys::Path gv(LLVM_PATH_GV); + args.clear(); + args.push_back(gv.c_str()); + args.push_back(PSFilename.c_str()); + args.push_back(0); + + sys::Program::ExecuteAndWait(gv, &args[0]); } - system(("rm " + Filename + " /tmp/cfg.tempgraph.ps").c_str()); + Filename.eraseFromDisk(); + PSFilename.eraseFromDisk(); return; -#endif // HAVE_GV +#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"; + } else { +#ifndef __MINGW32__ // Dotty spawns another app and doesn't wait until it returns + Filename.eraseFromDisk(); +#endif + return; + } +#endif + #endif // NDEBUG std::cerr << "Function::viewCFG is only available in debug builds on " - << "systems with Graphviz or gv!\n"; + << "systems with Graphviz or gv or dotty!\n"; #ifndef NDEBUG - system(("rm " + Filename).c_str()); + Filename.eraseFromDisk(); + TempDir.eraseFromDisk(true); #endif } _______________________________________________ llvm-commits mailing list llvm-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
