Skip to content

Few WorkManager fields are not MT safe #2149

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
Open

Few WorkManager fields are not MT safe #2149

Show file tree
Hide file tree
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
26 changes: 15 additions & 11 deletions ...ndles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/WorkManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,17 @@
*******************************************************************************/
package org.eclipse.core.internal.resources;

import java.util.concurrent.atomic.AtomicInteger;
import org.eclipse.core.internal.utils.Messages;
import org.eclipse.core.internal.utils.Policy;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IResourceStatus;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.jobs.*;
import org.eclipse.core.runtime.jobs.IJobManager;
import org.eclipse.core.runtime.jobs.ILock;
import org.eclipse.core.runtime.jobs.ISchedulingRule;
import org.eclipse.core.runtime.jobs.Job;

/**
* The work manager governs concurrent access to the workspace tree. The {@link #lock}
Expand Down Expand Up @@ -78,16 +82,16 @@ public boolean isConflicting(ISchedulingRule rule) {
/**
* The current depth of running nested operations.
*/
private int nestedOperations = 0;
private final AtomicInteger nestedOperations = new AtomicInteger(0);

private final NotifyRule notifyRule = new NotifyRule();

private boolean operationCanceled = false;
private volatile boolean operationCanceled;

/**
* The current depth of prepared operations.
*/
private int preparedOperations = 0;
private final AtomicInteger preparedOperations = new AtomicInteger(0);
private final Workspace workspace;

WorkManager(Workspace workspace) {
Expand Down Expand Up @@ -165,7 +169,7 @@ synchronized void checkOut(ISchedulingRule rule) {
decrementPreparedOperations();
rebalanceNestedOperations();
//reset state if this is the end of a top level operation
if (preparedOperations == 0) {
if (preparedOperations.get() == 0) {
hasBuildChanges = false;
}
//don't let cancelation of this operation affect other operations
Expand All @@ -184,7 +188,7 @@ synchronized void checkOut(ISchedulingRule rule) {
* prepareOperation/endOperation block.
*/
private void decrementPreparedOperations() {
preparedOperations--;
preparedOperations.decrementAndGet();
}

/**
Expand Down Expand Up @@ -218,7 +222,7 @@ ISchedulingRule getNotifyRule() {
* prepareOperation/endOperation block.
*/
synchronized int getPreparedOperationDepth() {
return preparedOperations;
return preparedOperations.get();
}

/**
Expand All @@ -227,7 +231,7 @@ synchronized int getPreparedOperationDepth() {
* prepareOperation/endOperation block.
*/
void incrementNestedOperations() {
nestedOperations++;
nestedOperations.incrementAndGet();
}

/**
Expand All @@ -236,7 +240,7 @@ void incrementNestedOperations() {
* prepareOperation/endOperation block.
*/
private void incrementPreparedOperations() {
preparedOperations++;
preparedOperations.incrementAndGet();
}

/**
Expand All @@ -246,7 +250,7 @@ private void incrementPreparedOperations() {
* outside a prepareOperation/endOperation block.
*/
boolean isBalanced() {
return nestedOperations == preparedOperations;
return nestedOperations.get() == preparedOperations.get();
}

/**
Expand Down Expand Up @@ -285,7 +289,7 @@ void operationCanceled() {
* be called from outside a prepareOperation/endOperation block.
*/
void rebalanceNestedOperations() {
nestedOperations = preparedOperations;
nestedOperations.set(preparedOperations.get());
}

/**
Expand Down
9 changes: 5 additions & 4 deletions ...bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/Workspace.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1593,9 +1593,10 @@ public void endOperation(ISchedulingRule rule, boolean build) throws CoreExcepti
boolean depthOne = false;
try {
workManager.setBuild(build);
// if we are not exiting a top level operation then just decrement the count and return
depthOne = workManager.getPreparedOperationDepth() == 1;
if (!(notificationManager.shouldNotify() || depthOne)) {
// if we are not exiting a top level operation then schedule notify and return
final int preparedOperationDepth = workManager.getPreparedOperationDepth();
depthOne = preparedOperationDepth == 1;
if (!depthOne && !notificationManager.shouldNotify()) {
notificationManager.requestNotify();
return;
}
Expand All @@ -1604,7 +1605,7 @@ public void endOperation(ISchedulingRule rule, boolean build) throws CoreExcepti
try {
notificationManager.beginNotify();
// check for a programming error on using beginOperation/endOperation
Assert.isTrue(workManager.getPreparedOperationDepth() > 0, "Mismatched begin/endOperation"); //$NON-NLS-1$
Assert.isTrue(preparedOperationDepth > 0, "Mismatched begin/endOperation"); //$NON-NLS-1$

// At this time we need to re-balance the nested operations. It is necessary because
// build() and snapshot() should not fail if they are called.
Expand Down
Loading