mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2025-02-08 06:32:24 +00:00
Allow users of GraphWriter to display graphs asynchronously. This
provides a way to quickly dump a bunch of graph information to dot files and display them. It's a timesaver when working on large systems. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@75056 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
59629c1d8b
commit
229509a8bc
@ -29,6 +29,7 @@
|
||||
#include "llvm/System/Path.h"
|
||||
#include <fstream>
|
||||
#include <vector>
|
||||
#include <cassert>
|
||||
|
||||
namespace llvm {
|
||||
|
||||
@ -66,7 +67,7 @@ namespace DOT { // Private functions...
|
||||
}
|
||||
}
|
||||
|
||||
void DisplayGraph(const sys::Path& Filename);
|
||||
void DisplayGraph(const sys::Path& Filename, bool wait=true);
|
||||
|
||||
template<typename GraphType>
|
||||
class GraphWriter {
|
||||
|
@ -18,7 +18,7 @@
|
||||
#include "llvm/Config/config.h"
|
||||
using namespace llvm;
|
||||
|
||||
void llvm::DisplayGraph(const sys::Path &Filename) {
|
||||
void llvm::DisplayGraph(const sys::Path &Filename, bool wait) {
|
||||
std::string ErrMsg;
|
||||
#if HAVE_GRAPHVIZ
|
||||
sys::Path Graphviz(LLVM_PATH_GRAPHVIZ);
|
||||
@ -30,16 +30,24 @@ void llvm::DisplayGraph(const sys::Path &Filename) {
|
||||
|
||||
cerr << "Running 'Graphviz' program... " << std::flush;
|
||||
if (sys::Program::ExecuteAndWait(Graphviz, &args[0],0,0,0,0,&ErrMsg)) {
|
||||
cerr << "Error viewing graph: " << ErrMsg << "\n";
|
||||
cerr << "Error viewing graph " << Filename << ": " << ErrMsg << "\n";
|
||||
}
|
||||
#elif (HAVE_GV && HAVE_DOT)
|
||||
else {
|
||||
Filename.eraseFromDisk();
|
||||
}
|
||||
|
||||
#elif (HAVE_GV && (HAVE_DOT || HAVE_FDP))
|
||||
sys::Path PSFilename = Filename;
|
||||
PSFilename.appendSuffix("ps");
|
||||
|
||||
sys::Path dot(LLVM_PATH_DOT);
|
||||
|
||||
#if HAVE_FDP
|
||||
sys::Path prog(LLVM_PATH_FDP);
|
||||
#else
|
||||
sys::Path prog(LLVM_PATH_DOT);
|
||||
#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");
|
||||
@ -48,9 +56,10 @@ void llvm::DisplayGraph(const sys::Path &Filename) {
|
||||
args.push_back(PSFilename.c_str());
|
||||
args.push_back(0);
|
||||
|
||||
cerr << "Running 'dot' program... " << std::flush;
|
||||
if (sys::Program::ExecuteAndWait(dot, &args[0],0,0,0,0,&ErrMsg)) {
|
||||
cerr << "Error viewing graph: '" << ErrMsg << "\n";
|
||||
cerr << "Running '" << prog << "' program... " << std::flush;
|
||||
|
||||
if (sys::Program::ExecuteAndWait(prog, &args[0],0,0,0,0,&ErrMsg)) {
|
||||
cerr << "Error viewing graph " << Filename << ": '" << ErrMsg << "\n";
|
||||
} else {
|
||||
cerr << " done. \n";
|
||||
|
||||
@ -62,11 +71,18 @@ void llvm::DisplayGraph(const sys::Path &Filename) {
|
||||
args.push_back(0);
|
||||
|
||||
ErrMsg.clear();
|
||||
if (sys::Program::ExecuteAndWait(gv, &args[0],0,0,0,0,&ErrMsg)) {
|
||||
cerr << "Error viewing graph: " << ErrMsg << "\n";
|
||||
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);
|
||||
|
||||
@ -77,13 +93,12 @@ void llvm::DisplayGraph(const sys::Path &Filename) {
|
||||
|
||||
cerr << "Running 'dotty' program... " << std::flush;
|
||||
if (sys::Program::ExecuteAndWait(dotty, &args[0],0,0,0,0,&ErrMsg)) {
|
||||
cerr << "Error viewing graph: " << ErrMsg << "\n";
|
||||
cerr << "Error viewing graph " << Filename << ": " << ErrMsg << "\n";
|
||||
} else {
|
||||
#ifdef __MINGW32__ // Dotty spawns another app and doesn't wait until it returns
|
||||
return;
|
||||
#endif
|
||||
Filename.eraseFromDisk();
|
||||
}
|
||||
#endif
|
||||
|
||||
Filename.eraseFromDisk();
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user