Revision: 16290
Author: oleg.kulikoff
Date: Sun Jan  9 03:46:44 2011
Log: Cancel request when connection is detected
http://code.google.com/p/mobicents/source/detail?r=16290

Modified:
/trunk/servers/media/core/controllers/mgcp/src/main/java/org/mobicents/media/server/ctrl/mgcp/ConnectionActivity.java /trunk/servers/media/core/controllers/mgcp/src/main/java/org/mobicents/media/server/ctrl/mgcp/CreateConnectionAction.java /trunk/servers/media/core/controllers/mgcp/src/main/java/org/mobicents/media/server/ctrl/mgcp/DeleteConnectionAction.java /trunk/servers/media/core/controllers/mgcp/src/main/java/org/mobicents/media/server/ctrl/mgcp/EndpointActivity.java /trunk/servers/media/core/controllers/mgcp/src/main/java/org/mobicents/media/server/ctrl/mgcp/MgcpController.java /trunk/servers/media/core/controllers/mgcp/src/main/java/org/mobicents/media/server/ctrl/mgcp/pkg/au/Play.java /trunk/servers/media/core/controllers/mgcp/src/main/java/org/mobicents/media/server/ctrl/mgcp/pkg/au/PlayCollect.java /trunk/servers/media/core/controllers/mgcp/src/main/java/org/mobicents/media/server/ctrl/mgcp/signal/RequestExecutor.java /trunk/servers/media/core/controllers/mgcp/src/main/java/org/mobicents/media/server/ctrl/mgcp/signal/RequestExecutors.java

=======================================
--- /trunk/servers/media/core/controllers/mgcp/src/main/java/org/mobicents/media/server/ctrl/mgcp/ConnectionActivity.java Sat Jan 8 01:33:59 2011 +++ /trunk/servers/media/core/controllers/mgcp/src/main/java/org/mobicents/media/server/ctrl/mgcp/ConnectionActivity.java Sun Jan 9 03:46:44 2011
@@ -65,14 +65,14 @@

         parent.calls.get(callID).connections.put(id, this);
