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, 1 deletions

diff --git a/hash.h b/hash.h
index 0c1a745f..bbe4e89c 100644
--- a/hash.h
+++ b/hash.h
@@ -41,7 +41,8 @@ public:
   std::string get_parms();
 };
 
-void find_hash (systemtap_session& s, const std::string& script);
+void find_script_hash (systemtap_session& s, const std::string& script);
+void find_stapconf_hash (systemtap_session& s);
 std::string find_tracequery_hash (systemtap_session& s,
                                   const std::vector<std::string>& headers);
 std::string find_typequery_hash (systemtap_session& s, const std::string& name);