Skip to content

Fixes #195 "large negative increment values" #202

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
astrojuanlu merged 1 commit into from
Aug 16, 2018
Merged

Fixes #195 "large negative increment values" #202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions memory_profiler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -597,9 +597,7 @@ def trace(self, code, lineno, prev_lineno):

prev_line_value = self[code].get(prev_lineno, None) if prev_lineno else None
prev_line_memory = prev_line_value[1] if prev_line_value else 0
#inc = (memory-prev_line_memory)
#print('trace lineno=%(lineno)s prev_lineno=%(prev_lineno)s mem=%(memory)s prev_inc=%(previous_inc)s inc=%(inc)s' % locals())
self[code][lineno] = (previous_inc + (memory-prev_line_memory), max(memory, previous_memory))
self[code][lineno] = (max(previous_inc, memory-prev_line_memory), max(memory, previous_memory))

def items(self):
"""Iterate on the toplevel code blocks."""
Expand Down
2 changes: 0 additions & 2 deletions test/test_tracemalloc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@
def test_memory_profiler(test_input, expected):
mem_prof(test_input)
inc, dec = parse_mem_prof()
assert abs(inc - dec) <= EPSILON, \
'inc = {}, dec = {}, err = {}'.format(inc, dec, abs(inc - dec))
assert abs(inc - expected) <= EPSILON, \
'inc = {}, size = {}, err = {}'.format(
inc, expected, abs(inc - expected)
Expand Down