X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=lib%2FSupport%2FSystemUtils.cpp;h=80d6e4cba9fb6a59e8383b2ca1589862d625b077;hb=ebb5a971d903aa4479bb2a21472597319a9b0086;hp=72e4e917efb8e27c01e67201780302f26623dc49;hpb=44f6966ef076b223b69da893c438236ea0fc677e;p=oota-llvm.git diff --git a/lib/Support/SystemUtils.cpp b/lib/Support/SystemUtils.cpp index 72e4e917efb..80d6e4cba9f 100644 --- a/lib/Support/SystemUtils.cpp +++ b/lib/Support/SystemUtils.cpp @@ -1,10 +1,10 @@ //===- SystemUtils.cpp - Utilities for low-level system tasks -------------===// -// +// // 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. +// //===----------------------------------------------------------------------===// // // This file contains functions used to do a variety of low-level, often @@ -12,151 +12,47 @@ // //===----------------------------------------------------------------------===// +#include "llvm/Support/Streams.h" #include "llvm/Support/SystemUtils.h" +#include "llvm/System/Process.h" #include "llvm/System/Program.h" -#include "llvm/Config/fcntl.h" -#include "llvm/Config/sys/wait.h" -#include -#include -#include -#include -#include -#include - +#include using namespace llvm; -/// isStandardOutAConsole - Return true if we can tell that the standard output -/// stream goes to a terminal window or console. -bool llvm::isStandardOutAConsole() { -#if HAVE_ISATTY - return isatty(1); -#endif - // If we don't have isatty, just return false. +bool llvm::CheckBitcodeOutputToConsole(std::ostream* stream_to_check, + bool print_warning) { + if (stream_to_check == cout.stream() && + sys::Process::StandardOutIsDisplayed()) { + if (print_warning) { + cerr << "WARNING: You're attempting to print out a bitcode file.\n" + << "This is inadvisable as it may cause display problems. If\n" + << "you REALLY want to taste LLVM bitcode first-hand, you\n" + << "can force output with the `-f' option.\n\n"; + } + return true; + } return false; } - /// FindExecutable - Find a named executable, giving the argv[0] of program /// being executed. This allows us to find another LLVM tool if it is built /// into the same directory, but that directory is neither the current /// directory, nor in the PATH. If the executable cannot be found, return an /// empty string. -/// +/// #undef FindExecutable // needed on windows :( sys::Path llvm::FindExecutable(const std::string &ExeName, - const std::string &ProgramPath) { - // First check the directory that the calling program is in. We can do this + const std::string &ProgramPath) { + // First check the directory that the calling program is in. We can do this // if ProgramPath contains at least one / character, indicating that it is a // relative path to bugpoint itself. - // sys::Path Result ( ProgramPath ); - Result.elideFile(); - + Result.eraseComponent(); if (!Result.isEmpty()) { - Result.appendFile(ExeName); - if (Result.executable()) return Result; + Result.appendComponent(ExeName); + if (Result.canExecute()) + return Result; } return sys::Program::FindProgramByName(ExeName); } - -static void RedirectFD(const std::string &File, int FD) { - if (File.empty()) return; // Noop - - // Open the file - int InFD = open(File.c_str(), FD == 0 ? O_RDONLY : O_WRONLY|O_CREAT, 0666); - if (InFD == -1) { - std::cerr << "Error opening file '" << File << "' for " - << (FD == 0 ? "input" : "output") << "!\n"; - exit(1); - } - - dup2(InFD, FD); // Install it as the requested FD - close(InFD); // Close the original FD -} - -static bool Timeout = false; -static void TimeOutHandler(int Sig) { - Timeout = true; -} - -/// RunProgramWithTimeout - This function executes the specified program, with -/// the specified null-terminated argument array, with the stdin/out/err fd's -/// redirected, with a timeout specified by the last argument. This terminates -/// the calling program if there is an error executing the specified program. -/// It returns the return value of the program, or -1 if a timeout is detected. -/// -int llvm::RunProgramWithTimeout(const std::string &ProgramPath, - const char **Args, - const std::string &StdInFile, - const std::string &StdOutFile, - const std::string &StdErrFile, - unsigned NumSeconds) { -#ifdef HAVE_SYS_WAIT_H - int Child = fork(); - switch (Child) { - case -1: - std::cerr << "ERROR forking!\n"; - exit(1); - case 0: // Child - RedirectFD(StdInFile, 0); // Redirect file descriptors... - RedirectFD(StdOutFile, 1); - if (StdOutFile != StdErrFile) - RedirectFD(StdErrFile, 2); - else - dup2(1, 2); - - execv(ProgramPath.c_str(), (char *const *)Args); - std::cerr << "Error executing program: '" << ProgramPath; - for (; *Args; ++Args) - std::cerr << " " << *Args; - std::cerr << "'\n"; - exit(1); - - default: break; - } - - // Make sure all output has been written while waiting - std::cout << std::flush; - - // Install a timeout handler. - Timeout = false; - struct sigaction Act, Old; - Act.sa_sigaction = 0; - Act.sa_handler = TimeOutHandler; - sigemptyset(&Act.sa_mask); - Act.sa_flags = 0; - sigaction(SIGALRM, &Act, &Old); - - // Set the timeout if one is set. - if (NumSeconds) - alarm(NumSeconds); - - int Status; - while (wait(&Status) != Child) - if (errno == EINTR) { - if (Timeout) { - // Kill the child. - kill(Child, SIGKILL); - - if (wait(&Status) != Child) - std::cerr << "Something funny happened waiting for the child!\n"; - - alarm(0); - sigaction(SIGALRM, &Old, 0); - return -1; // Timeout detected - } else { - std::cerr << "Error waiting for child process!\n"; - exit(1); - } - } - - alarm(0); - sigaction(SIGALRM, &Old, 0); - return Status; - -#else - std::cerr << "RunProgramWithTimeout not implemented on this platform!\n"; - return -1; -#endif -}