parent.endpoints.get(endpointID.getLocalEndpointName()).connections.put(id, this); - logger.info(String.format("Created activity call=%s, endpoint=%s, connection=%s",
-                callID, endpointID.getLocalEndpointName(), id));
+// logger.info(String.format("Created activity call=%s, endpoint=%s, connection=%s",
+//                callID, endpointID.getLocalEndpointName(), id));
     }

     public void attach(Connection connection) {
         this.connection = connection;
         this.connection.addListener(this);
- logger.info(String.format("Created relation between %s and %s", id, connection.getId())); +// logger.info(String.format("Created relation between %s and %s", id, connection.getId()));
     }

     public String getID() {
@@ -133,14 +133,14 @@
         parent.calls.get(callID).connections.remove(id);
parent.endpoints.get(endpointID.getLocalEndpointName()).connections.remove(id);

-        if (connection != null) {
+/*        if (connection != null) {
logger.info(String.format("Terminated activity call=%s, endpoint=%s, connection=%s, origin=%s", callID, endpointID.getLocalEndpointName(), id, connection.getId()));
         } else {
logger.info(String.format("Terminated activity call=%s, endpoint=%s, connection=%s, origin=%s", callID, endpointID.getLocalEndpointName(), id, "null"));
         }
-
+*/
         if (this.connection != null) {
             connection.removeListener(this);
             connection = null;
=======================================
--- /trunk/servers/media/core/controllers/mgcp/src/main/java/org/mobicents/media/server/ctrl/mgcp/CreateConnectionAction.java Sat Jan 8 01:33:59 2011 +++ /trunk/servers/media/core/controllers/mgcp/src/main/java/org/mobicents/media/server/ctrl/mgcp/CreateConnectionAction.java Sun Jan 9 03:46:44 2011
@@ -71,7 +71,7 @@
      *         connection
      */
private JainMgcpResponseEvent createRtpConnection(CreateConnection crcx) {
-        controller.crcxReqCount+=1;
+//        controller.crcxReqCount+=1;
         String callID = crcx.getCallIdentifier().toString();
         // reading connection mode
         ConnectionMode mode = utils.getMode(crcx.getMode());
@@ -140,12 +140,12 @@
         response.setTransactionHandle(crcx.getTransactionHandle());


-        controller.crcxCount++;
+//        controller.crcxCount++;
         return response;
     }

     private JainMgcpResponseEvent createLink(CreateConnection crcx) {
-        controller.crcxReqCount+=2;
+//        controller.crcxReqCount+=2;
         String callID = crcx.getCallIdentifier().toString();
         // reading connection mode
         ConnectionMode mode = utils.getMode(crcx.getMode());
@@ -248,7 +248,7 @@
         response.setTransactionHandle(crcx.getTransactionHandle());


-        controller.crcxCount+=2;
+//        controller.crcxCount+=2;
         return response;
     }

=======================================
--- /trunk/servers/media/core/controllers/mgcp/src/main/java/org/mobicents/media/server/ctrl/mgcp/DeleteConnectionAction.java Sat Jan 8 01:33:59 2011 +++ /trunk/servers/media/core/controllers/mgcp/src/main/java/org/mobicents/media/server/ctrl/mgcp/DeleteConnectionAction.java Sun Jan 9 03:46:44 2011
@@ -103,11 +103,12 @@
DeleteConnectionResponse response = new DeleteConnectionResponse(controller, ReturnCode.Transaction_Executed_Normally);
         response.setConnectionParms(parms);

+        endpointActivity.terminate();
         return response;
     }

     public JainMgcpResponseEvent call() throws Exception {
-        controller.dlcxReqCount++;
+//        controller.dlcxReqCount++;
logger.info(String.format("Request: tx=%d call=%s, endpoint=%s, connection=%s", req.getTransactionHandle(), req.getCallIdentifier(), req.getEndpointIdentifier(), req.getConnectionIdentifier()));

@@ -124,7 +125,7 @@
             response = this.endpointDeleteConnections(endpointID);
} else if (endpointID != null && callID != null && connectionID != null) { response = this.deleteConnection(endpointID, connectionID.toString());
-                controller.dlcxCount++;
+//                controller.dlcxCount++;
         } else {
                //This is error condition
response = new DeleteConnectionResponse(controller, ReturnCode.Protocol_Error);
=======================================
--- /trunk/servers/media/core/controllers/mgcp/src/main/java/org/mobicents/media/server/ctrl/mgcp/EndpointActivity.java Sat Jan 8 01:33:59 2011 +++ /trunk/servers/media/core/controllers/mgcp/src/main/java/org/mobicents/media/server/ctrl/mgcp/EndpointActivity.java Sun Jan 9 03:46:44 2011
@@ -66,7 +66,6 @@
         this.controller = controller;
         this.requestExecutor = controller.getRequestExecutor();
         this.requestExecutor.setDispatcher(this);
- logger.info("Assign activity " + endpoint.getLocalName() + " for " + requestExecutor);
     }

     public void attach(Endpoint endpoint) {
@@ -85,7 +84,6 @@
     }

     public void onEvent(EventName event) {
-        logger.info("Receive event, activity=" + endpoint.getLocalName());
Notify notify = new Notify(this, endpointID, requestID, new EventName[]{event});
         notify.setNotifiedEntity(callAgent);
         notify.setTransactionHandle(controller.nextID());
@@ -95,8 +93,10 @@
     }

     public void completed() {
+ logger.info("Recycling request executor: " + endpoint.getLocalName());
         requestExecutor.cancel();
         requestExecutor.recycle();
+        this.requestExecutor = null;
     }

     public Endpoint getEndpoint() {
@@ -121,8 +121,11 @@

     public void terminate() {
         if (requestExecutor != null) {
+ logger.info("Recycling request executor: " + endpoint.getLocalName());
             requestExecutor.cancel();
-        }
+            requestExecutor.recycle();
+        }
+

// ConnectionActivity[] list = new ConnectionActivity[connections.size()];
 //        connections.values().toArray(list);
=======================================
--- /trunk/servers/media/core/controllers/mgcp/src/main/java/org/mobicents/media/server/ctrl/mgcp/MgcpController.java Sat Jan 8 01:33:59 2011 +++ /trunk/servers/media/core/controllers/mgcp/src/main/java/org/mobicents/media/server/ctrl/mgcp/MgcpController.java Sun Jan 9 03:46:44 2011
@@ -80,12 +80,12 @@
     protected Activities activities;
private static final Logger logger = Logger.getLogger(MgcpController.class);

-    protected int crcxCount;
+/*    protected int crcxCount;
     protected int dlcxCount;

     protected int crcxReqCount;
     protected int dlcxReqCount;
-
+*/
     public MgcpController() {
         activities = new Activities(this);
     }
@@ -260,7 +260,7 @@
         try {
             JainMgcpResponseEvent response = action.call();
             mgcpProvider.sendMgcpEvents(new JainMgcpEvent[]{response});
- logger.info(String.format("Created %d (expected %d), Deleted %s (expected %d)", crcxCount, crcxReqCount, dlcxCount, dlcxReqCount)); +// logger.info(String.format("Created %d (expected %d), Deleted %s (expected %d)", crcxCount, crcxReqCount, dlcxCount, dlcxReqCount));
         } catch (Exception e) {
             if (logger.isEnabledFor(Level.ERROR)) {
logger.error("Unexpected error during processing,Caused by ", e);
=======================================
--- /trunk/servers/media/core/controllers/mgcp/src/main/java/org/mobicents/media/server/ctrl/mgcp/pkg/au/Play.java Sat Jan 8 09:56:40 2011 +++ /trunk/servers/media/core/controllers/mgcp/src/main/java/org/mobicents/media/server/ctrl/mgcp/pkg/au/Play.java Sun Jan 9 03:46:44 2011
@@ -209,10 +209,12 @@
                     return;
                 }

+                player.removeListener(this);
                 this.sendEvent(oc);
                 this.complete();
                 break;
             case PlayerEvent.FAILED :
+                player.removeListener(this);
                 this.sendEvent(of);
                 this.complete();
         }
=======================================
--- /trunk/servers/media/core/controllers/mgcp/src/main/java/org/mobicents/media/server/ctrl/mgcp/pkg/au/PlayCollect.java Sat Jan 8 09:56:40 2011 +++ /trunk/servers/media/core/controllers/mgcp/src/main/java/org/mobicents/media/server/ctrl/mgcp/pkg/au/PlayCollect.java Sun Jan 9 03:46:44 2011
@@ -165,7 +165,6 @@
String connectionID = getTrigger().getConnectionIdentifier().toString();
         Connection connection = getConnection(connectionID);

-        logger.info("Connection = " + connection);
         if (connection == null) {
             return null;
         }
@@ -187,7 +186,6 @@
String connectionID = getTrigger().getConnectionIdentifier().toString();
         Connection connection = getConnection(connectionID);

-        logger.info("Connection = " + connection);
         if (connection == null) {
             return null;
         }
=======================================
--- /trunk/servers/media/core/controllers/mgcp/src/main/java/org/mobicents/media/server/ctrl/mgcp/signal/RequestExecutor.java Sat Jan 8 21:49:18 2011 +++ /trunk/servers/media/core/controllers/mgcp/src/main/java/org/mobicents/media/server/ctrl/mgcp/signal/RequestExecutor.java Sun Jan 9 03:46:44 2011
@@ -21,6 +21,7 @@
 import jain.protocol.ip.mgcp.message.parms.EventName;
 import jain.protocol.ip.mgcp.message.parms.RequestedEvent;
 import javolution.util.FastList;
+import org.apache.log4j.Logger;
 import org.mobicents.media.server.ctrl.mgcp.UnknownActivityException;
 import org.mobicents.media.server.spi.Connection;
 import org.mobicents.media.server.spi.Endpoint;
@@ -55,7 +56,7 @@
     private Signal currentSignal;

     private Dispatcher dispatcher;
-
+    private Logger logger = Logger.getLogger(RequestExecutor.class);
     /**
      * Constructs executor.
      *
@@ -207,6 +208,7 @@

     public void completed() {
         //if no more signals notify dispatcher
+        logger.info("Completed signal, remainder = " + signals.size());
         if (signals.isEmpty()) {
             if (this.dispatcher != null) {
                 dispatcher.completed();
=======================================
--- /trunk/servers/media/core/controllers/mgcp/src/main/java/org/mobicents/media/server/ctrl/mgcp/signal/RequestExecutors.java Sat Jan 8 21:49:18 2011 +++ /trunk/servers/media/core/controllers/mgcp/src/main/java/org/mobicents/media/server/ctrl/mgcp/signal/RequestExecutors.java Sun Jan 9 03:46:44 2011
@@ -19,6 +19,7 @@
 package org.mobicents.media.server.ctrl.mgcp.signal;

 import javolution.util.FastList;
+import org.apache.log4j.Logger;

 /**
  * Pool of Request executors.
@@ -30,6 +31,7 @@
     private FastList<RequestExecutor> pool = new FastList();
     private final MgcpPackages packages = new MgcpPackages();

+    private Logger logger = Logger.getLogger(RequestExecutors.class);
     /**
      * Creates new instance of this pool and pre-loads it.
      *
@@ -52,6 +54,7 @@
             return re;
         }

+        logger.warn("Pool is empty, increasing size");
         RequestExecutor re = new RequestExecutor(this, packages.loadAll());
         return re;
     }

Reply via email to