You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by cw...@apache.org on 2013/05/14 16:57:30 UTC
svn commit: r1482367 -
/uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/PrimitiveAnalysisEngineController_impl.java
Author: cwiklik
Date: Tue May 14 14:57:30 2013
New Revision: 1482367
URL: http://svn.apache.org/r1482367
Log:
UIMA-2906 Simplified unique name in the AE performance stats
Modified:
uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/PrimitiveAnalysisEngineController_impl.java
Modified: uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/PrimitiveAnalysisEngineController_impl.java
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/PrimitiveAnalysisEngineController_impl.java?rev=1482367&r1=1482366&r2=1482367&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/PrimitiveAnalysisEngineController_impl.java (original)
+++ uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/PrimitiveAnalysisEngineController_impl.java Tue May 14 14:57:30 2013
@@ -479,26 +479,34 @@ public class PrimitiveAnalysisEngineCont
}
return null;
}
- private AnalysisEnginePerformanceMetrics deepCopyMetrics(AnalysisEngineManagement aem) {
+ private AnalysisEnginePerformanceMetrics deepCopyMetrics(AnalysisEngineManagement aem, String uimaFullyQualifiedAEContext) {
return new AnalysisEnginePerformanceMetrics(aem.getName(),
- aem.getUniqueMBeanName(),
+ uimaFullyQualifiedAEContext,
aem.getAnalysisTime(),
aem.getNumberOfCASesProcessed());
}
private void getLeafManagementObjects(AnalysisEngineManagement aem, List<AnalysisEnginePerformanceMetrics> result) {
- if (aem.getComponents().isEmpty()) {
- if (!aem.getName().equals("Fixed Flow Controller")) {
- result.add(deepCopyMetrics(aem));
- }
- } else {
- for (AnalysisEngineManagement child : (Iterable<AnalysisEngineManagement>) aem.getComponents().values()) {
- getLeafManagementObjects(child, result);
- }
- }
+ getLeafManagementObjects(aem, result, "");
+
}
-
+ private void getLeafManagementObjects(AnalysisEngineManagement aem, List<AnalysisEnginePerformanceMetrics> result, String uimaFullyQualifiedAEContext) {
+ if (aem.getComponents().isEmpty()) {
+ if (!aem.getName().equals("Fixed Flow Controller")) {
+ result.add(deepCopyMetrics(aem, uimaFullyQualifiedAEContext));
+ }
+ } else {
+ for (AnalysisEngineManagement child : (Iterable<AnalysisEngineManagement>) aem.getComponents().values()) {
+ if ( uimaFullyQualifiedAEContext.trim().length() > 0 ) {
+ getLeafManagementObjects(child, result, uimaFullyQualifiedAEContext+"/"+aem.getName());
+ } else {
+ getLeafManagementObjects(child, result, aem.getName());
+ }
+ }
+ }
+ }
+
public void destroyAE() {
try {
@@ -577,8 +585,9 @@ public class PrimitiveAnalysisEngineCont
AnalysisEngineManagement rootAem = ae.getManagementInterface();
if ( rootAem.getComponents().size() > 0 ) {
getLeafManagementObjects(rootAem, beforeAnalysisManagementObjects);
+
} else {
- beforeAnalysisManagementObjects.add(deepCopyMetrics(rootAem));
+ beforeAnalysisManagementObjects.add(deepCopyMetrics(rootAem, ""));
}
CasIterator casIterator = ae.processAndOutputNewCASes(aCAS);
@@ -840,7 +849,7 @@ public class PrimitiveAnalysisEngineCont
getLeafManagementObjects(aem, afterAnalysisManagementObjects);
} else {
// Add the top level AnalysisEngineManagement instance.
- afterAnalysisManagementObjects.add(deepCopyMetrics(aem));
+ afterAnalysisManagementObjects.add(deepCopyMetrics(aem,""));
}
// Create a List to hold per CAS analysisTime and total number of CASes processed