Revision: 16441
Author: brainslog
Date: Fri Jan 14 14:28:45 2011
Log: Diameter Activities fetching/creation optimizations
http://code.google.com/p/mobicents/source/detail?r=16441

Modified:
/trunk/servers/jain-slee/resources/diameter-base/common/ra/src/main/java/org/mobicents/slee/resource/diameter/LocalDiameterActivityManagement.java /trunk/servers/jain-slee/resources/diameter-base/ra/src/main/java/org/mobicents/slee/resource/diameter/base/DiameterBaseResourceAdaptor.java /trunk/servers/jain-slee/resources/diameter-cx-dx/ra/src/main/java/org/mobicents/slee/resource/diameter/cxdx/DiameterCxDxResourceAdaptor.java /trunk/servers/jain-slee/resources/diameter-gx/ra/src/main/java/org/mobicents/slee/resource/diameter/gx/DiameterGxResourceAdaptor.java /trunk/servers/jain-slee/resources/diameter-rf/ra/src/main/java/org/mobicents/slee/resource/diameter/rf/DiameterRfResourceAdaptor.java /trunk/servers/jain-slee/resources/diameter-ro/ra/src/main/java/org/mobicents/slee/resource/diameter/ro/DiameterRoResourceAdaptor.java /trunk/servers/jain-slee/resources/diameter-sh-client/ra/src/main/java/org/mobicents/slee/resource/diameter/sh/client/DiameterShClientResourceAdaptor.java

=======================================
--- /trunk/servers/jain-slee/resources/diameter-base/common/ra/src/main/java/org/mobicents/slee/resource/diameter/LocalDiameterActivityManagement.java Tue Aug 24 10:55:37 2010 +++ /trunk/servers/jain-slee/resources/diameter-base/common/ra/src/main/java/org/mobicents/slee/resource/diameter/LocalDiameterActivityManagement.java Fri Jan 14 14:28:45 2011
@@ -42,11 +42,10 @@
   }

