return Colors[ColorNumber % NumColors];
}
-std::string llvm::createGraphFilename(const Twine &Name) {
- std::string ErrMsg;
- sys::Path Filename = sys::Path::GetTemporaryDirectory(&ErrMsg);
- if (Filename.isEmpty()) {
- errs() << "Error: " << ErrMsg << "\n";
- return "";
- }
- Filename.appendComponent((Name + ".dot").str());
- if (Filename.makeUnique(true,&ErrMsg)) {
- errs() << "Error: " << ErrMsg << "\n";
+std::string llvm::createGraphFilename(const Twine &Name, int &FD) {
+ FD = -1;
+ SmallString<128> Filename;
+ error_code EC = sys::fs::createTemporaryFile(Name, "dot", FD, Filename);
+ if (EC) {
+ errs() << "Error: " << EC.message() << "\n";
return "";
}
+
+ errs() << "Writing '" << Filename << "'... ";
return Filename.str();
}
ExecGraphViewer(StringRef ExecPath, std::vector<const char*> &args,
StringRef Filename, bool wait, std::string &ErrMsg) {
if (wait) {
- if (sys::ExecuteAndWait(sys::Path(ExecPath), &args[0],0,0,0,0,&ErrMsg)) {
+ if (sys::ExecuteAndWait(ExecPath, &args[0],0,0,0,0,&ErrMsg)) {
errs() << "Error: " << ErrMsg << "\n";
return false;
}
errs() << " done. \n";
}
else {
- sys::ExecuteNoWait(sys::Path(ExecPath), &args[0],0,0,0,&ErrMsg);
+ sys::ExecuteNoWait(ExecPath, &args[0],0,0,0,&ErrMsg);
errs() << "Remember to erase graph file: " << Filename.str() << "\n";
}
return true;
}
-void llvm::DisplayGraph(StringRef Filename, bool wait,
+void llvm::DisplayGraph(StringRef FilenameRef, bool wait,
GraphProgram::Name program) {
+ std::string Filename = FilenameRef;
wait &= !ViewBackground;
std::string ErrMsg;
#if HAVE_GRAPHVIZ
- sys::Path Graphviz(LLVM_PATH_GRAPHVIZ);
+ std::string Graphviz(LLVM_PATH_GRAPHVIZ);
std::vector<const char*> args;
args.push_back(Graphviz.c_str());
if (!ExecGraphViewer(Graphviz, args, Filename, wait, ErrMsg))
return;
-#elif HAVE_XDOT_PY
+#elif HAVE_XDOT
std::vector<const char*> args;
- args.push_back(LLVM_PATH_XDOT_PY);
+ args.push_back(LLVM_PATH_XDOT);
args.push_back(Filename.c_str());
switch (program) {
args.push_back(0);
errs() << "Running 'xdot.py' program... ";
- if (!ExecGraphViewer(sys::Path(LLVM_PATH_XDOT_PY), args, Filename, wait, ErrMsg))
+ if (!ExecGraphViewer(LLVM_PATH_XDOT, args, Filename, wait, ErrMsg))
return;
#elif (HAVE_GV && (HAVE_DOT || HAVE_FDP || HAVE_NEATO || \
HAVE_TWOPI || HAVE_CIRCO))
- sys::Path PSFilename = sys::Path(Filename);
- PSFilename.appendSuffix("ps");
-
+ std::string PSFilename = Filename + ".ps";
std::string prog;
// Set default grapher
#endif
std::vector<const char*> args;
- std::string FilenameStr = Filename;
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(FilenameStr.c_str());
+ args.push_back(Filename.c_str());
args.push_back("-o");
args.push_back(PSFilename.c_str());
args.push_back(0);
args.push_back(0);
ErrMsg.clear();
- if (!ExecGraphViewer(gv, args, PSFilename.str(), wait, ErrMsg))
+ if (!ExecGraphViewer(gv, args, PSFilename, wait, ErrMsg))
return;
#elif HAVE_DOTTY
- sys::Path dotty(LLVM_PATH_DOTTY);
+ std::string dotty(LLVM_PATH_DOTTY);
std::vector<const char*> args;
args.push_back(dotty.c_str());
errs() << "Running 'dotty' program... ";
if (!ExecGraphViewer(dotty, args, Filename, wait, ErrMsg))
return;
+#else
+ (void)Filename;
+ (void)ErrMsg;
#endif
}