Author: cwiklik Date: Fri Oct 2 20:15:01 2015 New Revision: 1706485 URL: http://svn.apache.org/viewvc?rev=1706485&view=rev Log: UIMA-4598 Updated performance metric to fix unique names
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jp/UimaProcessContainer.java Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jp/UimaProcessContainer.java URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jp/UimaProcessContainer.java?rev=1706485&r1=1706484&r2=1706485&view=diff ============================================================================== --- uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jp/UimaProcessContainer.java (original) +++ uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jp/UimaProcessContainer.java Fri Oct 2 20:15:01 2015 @@ -284,7 +284,7 @@ public class UimaProcessContainer extend private void getLeafManagementObjects(AnalysisEngineManagement aem, List<AnalysisEnginePerformanceMetrics> result, String uimaFullyQualifiedAEContext) { - +// System.out.println("----------- 1 getLeafManagementObjects() - Unique Name:"+aem.getUniqueMBeanName()+" UniqueContext:"+uimaFullyQualifiedAEContext); if (aem.getComponents().isEmpty()) { // skip Flow Controller if (!aem.getName().equals("Fixed Flow Controller")) { @@ -297,36 +297,20 @@ public class UimaProcessContainer extend // Components,p2=ThirdLevelAggregateCM // Components,name=Multiplier1 if (aem.getUniqueMBeanName().indexOf("p0=") > -1) { - uimaFullyQualifiedAEContext = ""; -/* - // check id the parent aggregate has been scaled up by - // looking at the last char in its name. If it is a number - // strip it from the name - if (Character.isDigit(uimaFullyQualifiedAEContext - .charAt(uimaFullyQualifiedAEContext.length() - 1)) - && uimaFullyQualifiedAEContext.lastIndexOf(" ") > -1) { - String indx = uimaFullyQualifiedAEContext - .substring(uimaFullyQualifiedAEContext - .lastIndexOf(" ")); - if (indx != null) { - int value = -1; - try { - value = Integer.parseInt(indx.trim()); - // Prepend "X Components" to the unique name - // with X stripped. - uimaFullyQualifiedAEContext = value - + " Components " - + uimaFullyQualifiedAEContext - .substring( - 0, - uimaFullyQualifiedAEContext - .lastIndexOf(" ")); - } catch (NumberFormatException ex) { + int p1indx = aem.getUniqueMBeanName().indexOf("p1="); + if ( p1indx > -1 ) { + String tmp = aem.getUniqueMBeanName().substring(p1indx); + String[] parts = tmp.split(","); + for( String part : parts ) { + if ( part.startsWith("name=") ) { + uimaFullyQualifiedAEContext += "/"+part.substring(5); + break; + } + } + } else { + uimaFullyQualifiedAEContext = ""; + } - } - } - } - */ } result.add(deepCopyMetrics(aem, uimaFullyQualifiedAEContext)); } @@ -448,6 +432,7 @@ public class UimaProcessContainer extend for (AnalysisEnginePerformanceMetrics before : beforeAnalysisManagementObjects) { String uniqueName = after.getUniqueName(); if (before.getUniqueName().equals(after.getUniqueName())) { + /* int p1 = after.getUniqueName().indexOf("DUCC.Job"); if ( p1 >-1 ) { int p2 = after.getUniqueName().indexOf("/",p1); @@ -455,6 +440,8 @@ public class UimaProcessContainer extend uniqueName = after.getUniqueName().substring(p2); } } + */ + System.out.println("getAEMetricsForCAS() - Unique Name:"+uniqueName); //String uniqueName = AnalysisEnginePerformanceMetrics metrics = new AnalysisEnginePerformanceMetrics( after.getName(), uniqueName,