PR11246 cont'd: Separate script/stapconf caching

I'm separating the caching and creation logic for stapconf, so it can be
conditionalized on s.use_cache instead of s.use_script_cache.

* session.h (systemtap_session): Store base_hash for better reuse.
* hash.cxx (get_base_hash): Get the base from the session, or build it.
  (find_hash): Split into separate script/stapconf versions.
* cache.cxx (add_to_cache, get_from_cache): Ditto.
* main.cxx (main): Adapt caller, and delay stapconf until pass-4.

1 files changed, 2 insertions, 0 deletions

diff --git a/session.h b/session.h
index f45f6c77..ccf6c1da 100644
--- a/session.h
+++ b/session.h
@@ -22,6 +22,7 @@ extern "C" {
 
 
 // forward decls for all referenced systemtap types
+struct hash;
 struct match_node;
 struct stapfile;
 struct vardecl;
@@ -131,6 +132,7 @@ struct systemtap_session
   std::string cache_path;
   std::string hash_path;
   std::string stapconf_path;
+  hash *base_hash;
 
   // dwarfless operation
   bool consult_symtab;