Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
2d169b26
Commit
2d169b26
authored
May 12, 2012
by
Antoine Pitrou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make the reference counting of dictkeys objects participate in refleak hunting
(issue #13903).
parent
36c4e38f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
6 deletions
+10
-6
Objects/dictobject.c
Objects/dictobject.c
+10
-6
No files found.
Objects/dictobject.c
View file @
2d169b26
...
...
@@ -261,8 +261,11 @@ PyDict_Fini(void)
PyDict_ClearFreeList
();
}
#define DK_INCREF(dk) (++(dk)->dk_refcnt)
#define DK_DECREF(dk) if ((--(dk)->dk_refcnt) == 0) free_keys_object(dk)
#define DK_DEBUG_INCREF _Py_INC_REFTOTAL _Py_REF_DEBUG_COMMA
#define DK_DEBUG_DECREF _Py_DEC_REFTOTAL _Py_REF_DEBUG_COMMA
#define DK_INCREF(dk) (DK_DEBUG_INCREF ++(dk)->dk_refcnt)
#define DK_DECREF(dk) if (DK_DEBUG_DECREF (--(dk)->dk_refcnt) == 0) free_keys_object(dk)
#define DK_SIZE(dk) ((dk)->dk_size)
#define DK_MASK(dk) (((dk)->dk_size)-1)
#define IS_POWER_OF_2(x) (((x) & (x-1)) == 0)
...
...
@@ -324,7 +327,7 @@ static PyDictKeysObject *new_keys_object(Py_ssize_t size)
PyErr_NoMemory
();
return
NULL
;
}
dk
->
dk_refcnt
=
1
;
DK_DEBUG_INCREF
dk
->
dk_refcnt
=
1
;
dk
->
dk_size
=
size
;
dk
->
dk_usable
=
USABLE_FRACTION
(
size
);
ep0
=
&
dk
->
dk_entries
[
0
];
...
...
@@ -959,7 +962,7 @@ dictresize(PyDictObject *mp, Py_ssize_t minused)
}
}
assert
(
oldkeys
->
dk_refcnt
==
1
);
PyMem_FREE
(
oldkeys
);
DK_DEBUG_DECREF
PyMem_FREE
(
oldkeys
);
}
return
0
;
}
...
...
@@ -1259,7 +1262,7 @@ PyDict_Clear(PyObject *op)
}
else
{
assert
(
oldkeys
->
dk_refcnt
==
1
);
free_keys_object
(
oldkeys
);
DK_DECREF
(
oldkeys
);
}
}
...
...
@@ -1367,7 +1370,8 @@ dict_dealloc(PyDictObject *mp)
DK_DECREF
(
keys
);
}
else
{
free_keys_object
(
keys
);
assert
(
keys
->
dk_refcnt
==
1
);
DK_DECREF
(
keys
);
}
if
(
numfree
<
PyDict_MAXFREELIST
&&
Py_TYPE
(
mp
)
==
&
PyDict_Type
)
free_list
[
numfree
++
]
=
mp
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment