You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by de...@apache.org on 2015/01/07 21:43:52 UTC
svn commit: r1650153 - in
/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi:
ActionAckRedux.java ActionGetRedux.java ActionInProgress.java WiFsm.java
Author: degenaro
Date: Wed Jan 7 20:43:51 2015
New Revision: 1650153
URL: http://svn.apache.org/r1650153
Log: (empty)
Added:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionAckRedux.java (with props)
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionGetRedux.java
- copied, changed from r1649955, uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionInProgress.java
Removed:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionInProgress.java
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/WiFsm.java
Added: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionAckRedux.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionAckRedux.java?rev=1650153&view=auto
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionAckRedux.java (added)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionAckRedux.java Wed Jan 7 20:43:51 2015
@@ -0,0 +1,23 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+*/
+package org.apache.uima.ducc.container.jd.fsm.wi;
+
+public class ActionAckRedux extends ActionAck {
+
+}
Propchange: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionAckRedux.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionAckRedux.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionGetRedux.java (from r1649955, uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionInProgress.java)
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionGetRedux.java?p2=uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionGetRedux.java&p1=uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionInProgress.java&r1=1649955&r2=1650153&rev=1650153&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionInProgress.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionGetRedux.java Wed Jan 7 20:43:51 2015
@@ -22,6 +22,8 @@ import java.util.concurrent.ConcurrentHa
import org.apache.uima.ducc.container.common.MessageBuffer;
import org.apache.uima.ducc.container.common.fsm.iface.IAction;
+import org.apache.uima.ducc.container.common.fsm.iface.IEvent;
+import org.apache.uima.ducc.container.common.fsm.iface.IFsm;
import org.apache.uima.ducc.container.common.logger.IComponent;
import org.apache.uima.ducc.container.common.logger.ILogger;
import org.apache.uima.ducc.container.common.logger.Logger;
@@ -31,13 +33,13 @@ import org.apache.uima.ducc.container.jd
import org.apache.uima.ducc.container.jd.wi.IWorkItem;
import org.apache.uima.ducc.container.net.iface.IMetaCas;
-public class ActionInProgress implements IAction {
+public class ActionGetRedux implements IAction {
- private static Logger logger = Logger.getLogger(ActionInProgress.class, IComponent.Id.JD.name());
+ private static Logger logger = Logger.getLogger(ActionGetRedux.class, IComponent.Id.JD.name());
@Override
public String getName() {
- return ActionInProgress.class.getName();
+ return ActionGetRedux.class.getName();
}
@Override
@@ -49,9 +51,12 @@ public class ActionInProgress implements
IRemoteWorkerThread rwt = actionData.getRemoteWorkerThread();
ConcurrentHashMap<IRemoteWorkerThread, IWorkItem> map = JobDriver.getInstance().getRemoteThreadMap();
IWorkItem wi = map.get(rwt);
+ IFsm fsm = wi.getFsm();
+ IEvent event = WiFsm.CAS_Unavailable;
if(wi != null) {
IMetaCas metaCas = wi.getMetaCas();
if(metaCas != null) {
+ event = WiFsm.CAS_Available;
MessageBuffer mb = LoggerHelper.getMessageBuffer(actionData);
logger.debug(location, ILogger.null_id, mb.toString());
actionData.getWorkItem().setMetaCas(metaCas);
@@ -62,6 +67,8 @@ public class ActionInProgress implements
logger.info(location, ILogger.null_id, mb.toString());
}
}
+ //
+ fsm.transition(event, actionData);
}
catch(Exception e) {
logger.error(location, ILogger.null_id, e);
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/WiFsm.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/WiFsm.java?rev=1650153&r1=1650152&r2=1650153&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/WiFsm.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/WiFsm.java Wed Jan 7 20:43:51 2015
@@ -57,11 +57,12 @@ public class WiFsm extends Fsm {
public static IEvent Process_Preempt = new Event("Process_Premept");
public IAction ActionGet = new ActionGet();
+ public IAction ActionGetRedux = new ActionGetRedux();
public IAction ActionSend = new ActionSend();
public IAction ActionAck = new ActionAck();
+ public IAction ActionAckRedux = new ActionAckRedux();
public IAction ActionEnd = new ActionEnd();
- public IAction ActionInProgress = new ActionInProgress();
public IAction ActionProcessFailure = new ActionProcessFailure();
public IAction ActionProcessPreempt = new ActionProcessPreempt();
@@ -102,7 +103,7 @@ public class WiFsm extends Fsm {
add(Start, Ack_Timer_Pop, ActionIgnore, Start);
add(Start, End_Timer_Pop, ActionIgnore, Start);
- add(Get_Pending, Get_Request, ActionInProgress, Get_Pending);
+ add(Get_Pending, Get_Request, ActionGetRedux, Get_Pending);
add(Get_Pending, CAS_Available, ActionSend, CAS_Send);
add(Get_Pending, CAS_Unavailable, ActionIgnore, Start);
add(Get_Pending, Ack_Request, ActionError, Get_Pending);
@@ -112,7 +113,7 @@ public class WiFsm extends Fsm {
add(Get_Pending, Ack_Timer_Pop, ActionIgnore, Get_Pending);
add(Get_Pending, End_Timer_Pop, ActionIgnore, Get_Pending);
- add(CAS_Send, Get_Request, ActionInProgress, CAS_Send);
+ add(CAS_Send, Get_Request, ActionGetRedux, Get_Pending);
add(CAS_Send, CAS_Available, ActionIgnore, CAS_Send);
add(CAS_Send, CAS_Unavailable, ActionIgnore, CAS_Send);
add(CAS_Send, Ack_Request, ActionAck, CAS_Active);
@@ -122,10 +123,10 @@ public class WiFsm extends Fsm {
add(CAS_Send, Ack_Timer_Pop, ActionAckTimeout, Start);
add(CAS_Send, End_Timer_Pop, ActionIgnore, CAS_Send);
- add(CAS_Active, Get_Request, ActionError, CAS_Active);
+ add(CAS_Active, Get_Request, ActionGetRedux, Get_Pending);
add(CAS_Active, CAS_Available, ActionIgnore, CAS_Active);
add(CAS_Active, CAS_Unavailable, ActionIgnore, CAS_Active);
- add(CAS_Active, Ack_Request, ActionError, CAS_Active);
+ add(CAS_Active, Ack_Request, ActionAckRedux, CAS_Active);
add(CAS_Active, End_Request, ActionEnd, Start);
add(CAS_Active, Process_Preempt, ActionProcessPreempt, Start);
add(CAS_Active, Process_Failure, ActionProcessFailure, Start);