Add timeouts to the thunk generated by toolchain models.

StanfordSNR · Sep 17, 2018 · 5b0a4d8 · 5b0a4d8
1 parent 9b87791
commit 5b0a4d8
Show file tree

Hide file tree

Showing 14 changed files with 81 additions and 21 deletions.
diff --git a/examples/gtest/create-thunks.cc b/examples/gtest/create-thunks.cc
@@ -5,6 +5,7 @@
 #include <sstream>
 #include <string>
 #include <vector>
+#include <chrono>
 #include <algorithm>
 #include <cctype>
 #include <getopt.h>
@@ -17,8 +18,11 @@
 #include "util/path.hh"
 
 using namespace std;
+using namespace std::chrono;
 using namespace gg::thunk;
 
+static constexpr milliseconds TIMEOUT = 20s;
+
 void usage( const char * argv0 )
 {
   cerr << "Usage: " << argv0 << endl
@@ -81,6 +85,7 @@ struct TestCase
       executables,
       outputs,
       {},
+      TIMEOUT,
       ThunkFactory::Options::collect_data
       | ThunkFactory::Options::include_filenames
     );

diff --git a/src/models/Makefile.am b/src/models/Makefile.am
@@ -18,7 +18,7 @@ bin_PROGRAMS = model-gcc model-ar model-ranlib model-strip model-ld \
                model-generic model-nm model-readelf generate-deps dir-watcher
 
 COMMON_TOOLCHAIN_SOURCES = cli_description.hh cli_description.cc \
-                           toolchain.hh toolchain.cc gcc.hh
+                           toolchain.hh toolchain.cc gcc.hh timeouts.hh
 
 model_gcc_SOURCES = gcc.cc gcc-base.cc preprocessor.cc \
                     linker.cc linker-base.cc gcc-args.cc \

diff --git a/src/models/ar.cc b/src/models/ar.cc
@@ -4,6 +4,7 @@
 #include <cstring>
 #include <getopt.h>
 
+#include "timeouts.hh"
 #include "thunk/factory.hh"
 #include "thunk/ggutils.hh"
 #include "thunk/thunk.hh"
@@ -15,9 +16,10 @@
 #include "toolchain.hh"
 
 using namespace std;
+using namespace std::chrono;
 using namespace gg::thunk;
 
-const int PLUGIN_FLAG = 1000;
+static constexpr int PLUGIN_FLAG = 1000;
 
 /* this function is based on ar source code */
 void generate_thunk( int argc, char * argv[] )
@@ -131,6 +133,7 @@ void generate_thunk( int argc, char * argv[] )
     { program_data.at( AR ) },
     { { "output", outfile } },
     {},
+    AR_TIMEOUT,
     ThunkFactory::Options::create_placeholder
       | ThunkFactory::Options::collect_data
       | ThunkFactory::Options::generate_manifest

diff --git a/src/models/gcc.cc b/src/models/gcc.cc
@@ -12,10 +12,12 @@
 #include <fstream>
 #include <sstream>
 #include <cmath>
+#include <chrono>
 #include <getopt.h>
 #include <libgen.h>
 #include <sys/ioctl.h>
 
+#include "timeouts.hh"
 #include "protobufs/util.hh"
 #include "thunk/factory.hh"
 #include "thunk/placeholder.hh"
@@ -33,6 +35,7 @@
 #include "util/ipc_socket.hh"
 
 using namespace std;
+using namespace std::chrono;
 using namespace gg::thunk;
 
 class Blueprints
@@ -534,7 +537,8 @@ string GCCModelGenerator::generate_thunk( const GCCStage first_stage,
       base_executables,
       thunk_outputs,
       dummy_dirs,
-        ThunkFactory::Options::collect_data
+      ( defer_depgen_ ) ? DEPGEN_TIMEOUT : PREPROCESS_TIMEOUT,
+      ThunkFactory::Options::collect_data
         | ThunkFactory::Options::generate_manifest
         | ThunkFactory::Options::include_filenames
     );
@@ -574,7 +578,8 @@ string GCCModelGenerator::generate_thunk( const GCCStage first_stage,
       base_executables,
       { { "output", output } },
       dummy_dirs,
-        ThunkFactory::Options::collect_data
+      COMPILE_TIMEOUT,
+      ThunkFactory::Options::collect_data
         | ThunkFactory::Options::generate_manifest
         | ThunkFactory::Options::include_filenames
     );
@@ -607,7 +612,8 @@ string GCCModelGenerator::generate_thunk( const GCCStage first_stage,
       base_executables,
       { { "output", output } },
       dummy_dirs,
-        ThunkFactory::Options::collect_data
+      ASSEMBLE_TIMEOUT,
+      ThunkFactory::Options::collect_data
         | ThunkFactory::Options::generate_manifest
         | ThunkFactory::Options::include_filenames
     );

