Skip to content

Fix Resource leak tracking issue on Windows #2338

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
merged 1 commit into from
Jul 23, 2025
Merged

Fix Resource leak tracking issue on Windows #2338

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
38 changes: 34 additions & 4 deletions bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Device.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
package org.eclipse.swt.graphics;


import java.lang.ref.*;
import java.util.*;
import java.util.concurrent.*;

Expand Down Expand Up @@ -61,7 +62,7 @@ public abstract class Device implements Drawable {
String[] loadedFonts;

volatile boolean disposed;
private Set<Resource> resourcesWithZoomSupport = ConcurrentHashMap.newKeySet();
private Set<ResourceReference> resourcesWithZoomSupport = ConcurrentHashMap.newKeySet();

/*
* TEMPORARY CODE. When a graphics object is
Expand Down Expand Up @@ -964,11 +965,11 @@ protected int getDeviceZoom () {
}

void registerResourceWithZoomSupport(Resource resource) {
resourcesWithZoomSupport.add(resource);
resourcesWithZoomSupport.add(new ResourceReference(resource));
}

void deregisterResourceWithZoomSupport(Resource resource) {
resourcesWithZoomSupport.remove(resource);
resourcesWithZoomSupport.remove(new ResourceReference(resource));
}

/**
Expand All @@ -982,8 +983,37 @@ public static void win32_destroyUnusedHandles(Display display) {
for (Monitor monitor : display.getMonitors()) {
availableZoomLevels.add(DPIUtil.getZoomForAutoscaleProperty(monitor.getZoom()));
}
for (Resource resource: ((Device) display).resourcesWithZoomSupport) {
Set<ResourceReference> resources = ((Device) display).resourcesWithZoomSupport;
Iterator<ResourceReference> iterator = resources.iterator();

while (iterator.hasNext()) {
ResourceReference ref = iterator.next();
Resource resource = ref.get();
if (resource == null) {
iterator.remove(); // Clean up dead reference.
continue;
}
resource.destroyHandlesExcept(availableZoomLevels);
}
}

private static class ResourceReference extends WeakReference<Resource> {

public ResourceReference(Resource referent) {
super(referent);
}

@Override
public boolean equals(Object obj) {
if(this == obj) return true;
if (!(obj instanceof ResourceReference passedResource)) return false;
return Objects.equals(this.get(), passedResource.get());
}

@Override
public int hashCode() {
Resource resource = this.get();
return resource != null ? resource.hashCode() : 0;
}
}
}
Loading