From 9240b7bfa4c9b038c911b29da8b33871e100a227 Mon Sep 17 00:00:00 2001
From: Simon Spinner <simon.spinner@uni-wuerzburg.de>
Date: Sun, 19 Jun 2016 17:20:00 +0200
Subject: [PATCH] Remove insertion of network delays in model.
---
.../descartes/prisma/agent/wildfly/Constants.java | 1 -
.../wildfly/service/ModelExtractionService.java | 15 ---------------
2 files changed, 16 deletions(-)
diff --git a/tools.descartes.prisma.agent.wildfly/src/main/java/tools/descartes/prisma/agent/wildfly/Constants.java b/tools.descartes.prisma.agent.wildfly/src/main/java/tools/descartes/prisma/agent/wildfly/Constants.java
index 6332920..fbb26dc 100644
--- a/tools.descartes.prisma.agent.wildfly/src/main/java/tools/descartes/prisma/agent/wildfly/Constants.java
+++ b/tools.descartes.prisma.agent.wildfly/src/main/java/tools/descartes/prisma/agent/wildfly/Constants.java
@@ -31,5 +31,4 @@ public class Constants {
public static final long MONITORING_INTERVAL_IN_MILLIS = 60000;
- public static final boolean ADD_NETWORK_DELAYS = true;
}
diff --git a/tools.descartes.prisma.agent.wildfly/src/main/java/tools/descartes/prisma/agent/wildfly/service/ModelExtractionService.java b/tools.descartes.prisma.agent.wildfly/src/main/java/tools/descartes/prisma/agent/wildfly/service/ModelExtractionService.java
index 784c82c..2fb760a 100644
--- a/tools.descartes.prisma.agent.wildfly/src/main/java/tools/descartes/prisma/agent/wildfly/service/ModelExtractionService.java
+++ b/tools.descartes.prisma.agent.wildfly/src/main/java/tools/descartes/prisma/agent/wildfly/service/ModelExtractionService.java
@@ -804,21 +804,6 @@ public class ModelExtractionService extends AgentController implements Service<M
iterationCount.setCharacterization(ModelVariableCharacterizationType.EMPIRICAL);
loop.setLoopIterationCount(iterationCount);
loop.setLoopBodyBehavior(ServicebehaviorFactory.eINSTANCE.createComponentInternalBehavior());
-
- // We may add delay actions to represent the network delays for
- // remote external calls.
- if (Constants.ADD_NETWORK_DELAYS) {
- if (isRemoteCall(outgoingInvocation)) {
- InternalAction delayAction = ServicebehaviorFactory.eINSTANCE.createInternalAction();
- ResourceDemand demand = ServicebehaviorFactory.eINSTANCE.createResourceDemand();
- demand.setCharacterization(ModelVariableCharacterizationType.EMPIRICAL);
- demand.setName("Network");
- demand.setResourceType(
- ModelSkeletonUtil.adopt(this, getContainerScope().getSystemScope().getDelayResourceType()));
- delayAction.getResourceDemand().add(demand);
- loop.getLoopBodyBehavior().getActions().add(delayAction);
- }
- }
loop.getLoopBodyBehavior().getActions().add(callAction);
// We assume that the external calls are inserted in
--
GitLab