diff --git a/src/models/gcc.hh b/src/models/gcc.hh
@@ -5,6 +5,7 @@
 
 #include <string>
 #include <vector>
+#include <chrono>
 #include <unordered_map>
 
 #include "thunk/thunk.hh"

diff --git a/src/models/generate-deps.cc b/src/models/generate-deps.cc
@@ -4,6 +4,7 @@
 #include <algorithm>
 
 #include "gcc.hh"
+#include "timeouts.hh"
 #include "thunk/thunk.hh"
 #include "thunk/thunk_reader.hh"
 #include "thunk/thunk_writer.hh"
@@ -209,6 +210,8 @@ int main( int argc, char * argv[] )
     Thunk new_thunk { move( new_function ), move( values ), {},
                       move( executables ), { "output" } };
 
+    new_thunk.set_timeout( PREPROCESS_TIMEOUT );
+
     /* (4) clean up and write output ###############################*/
     roost::remove_directory( sysroot );
     ThunkWriter::write( new_thunk, execution_root / "output" );

diff --git a/src/models/generic.cc b/src/models/generic.cc
@@ -2,6 +2,7 @@
 
 #include <getopt.h>
 
+#include "timeouts.hh"
 #include "cli_description.hh"
 #include "thunk/factory.hh"
 #include "thunk/ggutils.hh"
@@ -103,6 +104,7 @@ void generate_thunk( const CLIDescription & cli_description,
     { executable },
     outfiles,
     {},
+    NO_TIMEOUT,
     ThunkFactory::Options::create_placeholder
       | ThunkFactory::Options::collect_data
   );

diff --git a/src/models/ld.cc b/src/models/ld.cc
@@ -6,6 +6,7 @@
 #include <list>
 
 #include "gcc.hh"
+#include "timeouts.hh"
 #include "thunk/factory.hh"
 #include "thunk/ggutils.hh"
 #include "thunk/thunk.hh"
@@ -169,6 +170,7 @@ void generate_thunk( size_t argc, char * argv[] )
     { program_data.at( LD ) },
     { { "output", outfile } },
     dummy_dirs,
+    LINK_TIMEOUT,
     ThunkFactory::Options::create_placeholder
       | ThunkFactory::Options::collect_data
       | ThunkFactory::Options::generate_manifest

diff --git a/src/models/linker.cc b/src/models/linker.cc
@@ -8,6 +8,7 @@
 #include <string>
 #include <unordered_set>
 
+#include "timeouts.hh"
 #include "thunk/placeholder.hh"
 #include "thunk/factory.hh"
 #include "util/system_runner.hh"
@@ -162,7 +163,8 @@ string GCCModelGenerator::generate_link_thunk( const vector<InputFile> & link_in
     executables,
     { { "output", output } },
     dummy_dirs,
-      ThunkFactory::Options::collect_data
+    LINK_TIMEOUT,
+    ThunkFactory::Options::collect_data
       | ThunkFactory::Options::generate_manifest
       | ThunkFactory::Options::include_filenames
   );

diff --git a/src/models/ranlib.cc b/src/models/ranlib.cc
@@ -2,6 +2,7 @@
 
 #include <getopt.h>
 
+#include "timeouts.hh"
 #include "thunk/factory.hh"
 #include "thunk/ggutils.hh"
 #include "thunk/thunk.hh"
@@ -39,6 +40,7 @@ void generate_thunk( int argc, char * argv[] )
     { program_data.at( RANLIB ) },
     { { "output", archive } },
     {},
+    RANLIB_TIMEOUT,
     ThunkFactory::Options::create_placeholder
       | ThunkFactory::Options::collect_data
       | ThunkFactory::Options::generate_manifest

diff --git a/src/models/strip.cc b/src/models/strip.cc
@@ -2,6 +2,7 @@
 
 #include <getopt.h>
 
+#include "timeouts.hh"
 #include "thunk/factory.hh"
 #include "thunk/ggutils.hh"
 #include "thunk/thunk.hh"
@@ -51,6 +52,7 @@ void generate_thunk( int argc, char * argv[] )
     { program_data.at( STRIP ) },
     { { "output", strip_output } },
     {},
+    STRIP_TIMEOUT,
     ThunkFactory::Options::create_placeholder
       | ThunkFactory::Options::collect_data
       | ThunkFactory::Options::generate_manifest

