diff options
| author | Frank Ch. Eigler <fche@elastic.org> | 2008-05-21 13:37:07 -0400 |
|---|---|---|
| committer | Frank Ch. Eigler <fche@elastic.org> | 2008-05-21 13:37:07 -0400 |
| commit | e3339150b3c04f50b0abdc4a6d132a6b75b22cb6 (patch) | |
| tree | c80892afd79625f95ff0a2543728804464c2961a /tapsets.cxx | |
| parent | 332ddc9f7354fe51c32c504087575b3ea2b70990 (diff) | |
| parent | aa8a3b1797da54a14d04cd57758a65064056376e (diff) | |
| download | systemtap-steved-e3339150b3c04f50b0abdc4a6d132a6b75b22cb6.tar.gz systemtap-steved-e3339150b3c04f50b0abdc4a6d132a6b75b22cb6.tar.xz systemtap-steved-e3339150b3c04f50b0abdc4a6d132a6b75b22cb6.zip | |
Merge commit 'origin/master' into pr6429-comp-unwindsyms
* commit 'origin/master':
Fix assignment optimization expected results.
PR6538: more testsuite tweaks for read-only warnings
PR6538: more tapset fixes
PR6538: explain why absentstats.stp logs will contain warnings
PR6538: fix treatment of initialized globals
Use pointer_arg to fetch arguments for syscall.utime and compat_utime.
Optimize compound and binary expression assignments.
Check new (sub) functions of _struct_utimbuf_* and _struct_compat_utimbuf_*.
PR6538: tapset changes
PR6538: testsuite changes
PR5001: fix test suite collateral damage
PR6538: warn about read-only variables
Add some scripts and descriptions to the systemtap.examples.
PR5001: Remove _stp_ctime and always use ctime.
Use tr1/unordered_map instead of the deprecated ext/hash_map.
PR6524: ctime() on bad values hangs system.
Optimize away assignments in other contexts.
Optimize away assignments in other contexts.
dummy commit for testing systemtap-cvs notification
Remove sa_restorer initialization.
Diffstat (limited to 'tapsets.cxx')
| -rw-r--r-- | tapsets.cxx | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/tapsets.cxx b/tapsets.cxx index 0ba22331..7207c072 100644 --- a/tapsets.cxx +++ b/tapsets.cxx @@ -20,7 +20,11 @@ #include <deque> #include <iostream> #include <map> +#ifdef HAVE_TR1_UNORDERED_MAP +#include <tr1/unordered_map> +#else #include <ext/hash_map> +#endif #include <set> #include <sstream> #include <stdexcept> @@ -537,12 +541,17 @@ module_cache }; typedef struct module_cache module_cache_t; +#ifdef HAVE_TR1_UNORDERED_MAP +typedef tr1::unordered_map<string,Dwarf_Die> cu_function_cache_t; +typedef tr1::unordered_map<string,cu_function_cache_t*> mod_cu_function_cache_t; // module:cu -> function -> die +#else struct stringhash { size_t operator() (const string& s) const { hash<const char*> h; return h(s.c_str()); } }; typedef hash_map<string,Dwarf_Die,stringhash> cu_function_cache_t; typedef hash_map<string,cu_function_cache_t*,stringhash> mod_cu_function_cache_t; // module:cu -> function -> die +#endif struct symbol_table |