Skip to content

Commit b19f85c

Browse files
committed
remove manual clean up of weak ref
1 parent e2ab628 commit b19f85c

File tree

1 file changed

+1
-27
lines changed
  • graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/transitions

1 file changed

+1
-27
lines changed

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/transitions/CApiTransitions.java

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@
4848
import java.util.Arrays;
4949
import java.util.HashMap;
5050
import java.util.HashSet;
51-
import java.util.LinkedList;
5251
import java.util.Set;
5352
import java.util.WeakHashMap;
5453
import java.util.concurrent.ConcurrentHashMap;
@@ -205,20 +204,10 @@ private static HandleContext getContext() {
205204

206205
public abstract static class IdReference<T> extends WeakReference<T> {
207206

208-
private boolean collected = false;
209-
210207
public IdReference(HandleContext handleContext, T referent) {
211208
super(referent, handleContext.referenceQueue);
212209
}
213210

214-
public boolean isCollected() {
215-
return collected;
216-
}
217-
218-
public IdReference<T> setCollected() {
219-
this.collected = true;
220-
return this;
221-
}
222211
}
223212

224213
/**
@@ -448,23 +437,8 @@ public static int pollReferenceQueue() {
448437
}
449438
}
450439
try {
451-
LinkedList<IdReference<?>> manualCleanupQueue = new LinkedList<>();
452-
for (IdReference<?> ref : handleContext.nativeLookup.values()) {
453-
if (ref != null && ref.refersTo(null)) {
454-
manualCleanupQueue.add(ref);
455-
}
456-
}
457-
manuallyCollected = manualCleanupQueue.size();
458440
while (true) {
459-
Object entry;
460-
if (!manualCleanupQueue.isEmpty()) {
461-
entry = manualCleanupQueue.pop().setCollected();
462-
} else {
463-
entry = queue.poll();
464-
if (entry instanceof IdReference<?> ref && ref.isCollected()) {
465-
continue;
466-
}
467-
}
441+
Object entry = queue.poll();
468442
if (entry == null) {
469443
if (count > 0) {
470444
assert handleContext.referenceQueuePollActive;

0 commit comments

Comments
 (0)