public void put(DiameterActivityHandle handle, DiameterActivity activity) {
-    // JIC check
-    if(this.activities.containsKey(handle)) {
- throw new IllegalArgumentException("There is already activity for: "+handle+" -- "+this.activities.get(handle));
-    }
-    this.activities.put(handle, activity);
+ DiameterActivity existingActivity = this.activities.putIfAbsent(handle, activity);
+    if(existingActivity != null) {
+ throw new IllegalArgumentException("There is already activity for '" + handle + "': " + existingActivity);
+    }
   }

   public DiameterActivity remove(DiameterActivityHandle handle) {
=======================================
--- /trunk/servers/jain-slee/resources/diameter-base/ra/src/main/java/org/mobicents/slee/resource/diameter/base/DiameterBaseResourceAdaptor.java Fri Jan 14 12:45:06 2011 +++ /trunk/servers/jain-slee/resources/diameter-base/ra/src/main/java/org/mobicents/slee/resource/diameter/base/DiameterBaseResourceAdaptor.java Fri Jan 14 14:28:45 2011
@@ -1269,13 +1269,9 @@
      * @return
      */
DiameterActivity createActivity(Message message) throws CreateActivityException {
-      String sessionId = message.getSessionId();
-      DiameterActivityHandle handle = getActivityHandle(sessionId);
-
-      if (activities.containsKey(handle)) {
-        return activities.get(handle);
-      }
-      else {
+ DiameterActivity activity = activities.get(getActivityHandle(message.getSessionId()));
+
+      if(activity == null) {
         DiameterIdentity destinationHost = null;
         DiameterIdentity destinationRealm = null;

@@ -1311,6 +1307,8 @@
return this.createActivity(destinationHost, destinationRealm, message.getSessionId());
         }
       }
+
+      return activity;
     }

     /*
@@ -1349,11 +1347,10 @@
           String sessionId = message.getSessionId();
           DiameterActivityHandle handle = getActivityHandle(sessionId);

-          if (!activities.containsKey(handle)) {
-            createActivity(msg.getGenericData());
-          }
-
DiameterActivityImpl activity = (DiameterActivityImpl) getActivity(handle);
+          if (activity == null) {
+ activity = (DiameterActivityImpl) createActivity(msg.getGenericData());
+          }

           return activity.sendSyncMessage(message);
         }
=======================================
--- /trunk/servers/jain-slee/resources/diameter-cx-dx/ra/src/main/java/org/mobicents/slee/resource/diameter/cxdx/DiameterCxDxResourceAdaptor.java Fri Jan 14 12:45:06 2011 +++ /trunk/servers/jain-slee/resources/diameter-cx-dx/ra/src/main/java/org/mobicents/slee/resource/diameter/cxdx/DiameterCxDxResourceAdaptor.java Fri Jan 14 14:28:45 2011
@@ -935,13 +935,8 @@
     }

private DiameterActivity createActivity(Message message) throws CreateActivityException {
-      String sessionId = message.getSessionId();
- DiameterActivityHandle handle = new DiameterActivityHandle(sessionId);
-
-      if (activities.containsKey(handle)) {
-        return activities.get(handle);
-      }
-      else {
+ DiameterActivity activity = activities.get(getActivityHandle(message.getSessionId()));
+      if(activity == null) {
         if (message.isRequest()) {
if(message.getCommandCode() == PushProfileRequest.COMMAND_CODE | | message.getCommandCode() == RegistrationTerminationRequest.COMMAND_CODE) {
             return createCxDxClientSessionActivity((Request) message);
@@ -952,9 +947,10 @@
         }
         else {
throw new IllegalStateException("Got answer, there should already be activity.");
-
         }
       }
+
+      return activity;
     }

private DiameterActivity createCxDxServerSessionActivity(Request request) throws CreateActivityException {
=======================================
--- /trunk/servers/jain-slee/resources/diameter-gx/ra/src/main/java/org/mobicents/slee/resource/diameter/gx/DiameterGxResourceAdaptor.java Mon Dec 20 19:10:40 2010 +++ /trunk/servers/jain-slee/resources/diameter-gx/ra/src/main/java/org/mobicents/slee/resource/diameter/gx/DiameterGxResourceAdaptor.java Fri Jan 14 14:28:45 2011
@@ -864,7 +864,7 @@
     }

     public boolean sessionExists(final String sessionId) {
- return this.activities.containsKey(new DiameterActivityHandle(sessionId));
+        return this.activities.containsKey(getActivityHandle(sessionId));
     }

public void sessionDestroyed(final String sessionId, final Object appSession) {
@@ -921,14 +921,11 @@

public GxCreditControlAnswer sendGxCreditControlRequest(final GxCreditControlRequest ccr) throws IOException {
             try {
-                final String sessionId = ccr.getSessionId();
- final DiameterActivityHandle handle = new DiameterActivityHandle(sessionId);
-
-                if (!activities.containsKey(handle)) {
- createActivity(((DiameterMessageImpl) ccr).getGenericData());
-                }
-
- final DiameterActivityImpl activity = (DiameterActivityImpl) getActivity(handle); + DiameterActivityImpl activity = (DiameterActivityImpl) getActivity(getActivityHandle(ccr.getSessionId()));
+
+                if (activity == null) {
+ activity = (DiameterActivityImpl) createActivity(((DiameterMessageImpl) ccr).getGenericData());
+                }

return (GxCreditControlAnswer) activity.sendSyncMessage(ccr);
             } catch (Exception e) {
@@ -940,12 +937,8 @@
         }

private DiameterActivity createActivity(final Message message) throws CreateActivityException {
-            final String sessionId = message.getSessionId();
- final DiameterActivityHandle handle = new DiameterActivityHandle(sessionId);
-
-            if (activities.containsKey(handle)) {
-                return activities.get(handle);
-            } else {
+ DiameterActivity activity = activities.get(getActivityHandle(message.getSessionId()));
+            if (activity == null) {
                 if (message.isRequest()) {
return createGxServerSessionActivity((Request) message);
                 } else {
@@ -974,6 +967,8 @@
return (DiameterActivity) createGxClientSessionActivity(destinationHost, destinationRealm);
                 }
             }
+
+            return activity;
         }

private DiameterActivity createGxServerSessionActivity(final Request message) throws CreateActivityException {
=======================================
--- /trunk/servers/jain-slee/resources/diameter-rf/ra/src/main/java/org/mobicents/slee/resource/diameter/rf/DiameterRfResourceAdaptor.java Fri Nov 26 09:05:04 2010 +++ /trunk/servers/jain-slee/resources/diameter-rf/ra/src/main/java/org/mobicents/slee/resource/diameter/rf/DiameterRfResourceAdaptor.java Fri Jan 14 14:28:45 2011
@@ -905,13 +905,9 @@
     }

private DiameterActivity createActivity(Message message) throws CreateActivityException {
-      String sessionId = message.getSessionId();
- DiameterActivityHandle handle = new DiameterActivityHandle(sessionId);
-
-      if (activities.containsKey(handle)) {
-        return activities.get(handle);
-      }
-      else {
+ DiameterActivity activity = activities.get(getActivityHandle(message.getSessionId()));
+
+      if (activity == null) {
         if (message.isRequest()) {
           return createRfServerSessionActivity((Request) message);
         }
@@ -943,6 +939,8 @@
return createRfClientSessionActivity(destinationHost, destinationRealm);
         }
       }
+
+      return activity;
     }

private DiameterActivity createRfServerSessionActivity(Request request) throws CreateActivityException {
@@ -997,14 +995,11 @@

public RfAccountingAnswer sendRfAccountingRequest(RfAccountingRequest accountingRequest) {
       try {
-        String sessionId = accountingRequest.getSessionId();
- DiameterActivityHandle handle = new DiameterActivityHandle(sessionId);
-
-        if (!activities.containsKey(handle)) {
- createActivity(((DiameterMessageImpl)accountingRequest).getGenericData());
-        }
-
- DiameterActivityImpl activity = (DiameterActivityImpl) getActivity(handle); + DiameterActivityImpl activity = (DiameterActivityImpl) getActivity(getActivityHandle(accountingRequest.getSessionId()));
+
+        if (activity == null) {
+ activity = (DiameterActivityImpl) createActivity(((DiameterMessageImpl)accountingRequest).getGenericData());
+        }

return (RfAccountingAnswer) activity.sendSyncMessage(accountingRequest);
       }
=======================================
--- /trunk/servers/jain-slee/resources/diameter-ro/ra/src/main/java/org/mobicents/slee/resource/diameter/ro/DiameterRoResourceAdaptor.java Fri Nov 26 09:05:04 2010 +++ /trunk/servers/jain-slee/resources/diameter-ro/ra/src/main/java/org/mobicents/slee/resource/diameter/ro/DiameterRoResourceAdaptor.java Fri Jan 14 14:28:45 2011
@@ -958,7 +958,7 @@
   }

   public boolean sessionExists(String sessionId) {
- return this.activities.containsKey(new DiameterActivityHandle(sessionId));
+    return this.activities.containsKey(getActivityHandle(sessionId));
   }

   public void sessionDestroyed(String sessionId, Object appSession) {
@@ -1035,14 +1035,11 @@

public RoCreditControlAnswer sendRoCreditControlRequest(RoCreditControlRequest ccr) throws IOException {
       try {
-        String sessionId = ccr.getSessionId();
- DiameterActivityHandle handle = new DiameterActivityHandle(sessionId);
-
-        if (!activities.containsKey(handle)) {
-          createActivity(((DiameterMessageImpl)ccr).getGenericData());
-        }
-
- DiameterActivityImpl activity = (DiameterActivityImpl) getActivity(handle); + DiameterActivityImpl activity = (DiameterActivityImpl) getActivity(getActivityHandle(ccr.getSessionId()));
+
+        if (activity == null) {
+ activity = (DiameterActivityImpl) createActivity(((DiameterMessageImpl)ccr).getGenericData());
+        }

         return (RoCreditControlAnswer) activity.sendSyncMessage(ccr);
       }
@@ -1056,13 +1053,9 @@


private DiameterActivity createActivity(Message message) throws CreateActivityException {
-      String sessionId = message.getSessionId();
- DiameterActivityHandle handle = new DiameterActivityHandle(sessionId);
-
-      if (activities.containsKey(handle)) {
-        return activities.get(handle);
-      }
-      else {
+ DiameterActivity activity = activities.get(getActivityHandle(message.getSessionId()));
+
+      if (activity == null) {
         if (message.isRequest()) {
           return createRoServerSessionActivity((Request) message);
         }
@@ -1094,6 +1087,8 @@
return (DiameterActivity) createRoClientSessionActivity(destinationHost, destinationRealm);
         }
       }
+
+      return activity;
     }

private DiameterActivity createRoServerSessionActivity(Request message) throws CreateActivityException {
=======================================
--- /trunk/servers/jain-slee/resources/diameter-sh-client/ra/src/main/java/org/mobicents/slee/resource/diameter/sh/client/DiameterShClientResourceAdaptor.java Fri Jan 14 12:45:06 2011 +++ /trunk/servers/jain-slee/resources/diameter-sh-client/ra/src/main/java/org/mobicents/slee/resource/diameter/sh/client/DiameterShClientResourceAdaptor.java Fri Jan 14 14:28:45 2011
@@ -1030,22 +1030,18 @@
      * @return
      */
DiameterActivity createActivity(Message message) throws CreateActivityException {
-      String sessionId = message.getSessionId();
-      DiameterActivityHandle handle = getActivityHandle(sessionId);
-
-      if (activities.containsKey(handle)) {
-        return activities.get(handle);
-      }
-      else {
+ DiameterActivity activity = activities.get(getActivityHandle(message.getSessionId()));
+
+      if (activity == null) {
//FIXME: baranowb: here we can receive only (valid) PNR, other message are errors? if(message.getCommandCode() != PushNotificationRequestImpl.commandCode) { throw new CreateActivityException("Cant create activity for unexpected message:\r\n" + message);
         }

- ShClientSubscriptionActivityImpl activity = (ShClientSubscriptionActivityImpl) this.createShClientSubscriptionActivity(new PushNotificationRequestImpl( message));
-
-        return activity;
-      }
+ return (ShClientSubscriptionActivityImpl) this.createShClientSubscriptionActivity(new PushNotificationRequestImpl( message));
+      }
+
+      return activity;
     }

private ShClientSubscriptionActivity createShClientSubscriptionActivity(net.java.slee.resource.diameter.sh.events.PushNotificationRequest pushNotificationRequest) {

Reply via email to