traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tracemalloc: only use unsigned types to compute hash 

Commit to simplify the backport to python 2.7 and to make the code more
consistent.
This commit is contained in:
Victor Stinner 2013-12-16 23:05:13 +01:00
parent fffb96ba66
commit 4d8c29cd57
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Modules/_tracemalloc.c
View File

@ -336,8 +336,7 @@ static Py_uhash_t
traceback_hash(traceback_t *traceback) traceback_hash(traceback_t *traceback)
{ {
/* code based on tuplehash() of Objects/tupleobject.c */ /* code based on tuplehash() of Objects/tupleobject.c */
Py_uhash_t x; /* Unsigned for defined overflow behavior. */ Py_uhash_t x, y; /* Unsigned for defined overflow behavior. */
Py_hash_t y;
int len = traceback->nframe; int len = traceback->nframe;
Py_uhash_t mult = _PyHASH_MULTIPLIER; Py_uhash_t mult = _PyHASH_MULTIPLIER;
frame_t *frame; frame_t *frame;
@ -345,13 +344,13 @@ traceback_hash(traceback_t *traceback)
x = 0x345678UL; x = 0x345678UL;
frame = traceback->frames; frame = traceback->frames;
while (--len >= 0) { while (--len >= 0) {
y = PyObject_Hash(frame->filename); y = (Py_uhash_t)PyObject_Hash(frame->filename);
y ^= frame->lineno; y ^= (Py_uhash_t)frame->lineno;
frame++; frame++;
x = (x ^ y) * mult; x = (x ^ y) * mult;
/* the cast might truncate len; that doesn't change hash stability */ /* the cast might truncate len; that doesn't change hash stability */
mult += (Py_hash_t)(82520UL + len + len); mult += (Py_uhash_t)(82520UL + len + len);
} }
x += 97531UL; x += 97531UL;
return x; return x;