Skip to content

Fix for multi threading issues in AnnotationMap #3397

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+69 −50
Open

Fix for multi threading issues in AnnotationMap #3397

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
119 changes: 69 additions & 50 deletions bundles/org.eclipse.text/src/org/eclipse/jface/text/source/AnnotationModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -451,18 +451,17 @@ protected void replaceAnnotations(Annotation[] annotationsToRemove, Map<? extend
*/
protected void addAnnotation(Annotation annotation, Position position, boolean fireModelChanged) throws BadLocationException {
IAnnotationMap annotations= getAnnotationMap();
if (!annotations.containsKey(annotation)) {

addPosition(fDocument, position);
annotations.put(annotation, position);
fPositions.put(position, annotation);
synchronized (getLockObject()) {
getAnnotationModelEvent().annotationAdded(annotation);
}

if (fireModelChanged) {
fireModelChanged();
synchronized (getLockObject()) {
if (annotations.containsKey(annotation)) {
return;
}
fPositions.put(position, annotation);
annotations.put(annotation, position);
getAnnotationModelEvent().annotationAdded(annotation);
}
addPosition(fDocument, position);
if (fireModelChanged) {
fireModelChanged();
}
}

Expand Down Expand Up @@ -679,9 +678,8 @@ private void cleanup(boolean fireModelChanged, boolean forkNotification) {

ArrayList<Annotation> deleted= new ArrayList<>();
IAnnotationMap annotations= getAnnotationMap();
Object mapLock = annotations.getLockObject();

synchronized (mapLock) {
synchronized (getLockObject()) {
annotations.forEach((a, p) -> {
if (p == null || p.isDeleted()) {
deleted.add(a);
Expand All @@ -693,10 +691,12 @@ private void cleanup(boolean fireModelChanged, boolean forkNotification) {
removeAnnotations(deleted, false, false);
synchronized (getLockObject()) {
if (fModelEvent != null) {
final AnnotationModelEvent event = fModelEvent;
fModelEvent = null;
new Thread() {
@Override
public void run() {
fireModelChanged();
fireModelChanged(event);
}
}.start();
}
Expand Down Expand Up @@ -760,7 +760,11 @@ private Iterator<Annotation> getRegionAnnotationIterator(int offset, int length,

try {
Position[] positions= document.getPositions(IDocument.DEFAULT_CATEGORY, offset, length, canStartBefore, canEndAfter);
return new AnnotationsInterator(positions, fPositions);
IdentityHashMap<Position, Annotation> positionsMap;
synchronized (getLockObject()) {
positionsMap= new IdentityHashMap<>(fPositions);
}
return new AnnotationsInterator(positions, positionsMap);
} catch (BadPositionCategoryException e) {
// can happen if e.g. the document doesn't contain such a category, or when removed in a different thread
return Collections.<Annotation>emptyList().iterator();
Expand All @@ -784,11 +788,14 @@ private Iterator<Annotation> getAnnotationIterator(boolean cleanup, boolean recu
return iter;
}

List<Iterator<Annotation>> iterators= new ArrayList<>(fAttachments.size() + 1);
iterators.add(iter);
Iterator<Object> it= fAttachments.keySet().iterator();
while (it.hasNext()) {
iterators.add(fAttachments.get(it.next()).getAnnotationIterator());
List<Iterator<Annotation>> iterators;
synchronized (getLockObject()) {
iterators= new ArrayList<>(fAttachments.size() + 1);
iterators.add(iter);
Iterator<Object> it= fAttachments.keySet().iterator();
while (it.hasNext()) {
iterators.add(fAttachments.get(it.next()).getAnnotationIterator());
}
}

return new MetaIterator<>(iterators.iterator());
Expand Down Expand Up @@ -837,22 +844,21 @@ public void removeAllAnnotations() {
*/
protected void removeAllAnnotations(boolean fireModelChanged) {
IAnnotationMap annotations= getAnnotationMap();
if (fDocument != null) {
List<Position> positionsToRemove = new ArrayList<>();
synchronized (getLockObject()) {
Iterator<Annotation> e= getAnnotationMap().keySetIterator();
while (e.hasNext()) {
Annotation a= e.next();
Position p= annotations.get(a);
removePosition(fDocument, p);
// p.delete();
synchronized (getLockObject()) {
getAnnotationModelEvent().annotationRemoved(a, p);
}
positionsToRemove.add(p);
getAnnotationModelEvent().annotationRemoved(a, p);
}
annotations.clear();
fPositions.clear();
}
for (Position position : positionsToRemove) {
removePosition(fDocument, position);
}

annotations.clear();
fPositions.clear();

if (fireModelChanged) {
fireModelChanged();
}
Expand All @@ -872,24 +878,22 @@ public void removeAnnotation(Annotation annotation) {
*/
protected void removeAnnotation(Annotation annotation, boolean fireModelChanged) {
IAnnotationMap annotations= getAnnotationMap();
if (annotations.containsKey(annotation)) {

Position p= null;
Position p;
synchronized (getLockObject()) {
p= annotations.get(annotation);
if (fDocument != null) {
removePosition(fDocument, p);
// p.delete();
if (p == null) {
return;
}

annotations.remove(annotation);
fPositions.remove(p);
synchronized (getLockObject()) {
getAnnotationModelEvent().annotationRemoved(annotation, p);
}
getAnnotationModelEvent().annotationRemoved(annotation, p);
}
if (fDocument != null) {
removePosition(fDocument, p);
}

if (fireModelChanged) {
fireModelChanged();
}
if (fireModelChanged) {
fireModelChanged();
}
}

Expand Down Expand Up @@ -982,13 +986,20 @@ public void removeAnnotationModelListener(IAnnotationModelListener listener) {
@Override
public void addAnnotationModel(Object key, IAnnotationModel attachment) {
Assert.isNotNull(attachment);
if (!fAttachments.containsValue(attachment)) {
Assert.isNotNull(key);
synchronized (getLockObject()) {
if (fAttachments.containsValue(attachment)) {
return;
}
fAttachments.put(key, attachment);
}
IDocument document= fDocument;
if (document != null) {
for (int i= 0; i < fOpenConnections; i++) {
attachment.connect(fDocument);
attachment.connect(document);
}
attachment.addAnnotationModelListener(fModelListener);
}
attachment.addAnnotationModelListener(fModelListener);
}

/*
Expand All @@ -1006,13 +1017,21 @@ public IAnnotationModel getAnnotationModel(Object key) {
*/
@Override
public IAnnotationModel removeAnnotationModel(Object key) {
IAnnotationModel ret= fAttachments.remove(key);
if (ret != null) {
Assert.isNotNull(key);
IAnnotationModel ret;
synchronized (getLockObject()) {
ret= fAttachments.remove(key);
if (ret == null) {
return null;
}
}
IDocument document= fDocument;
if (document != null) {
for (int i= 0; i < fOpenConnections; i++) {
ret.disconnect(fDocument);
ret.disconnect(document);
}
ret.removeAnnotationModelListener(fModelListener);
}
ret.removeAnnotationModelListener(fModelListener);
return ret;
}

Expand Down
Loading