summaryrefslogtreecommitdiffstats
path: root/cache.cxx
diff options
context:
space:
mode:
authorWenji Huang <wenji.huang@oracle.com>2010-02-03 10:21:24 +0800
committerWenji Huang <wenji.huang@oracle.com>2010-02-03 10:21:24 +0800
commit0d1ad607311857dc0b4666ce8a84c1a59c615ab9 (patch)
tree57aaf3d3eadbe75cd22be6e073c8d17f3801392f /cache.cxx
parentfff4e6c6e4bb5bd1046164d697872f0bc1a48f4c (diff)
downloadsystemtap-steved-0d1ad607311857dc0b4666ce8a84c1a59c615ab9.tar.gz
systemtap-steved-0d1ad607311857dc0b4666ce8a84c1a59c615ab9.tar.xz
systemtap-steved-0d1ad607311857dc0b4666ce8a84c1a59c615ab9.zip
PR9931: generate log to help diagnosing occasional cache hash collisions
Ideas from Frank Ch. Eigler: - extending the hash.add() function to pass names along with the hash-mix values, so that class hash can internally track the hash-report string - storing the reports themselves in the cache, beside the .ko / .c files, and changing the cache-size-limit logic to delete these .txt files upon garbage collection * hash.h : New member parm_stream. * hash.cxx (get_parms): New function to convert parms stream to string. (hash::add): Aggregrate parms stream. (create_hash_log): New function to log hash operation. (find_*_hash): Log hash at the end of function. * cache.cxx (clean_cache): Remove log when cache reaches limitation.
Diffstat (limited to 'cache.cxx')
-rw-r--r--cache.cxx20
1 files changed, 20 insertions, 0 deletions
diff --git a/cache.cxx b/cache.cxx
index 29c20d0d..b113e019 100644
--- a/cache.cxx
+++ b/cache.cxx
@@ -282,6 +282,22 @@ clean_cache(systemtap_session& s)
globfree(&cache_glob);
+ // grab info for each staphash log file (.log)
+ glob_str = s.cache_path + "/*/*.log";
+ glob(glob_str.c_str(), 0, NULL, &cache_glob);
+ for (unsigned int i = 0; i < cache_glob.gl_pathc; i++)
+ {
+ string cache_ent_path = cache_glob.gl_pathv[i];
+ struct cache_ent_info cur_info(cache_ent_path, false);
+ if (cur_info.size != 0 && cur_info.weight != 0)
+ {
+ cache_size_b += cur_info.size;
+ cache_contents.insert(cur_info);
+ }
+ }
+
+ globfree(&cache_glob);
+
set<struct cache_ent_info>::iterator i;
unsigned long r_cache_size = cache_size_b;
string removed_dirs = "";
@@ -344,9 +360,11 @@ cache_ent_info::cache_ent_info(const string& path, bool is_module):
string mod_path = path + ".ko";
string modsgn_path = path + ".ko.sgn";
string source_path = path + ".c";
+ string hash_path = path + ".log";
size = get_file_size(mod_path)
+ get_file_size(modsgn_path);
+ get_file_size(source_path);
+ + get_file_size(hash_path);
weight = get_file_weight(mod_path);
}
else
@@ -365,9 +383,11 @@ cache_ent_info::unlink() const
string mod_path = path + ".ko";
string modsgn_path = path + ".ko.sgn";
string source_path = path + ".c";
+ string hash_path = path + ".log";
::unlink(mod_path.c_str());
::unlink(modsgn_path.c_str());
::unlink(source_path.c_str());
+ ::unlink(hash_path.c_str());
}
else
::unlink(path.c_str());