You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by ea...@apache.org on 2008/12/01 23:02:50 UTC
svn commit: r722256 - in
/incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main:
java/org/apache/uima/aae/jmx/monitor/ resources/
Author: eae
Date: Mon Dec 1 14:02:50 2008
New Revision: 722256
URL: http://svn.apache.org/viewvc?rev=722256&view=rev
Log:
UIMA-1241 commit uimaj-as-activemq-UIMA-1241-patch.txt and uimaj-as-core-UIMA-1241-patch.txt
Modified:
incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/java/org/apache/uima/aae/jmx/monitor/BasicUimaJmxMonitorListener.java
incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/java/org/apache/uima/aae/jmx/monitor/ServiceMetrics.java
incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/java/org/apache/uima/aae/jmx/monitor/SingleLineUimaJmxMonitorListener.java
incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/resources/uimaee_messages.properties
Modified: incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/java/org/apache/uima/aae/jmx/monitor/BasicUimaJmxMonitorListener.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/java/org/apache/uima/aae/jmx/monitor/BasicUimaJmxMonitorListener.java?rev=722256&r1=722255&r2=722256&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/java/org/apache/uima/aae/jmx/monitor/BasicUimaJmxMonitorListener.java (original)
+++ incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/java/org/apache/uima/aae/jmx/monitor/BasicUimaJmxMonitorListener.java Mon Dec 1 14:02:50 2008
@@ -64,13 +64,13 @@
if ( serviceMetrics.isCasMultiplier() && serviceMetrics.isServiceRemote() && !serviceMetrics.isTopLevelService() )
{
if (UIMAFramework.getLogger(CLASS_NAME).isLoggable(Level.INFO)) {
- UIMAFramework.getLogger(CLASS_NAME).logrb(Level.INFO, CLASS_NAME.getName(), "run", UIMAEE_Constants.JMS_LOG_RESOURCE_BUNDLE, "UIMAEE_service_idle_time_shadow_cas_pool_INFO", new Object[] { format(sampleTime/1000000),padName(serviceMetrics.getServiceName()),serviceMetrics.isCasMultiplier(), serviceMetrics.isServiceRemote(),format(serviceMetrics.getIdleTime()), serviceMetrics.getProcessCount(), serviceMetrics.getInputQueueDepth(), serviceMetrics.getReplyQueueDepth(),format(serviceMetrics.getShadowCasPoolWaitTime()) , format(serviceMetrics.getAnalysisTime()), serviceMetrics.getProcessThreadCount(), serviceMetrics.getCmFreeCasInstanceCount()});
+ UIMAFramework.getLogger(CLASS_NAME).logrb(Level.INFO, CLASS_NAME.getName(), "run", UIMAEE_Constants.JMS_LOG_RESOURCE_BUNDLE, "UIMAEE_service_idle_time_shadow_cas_pool_INFO", new Object[] { format(sampleTime/1000000),padName(serviceMetrics.getServiceName()),serviceMetrics.isCasMultiplier(), serviceMetrics.isServiceRemote(),format(serviceMetrics.getIdleTime()), serviceMetrics.getProcessCount(), serviceMetrics.getInputQueueDepth(), serviceMetrics.getReplyQueueDepth(),format(serviceMetrics.getShadowCasPoolWaitTime()) , format(serviceMetrics.getAnalysisTime()), serviceMetrics.getProcessThreadCount(), serviceMetrics.getCmFreeCasInstanceCount(), serviceMetrics.getSvcFreeCasInstanceCount()});
}
}
else
{
if (UIMAFramework.getLogger(CLASS_NAME).isLoggable(Level.INFO)) {
- UIMAFramework.getLogger(CLASS_NAME).logrb(Level.INFO, CLASS_NAME.getName(), "run", UIMAEE_Constants.JMS_LOG_RESOURCE_BUNDLE, "UIMAEE_service_idle_time_cas_pool_INFO", new Object[] { format(sampleTime/1000000),padName(serviceMetrics.getServiceName()),serviceMetrics.isCasMultiplier(), serviceMetrics.isServiceRemote(),format(serviceMetrics.getIdleTime()), serviceMetrics.getProcessCount(), serviceMetrics.getInputQueueDepth(),serviceMetrics.getReplyQueueDepth(), format(serviceMetrics.getCasPoolWaitTime()) , format(serviceMetrics.getAnalysisTime()), serviceMetrics.getProcessThreadCount(), serviceMetrics.getCmFreeCasInstanceCount()});
+ UIMAFramework.getLogger(CLASS_NAME).logrb(Level.INFO, CLASS_NAME.getName(), "run", UIMAEE_Constants.JMS_LOG_RESOURCE_BUNDLE, "UIMAEE_service_idle_time_cas_pool_INFO", new Object[] { format(sampleTime/1000000),padName(serviceMetrics.getServiceName()),serviceMetrics.isCasMultiplier(), serviceMetrics.isServiceRemote(),format(serviceMetrics.getIdleTime()), serviceMetrics.getProcessCount(), serviceMetrics.getInputQueueDepth(),serviceMetrics.getReplyQueueDepth(), format(serviceMetrics.getCasPoolWaitTime()) , format(serviceMetrics.getAnalysisTime()), serviceMetrics.getProcessThreadCount(), serviceMetrics.getCmFreeCasInstanceCount(), serviceMetrics.getSvcFreeCasInstanceCount()});
}
}
}
Modified: incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/java/org/apache/uima/aae/jmx/monitor/ServiceMetrics.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/java/org/apache/uima/aae/jmx/monitor/ServiceMetrics.java?rev=722256&r1=722255&r2=722256&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/java/org/apache/uima/aae/jmx/monitor/ServiceMetrics.java (original)
+++ incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/java/org/apache/uima/aae/jmx/monitor/ServiceMetrics.java Mon Dec 1 14:02:50 2008
@@ -36,6 +36,8 @@
private int processThreadCount;
private double analysisTime;
private int cmFreeCasInstanceCount;
+ private int svcFreeCasInstanceCount;
+
public boolean isTopLevelService() {
return topLevelService;
}
@@ -132,6 +134,12 @@
public void setCmFreeCasInstanceCount(int cmFreeCasInstanceCount) {
this.cmFreeCasInstanceCount = cmFreeCasInstanceCount;
}
+ public int getSvcFreeCasInstanceCount() {
+ return svcFreeCasInstanceCount;
+ }
+ public void setSvcFreeCasInstanceCount(int svcFreeCasInstanceCount) {
+ this.svcFreeCasInstanceCount = svcFreeCasInstanceCount;
+ }
}
Modified: incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/java/org/apache/uima/aae/jmx/monitor/SingleLineUimaJmxMonitorListener.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/java/org/apache/uima/aae/jmx/monitor/SingleLineUimaJmxMonitorListener.java?rev=722256&r1=722255&r2=722256&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/java/org/apache/uima/aae/jmx/monitor/SingleLineUimaJmxMonitorListener.java (original)
+++ incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/java/org/apache/uima/aae/jmx/monitor/SingleLineUimaJmxMonitorListener.java Mon Dec 1 14:02:50 2008
@@ -87,7 +87,10 @@
items = items + "\t" + srvName + "-CPW";
}
if (serviceMetrics.isCasMultiplier() && !serviceMetrics.isServiceRemote() ) {
- items = items + "\t" + srvName + "-FreeCP";
+ items = items + "\t" + srvName + "-CmFreeCP";
+ }
+ if ( serviceMetrics.isTopLevelService() ) {
+ items = items + "\t" + srvName + "-SvcFreeCP";
}
}
UIMAFramework.getLogger(CLASS_NAME).log(Level.INFO, items);
@@ -117,6 +120,10 @@
items = items + "\t" + serviceMetrics.getCmFreeCasInstanceCount();
}
}
+ if ( serviceMetrics.isTopLevelService() ) {
+ items = items + "\t" + serviceMetrics.getSvcFreeCasInstanceCount();
+ }
+
}
if (UIMAFramework.getLogger(CLASS_NAME).isLoggable(Level.INFO)) {
UIMAFramework.getLogger(CLASS_NAME).log(Level.INFO, items);
Modified: incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/resources/uimaee_messages.properties
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/resources/uimaee_messages.properties?rev=722256&r1=722255&r2=722256&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/resources/uimaee_messages.properties (original)
+++ incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/resources/uimaee_messages.properties Mon Dec 1 14:02:50 2008
@@ -155,8 +155,8 @@
UIMAEE_remove_cache_entry__INFO = Controller: {0} Releasing CASes Produced From Input CAS: {1}
UIMAEE_dump_msg_origin__FINE = Controller: {0} Origin Map Dump {1}
UIMAEE_show_abbrev_cache_stats___FINE = Controller: {0} Number of CASes In the Cache: {1} Number of CASes in Final State: {2}
-UIMAEE_service_idle_time_cas_pool_INFO = \tTimestamp:\t{0}\t[ {1} ]\tCM:\t{2}\tRemote:\t{3}\tIdle\t{4}\tCASes\t{5}\tInQDepth\t{6}\tRQDepth\t{7}\tCP Wait\t{8}\tAnalysis:\t{9}\tThreadCnt:\t{10}\tCMFreeCasCount:\t{11}
-UIMAEE_service_idle_time_shadow_cas_pool_INFO = \tTimestamp:\t{0}\t[ {1} ]\tCM:\t{2}\tRemote:\t{3}\tIdle\t{4}\tCASes\t{5}\tInQDepth\t{6}\tRQDepth\t{7}\tSCP Wait\t{8}\tAnalysis:\t{9}\tThreadCnt:\t{10}\tCMFreeCasCount:\t{11}
+UIMAEE_service_idle_time_cas_pool_INFO = \tTimestamp:\t{0}\t[ {1} ]\tCM:\t{2}\tRemote:\t{3}\tIdle\t{4}\tCASes\t{5}\tInQDepth\t{6}\tRQDepth\t{7}\tCP Wait\t{8}\tAnalysis:\t{9}\tThreadCnt:\t{10}\tCMFreeCasCount:\t{11}\tSvcFreeCasCount:\t{12}
+UIMAEE_service_idle_time_shadow_cas_pool_INFO = \tTimestamp:\t{0}\t[ {1} ]\tCM:\t{2}\tRemote:\t{3}\tIdle\t{4}\tCASes\t{5}\tInQDepth\t{6}\tRQDepth\t{7}\tSCP Wait\t{8}\tAnalysis:\t{9}\tThreadCnt:\t{10}\tCMFreeCasCount:\t{11}\tSvcFreeCasCount:\t{12}
UIMAEE_marker_INFO = ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
UIMAEE_cache_entry_exists___FINE = CAS Entry: {0} Has Parent CAS Entry: {1}
UIMAEE_remove_msg_origin_entry__FINEST = >>>>>> Controller: {0} Removed Message Origin Entry For Cas: {1}