svn commit: r689504 - in /incubator/uima/sandbox/trunk/uima-as: uima-as-distr/src/main/scripts/dd2spring.xsl uima-as-docbooks/src/docbook/uima_async_scaleout/ref.async.deployment.xml

[sc...@apache.org]

Author: schor
Date: Wed Aug 27 08:50:40 2008
New Revision: 689504

URL: http://svn.apache.org/viewvc?rev=689504&view=rev
Log:
[UIMA-1161] allow inputQueueScaleout on nested aggregates in a deployment descriptor.

Modified:
    incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/main/scripts/dd2spring.xsl
    incubator/uima/sandbox/trunk/uima-as/uima-as-docbooks/src/docbook/uima_async_scaleout/ref.async.deployment.xml

Modified: incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/main/scripts/dd2spring.xsl
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/main/scripts/dd2spring.xsl?rev=689504&r1=689503&r2=689504&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/main/scripts/dd2spring.xsl (original)
+++ incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/main/scripts/dd2spring.xsl Wed Aug 27 08:50:40 2008
@@ -486,8 +486,7 @@
       <!-- used as 1st part of ctlr name -->
       <xsl:with-param name="msgHandlerChainID"
         select="f:getMetaMsgHandlerID(., 'aggregate_input')"/>
-      <xsl:with-param name="nbrConcurrentConsumers" select=
-        "if (f:isTopLevelAggr($input_q_ID)) then string(@inputQueueScaleout) else '1'"/>
+      <xsl:with-param name="nbrConcurrentConsumers" select="string(@inputQueueScaleout)"/>
       <xsl:with-param name="remote" select="()"/>
       <xsl:with-param name="poolingTaskExecutor" select="()"/>
     </xsl:call-template>
@@ -2169,11 +2168,6 @@
     <xsl:param name="aeNode"/>
     <xsl:sequence select="$aeNode/*/u:frameworkImplementation[text() eq 'org.apache.uima.cpp']"/>
   </xsl:function>
-      
-  <xsl:function name="f:isTopLevelAggr">
-    <xsl:param name="qname"/>
-    <xsl:sequence select="starts-with($qname, 'top_level_input_queue_service')"/>
-  </xsl:function>
   
   <xsl:function name="f:getUserHandlerDispatcherID">
     <xsl:param name="node"/>

Modified: incubator/uima/sandbox/trunk/uima-as/uima-as-docbooks/src/docbook/uima_async_scaleout/ref.async.deployment.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uima-as-docbooks/src/docbook/uima_async_scaleout/ref.async.deployment.xml?rev=689504&r1=689503&r2=689504&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/uima-as/uima-as-docbooks/src/docbook/uima_async_scaleout/ref.async.deployment.xml (original)
+++ incubator/uima/sandbox/trunk/uima-as/uima-as-docbooks/src/docbook/uima_async_scaleout/ref.async.deployment.xml Wed Aug 27 08:50:40 2008
@@ -375,7 +375,8 @@
     <para>
       The attributes <code>internalReplyQueueScaleout</code> and <code>inputQueueScaleout</code> only
       have meaning and are allowed when 
-      async="true" is specified (which in turn can only be set true for aggregates).
+      async="true" is specified (which in turn can only be set true for aggregates) or is the default (
+      which happens when the aggregate has delegate deployment options specified in the deployment descriptor).
       These attributes default to 1.  For asynchronous aggregates, they control the number of threads
       used to do the work of the aggregate outside of running the delegates.  This work can include
       one or more of the following:
@@ -386,12 +387,24 @@
           requester is remote).</para>
           <para>running the flow controller</para>
           <para>serializing CASes being sent to remote delegates (only useful if one or more
-          of the delegates is remote)</para>
+          of the delegates is remote).  
+            
+          </para>
         </listitem>
       </itemizedlist>
+      </para>
+    
+    <para>
       These attributes provide a way to scale out this work on multi-core machines, if these
       tasks become a bottleneck.
     </para>
+
+    <para>Note that if an aggregates flow controller specifies
+            that the first delegate the CAS should flow to is a remote, the work of serializing
+            the CAS to that remote is done using the inputQueue thread, and the scaleout
+            parameter that would apply would be the inputQueueScaleout.  For subsequent delegates,
+            the work is done on the internalReplyQueueScaleout threads.
+    </para>
     
     <para> The &lt;scaleout ...> element specifies, for co-located primitive or non-AS aggregates
       (async="false") at the bottom of an aggregate tree, how many replicated instances are created.