diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2015-03-22 21:00:41 +1300 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2015-03-22 21:00:41 +1300 |
| commit | 842e23d3e386169d9a90cef2a634c55a3e5fdd8e (patch) | |
| tree | 4932fa82faf92d36fbe7a8d56741a892c7003119 /libmproxy/console | |
| parent | a2da38cc8339887abef4efa23cc54fa02c981f3f (diff) | |
| download | mitmproxy-842e23d3e386169d9a90cef2a634c55a3e5fdd8e.tar.gz mitmproxy-842e23d3e386169d9a90cef2a634c55a3e5fdd8e.tar.bz2 mitmproxy-842e23d3e386169d9a90cef2a634c55a3e5fdd8e.zip | |
Replace far-too-clever decorator LRU cache with something simpler
Diffstat (limited to 'libmproxy/console')
| -rw-r--r-- | libmproxy/console/common.py | 9 | ||||
| -rw-r--r-- | libmproxy/console/flowview.py | 15 |
2 files changed, 6 insertions, 18 deletions
diff --git a/libmproxy/console/common.py b/libmproxy/console/common.py index a0590bb1..2f143f01 100644 --- a/libmproxy/console/common.py +++ b/libmproxy/console/common.py @@ -327,11 +327,7 @@ def ask_save_body(part, master, state, flow): signals.status_message.send(message="No content to save.") -class FlowCache: - @utils.LRUCache(200) - def format_flow(self, *args): - return raw_format_flow(*args) -flowcache = FlowCache() +flowcache = utils.LRUCache(800) def format_flow(f, focus, extended=False, hostheader=False, padding=2): @@ -370,6 +366,7 @@ def format_flow(f, focus, extended=False, hostheader=False, padding=2): d["resp_ctype"] = t[0].split(";")[0] else: d["resp_ctype"] = "" - return flowcache.format_flow( + return flowcache.get( + raw_format_flow, tuple(sorted(d.items())), focus, extended, padding ) diff --git a/libmproxy/console/flowview.py b/libmproxy/console/flowview.py index e864cf47..2c847fba 100644 --- a/libmproxy/console/flowview.py +++ b/libmproxy/console/flowview.py @@ -107,16 +107,7 @@ class FlowViewHeader(urwid.WidgetWrap): ) -class CallbackCache: - @utils.LRUCache(200) - def _callback(self, method, *args, **kwargs): - return getattr(self.obj, method)(*args, **kwargs) - - def callback(self, obj, method, *args, **kwargs): - # obj varies! - self.obj = obj - return self._callback(method, *args, **kwargs) -cache = CallbackCache() +cache = utils.LRUCache(200) class FlowView(urwid.WidgetWrap): @@ -158,8 +149,8 @@ class FlowView(urwid.WidgetWrap): limit = sys.maxint else: limit = contentview.VIEW_CUTOFF - description, text_objects = cache.callback( - self, "_cached_content_view", + description, text_objects = cache.get( + self._cached_content_view, viewmode, tuple(tuple(i) for i in conn.headers.lst), conn.content, |