diff --git a/src/models/timeouts.hh b/src/models/timeouts.hh
@@ -0,0 +1,23 @@
+/* -*-mode:c++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+
+#ifndef MODELS_TIMEOUTS_HH
+#define MODELS_TIMEOUTS_HH
+
+#include <chrono>
+
+static constexpr std::chrono::milliseconds NO_TIMEOUT             { 0 };
+static constexpr std::chrono::milliseconds VERY_SHORT_TIMEOUT { 5'000 };
+static constexpr std::chrono::milliseconds SHORT_TIMEOUT      { 7'500 };
+static constexpr std::chrono::milliseconds LONG_TIMEOUT      { 12'500 };
+static constexpr std::chrono::milliseconds VERY_LONG_TIMEOUT { 17'500 };
+
+static constexpr std::chrono::milliseconds DEPGEN_TIMEOUT     = VERY_LONG_TIMEOUT;
+static constexpr std::chrono::milliseconds PREPROCESS_TIMEOUT = LONG_TIMEOUT;
+static constexpr std::chrono::milliseconds COMPILE_TIMEOUT    = SHORT_TIMEOUT;
+static constexpr std::chrono::milliseconds ASSEMBLE_TIMEOUT   = SHORT_TIMEOUT;
+static constexpr std::chrono::milliseconds LINK_TIMEOUT       = LONG_TIMEOUT;
+static constexpr std::chrono::milliseconds AR_TIMEOUT         = SHORT_TIMEOUT;
+static constexpr std::chrono::milliseconds STRIP_TIMEOUT      = SHORT_TIMEOUT;
+static constexpr std::chrono::milliseconds RANLIB_TIMEOUT     = VERY_SHORT_TIMEOUT;
+
+#endif /* MODELS_TIMEOUTS_HH */
diff --git a/src/thunk/factory.cc b/src/thunk/factory.cc
@@ -3,6 +3,7 @@
 #include "factory.hh"
 
 #include <algorithm>
+#include <chrono>
 #include <sys/stat.h>
 #include <fcntl.h>
 
@@ -18,6 +19,7 @@
 #include "util/tokenize.hh"
 
 using namespace std;
+using namespace std::chrono;
 using namespace gg;
 using namespace gg::thunk;
 
@@ -49,6 +51,7 @@ Thunk ThunkFactory::create_thunk( const Function & function,
                                   const vector<Data> & data,
                                   const vector<Data> & executables,
                                   const vector<Output> & outputs,
+                                  const milliseconds & timeout,
                                   const bool include_filenames )
 {
   vector<Thunk::DataItem> thunk_data;
@@ -71,18 +74,19 @@ Thunk ThunkFactory::create_thunk( const Function & function,
     thunk_outputs.push_back( output.tag() );
   }
 
-  return { move( thunk_function ),
-           move( thunk_data ),
-           move( thunk_executables ),
-           move( thunk_outputs ) };
+  Thunk output_thunk { move( thunk_function ), move( thunk_data ),
+                       move( thunk_executables ), move( thunk_outputs ) };
+
+  output_thunk.set_timeout( timeout );
+  return output_thunk;
 }
 
-std::string ThunkFactory::generate( const Function & function,
-                                    const std::vector<Data> & data,
-                                    const std::vector<Data> & executables,
-                                    const std::vector<Output> & outputs,
-                                    const std::vector<std::string> & dummy_dirs,
-                                    const int options )
+string ThunkFactory::generate( const Function & function,
+                               const vector<Data> & data,
+                               const vector<Data> & executables,
+                               const vector<Output> & outputs,
+                               const vector<string> & dummy_dirs,
+                               const milliseconds & timeout, const int options )
 {
   const bool generate_manifest = options & Options::generate_manifest;
   const bool create_placeholder = options & Options::create_placeholder;
@@ -151,10 +155,11 @@ std::string ThunkFactory::generate( const Function & function,
     for ( const Data & datum : executables ) { fn_collect( datum, true ); }
   }
 
-  string hash = ThunkWriter::write( { move( thunk_function ),
-                                      move( thunk_data ),
-                                      move( thunk_executables ),
-                                      move( thunk_outputs ) } );
+  Thunk output_thunk { move( thunk_function ), move( thunk_data ),
+                       move( thunk_executables ), move( thunk_outputs ) };
+
+  output_thunk.set_timeout( timeout );
+  const string hash = ThunkWriter::write( output_thunk );
 
   if ( create_placeholder ) {
     for ( size_t i = 0; i < outputs.size(); i++ ) {

diff --git a/src/thunk/factory.hh b/src/thunk/factory.hh
@@ -5,6 +5,7 @@
 
 #include <string>
 #include <vector>
+#include <chrono>
 #include <sys/types.h>
 
 #include "thunk/thunk.hh"
@@ -64,14 +65,17 @@ public:
                                         const std::vector<Data> & data,
                                         const std::vector<Data> & executables,
                                         const std::vector<Output> & outputs,
+                                        const std::chrono::milliseconds & timeout,
                                         const bool include_filenames = true );
 
   static std::string generate( const Function & function,
                                const std::vector<Data> & data,
                                const std::vector<Data> & executables,
                                const std::vector<Output> & outputs,
                                const std::vector<std::string> & dummy_dirs,
-                               const int options );
+                               const std::chrono::milliseconds & timeout =
+                                 std::chrono::milliseconds { 0 },
+                               const int options = 0 );
 };
 
 #endif /* FACTORY_HH */