Skip to content

Commit

Permalink
CSSTUDIO-2472 Revert changes to "EmbeddedDisplayRepresentation".
Browse files Browse the repository at this point in the history
  • Loading branch information
@abrahamwolk
abrahamwolk committed Jul 4, 2024
1 parent 1e729ed commit 86b1786
Showing 1 changed file with 71 additions and 65 deletions.
136 changes: 71 additions & 65 deletions ...csstudio/display/builder/representation/javafx/widgets/EmbeddedDisplayRepresentation.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
import java.util.concurrent.atomic.AtomicReference;
import java.util.logging.Level;

import javafx.application.Platform;
import org.csstudio.display.builder.model.DirtyFlag;
import org.csstudio.display.builder.model.DisplayModel;
import org.csstudio.display.builder.model.UntypedWidgetPropertyListener;
Expand Down Expand Up @@ -257,7 +256,7 @@ private void fileChanged(final WidgetProperty<?> property, final Object old_valu

/** Update to the next pending display
*
* <p>Executed on the JavaFX Application Thread to serialize the background threads.
* <p>Synchronized to serialize the background threads.
*
* <p>Example: Displays A, B, C are requested in quick succession.
*
Expand All @@ -271,56 +270,65 @@ private void fileChanged(final WidgetProperty<?> property, final Object old_valu
* As thread C finally continues, it finds pending_display_and_group empty.
* --> Showing A, then C, skipping B.
*/
private void updatePendingDisplay(final JobMonitor monitor) {
Platform.runLater(() -> {
try {
final DisplayAndGroup handle = pending_display_and_group.getAndSet(null);
if (handle == null) {
// System.out.println("Nothing to handle");
return;
}
if (inner == null) {
// System.out.println("Aborted: " + handle);
return;
}
private synchronized void updatePendingDisplay(final JobMonitor monitor)
{
try
{
final DisplayAndGroup handle = pending_display_and_group.getAndSet(null);
if (handle == null)
{
// System.out.println("Nothing to handle");
return;
}
if (inner == null)
{
// System.out.println("Aborted: " + handle);
return;
}

monitor.beginTask("Load " + handle);
try { // Load new model (potentially slow)
final DisplayModel new_model = loadDisplayModel(model_widget, handle);
monitor.beginTask("Load " + handle);
try
{ // Load new model (potentially slow)
final DisplayModel new_model = loadDisplayModel(model_widget, handle);

// Stop (old) runtime
// EmbeddedWidgetRuntime tracks this property to start/stop the embedded model's runtime
model_widget.runtimePropEmbeddedModel().setValue(null);
// Stop (old) runtime
// EmbeddedWidgetRuntime tracks this property to start/stop the embedded model's runtime
model_widget.runtimePropEmbeddedModel().setValue(null);

// Atomically update the 'active' model
final DisplayModel old_model = active_content_model.getAndSet(new_model);
new_model.propBackgroundColor().addUntypedPropertyListener(backgroundChangedListener);
// Atomically update the 'active' model
final DisplayModel old_model = active_content_model.getAndSet(new_model);
new_model.propBackgroundColor().addUntypedPropertyListener(backgroundChangedListener);

if (old_model != null) { // Dispose old model
final Future<Object> completion = toolkit.submit(() ->
{
toolkit.disposeRepresentation(old_model);
return null;
});
checkCompletion(model_widget, completion, "timeout disposing old representation");
}
// Represent new model on UI thread
toolkit.onRepresentationStarted();
if (old_model != null)
{ // Dispose old model
final Future<Object> completion = toolkit.submit(() ->
{
representContent(new_model);
toolkit.disposeRepresentation(old_model);
return null;
});
checkCompletion(model_widget, completion, "timeout representing new content");
// Allow EmbeddedWidgetRuntime to start the new runtime
model_widget.runtimePropEmbeddedModel().setValue(new_model);
} catch (Exception ex) {
logger.log(Level.WARNING, "Failed to handle embedded display " + handle, ex);
checkCompletion(model_widget, completion, "timeout disposing old representation");
}
} finally {
toolkit.onRepresentationFinished();
// Represent new model on UI thread
toolkit.onRepresentationStarted();
final Future<Object> completion = toolkit.submit(() ->
{
representContent(new_model);
return null;
});
checkCompletion(model_widget, completion, "timeout representing new content");

// Allow EmbeddedWidgetRuntime to start the new runtime
model_widget.runtimePropEmbeddedModel().setValue(new_model);
}
});
catch (Exception ex)
{
logger.log(Level.WARNING, "Failed to handle embedded display " + handle, ex);
}
}
finally
{
toolkit.onRepresentationFinished();
}
}

/** @param content_model Model to represent */
Expand Down Expand Up @@ -463,28 +471,26 @@ else if (inner.getHeight() != 0.0 && inner.getWidth() != 0.0)
}

@Override
public void dispose() {
Platform.runLater(() -> {
// When the file name is changed, updatePendingDisplay()
// will atomically update the active_content_model,
// represent the new model, and then set runtimePropEmbeddedModel.
//
// Fetching the embedded model from active_content_model
// could dispose a representation that hasn't been represented, yet.
// Fetching the embedded model from runtimePropEmbeddedModel
// could fail to dispose what's just now being represented.
//
// --> Very unlikely to happen because runtime has been stopped,
// so nothing is changing the file name right now.

final DisplayModel em = active_content_model.getAndSet(null);
model_widget.runtimePropEmbeddedModel().setValue(null);

if (inner != null && em != null)
toolkit.disposeRepresentation(em);
inner = null;

super.dispose();
});
public void dispose()
{
// When the file name is changed, updatePendingDisplay()
// will atomically update the active_content_model,
// represent the new model, and then set runtimePropEmbeddedModel.
//
// Fetching the embedded model from active_content_model
// could dispose a representation that hasn't been represented, yet.
// Fetching the embedded model from runtimePropEmbeddedModel
// could fail to dispose what's just now being represented.
//
// --> Very unlikely to happen because runtime has been stopped,
// so nothing is changing the file name right now.
final DisplayModel em = active_content_model.getAndSet(null);
model_widget.runtimePropEmbeddedModel().setValue(null);

if (inner != null && em != null)
toolkit.disposeRepresentation(em);
inner = null;

super.dispose();
}
}

0 comments on commit 86b1786

Please sign in to comment.