Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
Pyston
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
Boxiang Sun
Pyston
Commits
a7841500
Commit
a7841500
authored
Sep 17, 2015
by
Kevin Modzelewski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add a bunch more GC_TRACE_LOG calls
parent
60bab2ea
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
39 additions
and
10 deletions
+39
-10
src/gc/collector.cpp
src/gc/collector.cpp
+34
-10
src/gc/gc_alloc.h
src/gc/gc_alloc.h
+2
-0
src/gc/heap.cpp
src/gc/heap.cpp
+3
-0
No files found.
src/gc/collector.cpp
View file @
a7841500
...
...
@@ -178,7 +178,7 @@ public:
}
void
addWork
(
void
*
p
)
{
GC_TRACE_LOG
(
"Pushing
%p
\n
"
,
p
);
GC_TRACE_LOG
(
"Pushing
(%d) %p
\n
"
,
visit_type
,
p
);
GCAllocation
*
al
=
GCAllocation
::
fromUserData
(
p
);
switch
(
visit_type
)
{
...
...
@@ -213,8 +213,10 @@ public:
// http://pypy.readthedocs.org/en/latest/discussion/finalizer-order.html
case
TraversalType
:
:
FinalizationOrderingFindReachable
:
if
(
orderingState
(
al
)
==
FinalizationState
::
UNREACHABLE
)
{
GC_TRACE_LOG
(
"%p is now TEMPORARY
\n
"
,
al
->
user_data
);
setOrderingState
(
al
,
FinalizationState
::
TEMPORARY
);
}
else
if
(
orderingState
(
al
)
==
FinalizationState
::
REACHABLE_FROM_FINALIZER
)
{
GC_TRACE_LOG
(
"%p is now ALIVE
\n
"
,
al
->
user_data
);
setOrderingState
(
al
,
FinalizationState
::
ALIVE
);
}
else
{
return
;
...
...
@@ -222,6 +224,7 @@ public:
break
;
case
TraversalType
:
:
FinalizationOrderingRemoveTemporaries
:
if
(
orderingState
(
al
)
==
FinalizationState
::
TEMPORARY
)
{
GC_TRACE_LOG
(
"%p is now REACHABLE_FROM_FINALIZER
\n
"
,
al
->
user_data
);
setOrderingState
(
al
,
FinalizationState
::
REACHABLE_FROM_FINALIZER
);
}
else
{
return
;
...
...
@@ -366,6 +369,7 @@ void registerPythonObject(Box* b) {
assert
(
b
->
cls
);
if
(
hasOrderedFinalizer
(
b
->
cls
))
{
GC_TRACE_LOG
(
"%p is registered as having an ordered finalizer
\n
"
,
b
);
objects_with_ordered_finalizers
.
push_back
(
b
);
}
}
...
...
@@ -380,6 +384,7 @@ void invalidateOrderedFinalizerList() {
if
(
!
hasOrderedFinalizer
(
box
->
cls
)
||
hasFinalized
(
al
))
{
// Cleanup.
GC_TRACE_LOG
(
"Removing %p from objects_with_ordered_finalizers
\n
"
,
box
);
iter
=
objects_with_ordered_finalizers
.
erase
(
iter
);
}
else
{
++
iter
;
...
...
@@ -554,8 +559,10 @@ static void finalizationOrderingFindReachable(Box* obj) {
TraversalWorklist
worklist
(
TraversalType
::
FinalizationOrderingFindReachable
);
GCVisitor
visitor
(
&
worklist
);
GC_TRACE_LOG
(
"findReachable %p
\n
"
,
obj
);
worklist
.
addWork
(
obj
);
while
(
void
*
p
=
worklist
.
next
())
{
GC_TRACE_LOG
(
"findReachable, looking at %p
\n
"
,
p
);
sc_marked_objs
.
log
();
visitByGCKind
(
p
,
visitor
);
...
...
@@ -572,8 +579,10 @@ static void finalizationOrderingRemoveTemporaries(Box* obj) {
TraversalWorklist
worklist
(
TraversalType
::
FinalizationOrderingRemoveTemporaries
);
GCVisitor
visitor
(
&
worklist
);
GC_TRACE_LOG
(
"removeTemporaries %p
\n
"
,
obj
);
worklist
.
addWork
(
obj
);
while
(
void
*
p
=
worklist
.
next
())
{
GC_TRACE_LOG
(
"removeTemporaries, looking at %p
\n
"
,
p
);
GCAllocation
*
al
=
GCAllocation
::
fromUserData
(
p
);
assert
(
orderingState
(
al
)
!=
FinalizationState
::
UNREACHABLE
);
visitByGCKind
(
p
,
visitor
);
...
...
@@ -611,6 +620,7 @@ static void orderFinalizers() {
assert
(
state
==
FinalizationState
::
REACHABLE_FROM_FINALIZER
||
state
==
FinalizationState
::
ALIVE
);
if
(
state
==
FinalizationState
::
REACHABLE_FROM_FINALIZER
)
{
GC_TRACE_LOG
(
"%p is now pending finalization
\n
"
,
marked
);
pending_finalization_list
.
push_back
(
marked
);
}
}
...
...
@@ -667,6 +677,8 @@ static void callPendingFinalizers() {
Box
*
box
=
pending_finalization_list
.
front
();
pending_finalization_list
.
pop_front
();
GC_TRACE_LOG
(
"Running finalizer for %p
\n
"
,
box
);
ASSERT
(
isValidGCObject
(
box
),
"objects to be finalized should still be alive"
);
if
(
isWeaklyReferenced
(
box
))
{
...
...
@@ -901,6 +913,24 @@ void endGCUnexpectedRegion() {
should_not_reenter_gc
=
false
;
}
#if TRACE_GC_MARKING
static
void
openTraceFp
(
bool
is_pre
)
{
if
(
trace_fp
)
fclose
(
trace_fp
);
char
tracefn_buf
[
80
];
snprintf
(
tracefn_buf
,
sizeof
(
tracefn_buf
),
"gc_trace_%d.%03d%s.txt"
,
getpid
(),
ncollections
+
is_pre
,
is_pre
?
"_pre"
:
""
);
trace_fp
=
fopen
(
tracefn_buf
,
"w"
);
}
static
int
_dummy
()
{
openTraceFp
(
true
);
return
0
;
}
static
int
_initializer
=
_dummy
();
#endif
void
runCollection
()
{
static
StatCounter
sc_us
(
"us_gc_collections"
);
static
StatCounter
sc
(
"gc_collections"
);
...
...
@@ -925,13 +955,7 @@ void runCollection() {
Timer
_t
(
"collecting"
,
/*min_usec=*/
10000
);
#if TRACE_GC_MARKING
#if 1 // separate log file per collection
char
tracefn_buf
[
80
];
snprintf
(
tracefn_buf
,
sizeof
(
tracefn_buf
),
"gc_trace_%d.%03d.txt"
,
getpid
(),
ncollections
);
trace_fp
=
fopen
(
tracefn_buf
,
"w"
);
#else // overwrite previous log file with each collection
trace_fp
=
fopen
(
"gc_trace.txt"
,
"w"
);
#endif
openTraceFp
(
false
);
#endif
global_heap
.
prepareForCollection
();
...
...
@@ -958,6 +982,7 @@ void runCollection() {
// - the callbacks are called later, along with the finalizers
for
(
auto
o
:
weakly_referenced
)
{
assert
(
isValidGCObject
(
o
));
GC_TRACE_LOG
(
"%p is weakly referenced
\n
"
,
o
);
prepareWeakrefCallbacks
(
o
);
global_heap
.
free
(
GCAllocation
::
fromUserData
(
o
));
}
...
...
@@ -969,8 +994,7 @@ void runCollection() {
#endif
#if TRACE_GC_MARKING
fclose
(
trace_fp
);
trace_fp
=
NULL
;
openTraceFp
(
true
);
#endif
should_not_reenter_gc
=
false
;
// end non-reentrant section
...
...
src/gc/gc_alloc.h
View file @
a7841500
...
...
@@ -112,6 +112,8 @@ extern "C" inline void* gc_alloc(size_t bytes, GCKind kind_id) {
// if (VERBOSITY()) printf("Allocated %ld bytes at [%p, %p)\n", bytes, r, (char*)r + bytes);
#endif
GC_TRACE_LOG
(
"Allocated %p
\n
"
,
r
);
#if STAT_ALLOCATIONS
gc_alloc_bytes
.
log
(
alloc_bytes
);
gc_alloc_bytes_typed
[(
int
)
kind_id
].
log
(
alloc_bytes
);
...
...
src/gc/heap.cpp
View file @
a7841500
...
...
@@ -175,6 +175,7 @@ __attribute__((always_inline)) bool _doFree(GCAllocation* al, std::vector<Box*>*
VALGRIND_ENABLE_ERROR_REPORTING
;
#endif
GC_TRACE_LOG
(
"doFree %p
\n
"
,
al
->
user_data
);
if
(
alloc_kind
==
GCKind
::
PYTHON
)
{
#ifndef NVALGRIND
VALGRIND_DISABLE_ERROR_REPORTING
;
...
...
@@ -188,12 +189,14 @@ __attribute__((always_inline)) bool _doFree(GCAllocation* al, std::vector<Box*>*
if
(
isWeaklyReferenced
(
b
))
{
assert
(
weakly_referenced
&&
"attempting to free a weakly referenced object manually"
);
weakly_referenced
->
push_back
(
b
);
GC_TRACE_LOG
(
"%p is weakly referenced
\n
"
,
al
->
user_data
);
return
false
;
}
ASSERT
(
!
hasOrderedFinalizer
(
b
->
cls
)
||
hasFinalized
(
al
),
"%s"
,
getTypeName
(
b
));
if
(
b
->
cls
->
tp_dealloc
!=
dealloc_null
&&
b
->
cls
->
has_safe_tp_dealloc
)
{
GC_TRACE_LOG
(
"running safe destructor for %p
\n
"
,
b
);
gc_safe_destructors
.
log
();
GCAllocation
*
al
=
GCAllocation
::
fromUserData
(
b
);
...
...
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