You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2014/11/24 19:26:01 UTC

[05/13] git commit: updated refs/heads/4.3 to 15ded4f

CLOUDSTACK-6859:Management Server PermGen run out of memory after some
time due to class leak.

(cherry picked from commit 25580c7cd1a484feba1960612c9a4ae1a179cbff)
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>

Conflicts:
	framework/ipc/src/org/apache/cloudstack/framework/async/AsyncCallbackDispatcher.java


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4e3ac55a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4e3ac55a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4e3ac55a

Branch: refs/heads/4.3
Commit: 4e3ac55a0e6937323cf83e6005083f6615eb3bff
Parents: 122332b
Author: Min Chen <mi...@citrix.com>
Authored: Fri Jun 6 23:44:30 2014 -0700
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Nov 24 21:13:14 2014 +0530

----------------------------------------------------------------------
 .../async/AsyncCallbackDispatcher.java          | 114 +++++++++++--------
 1 file changed, 67 insertions(+), 47 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4e3ac55a/framework/ipc/src/org/apache/cloudstack/framework/async/AsyncCallbackDispatcher.java
----------------------------------------------------------------------
diff --git a/framework/ipc/src/org/apache/cloudstack/framework/async/AsyncCallbackDispatcher.java b/framework/ipc/src/org/apache/cloudstack/framework/async/AsyncCallbackDispatcher.java
index 42cd8c5..73bb314 100644
--- a/framework/ipc/src/org/apache/cloudstack/framework/async/AsyncCallbackDispatcher.java
+++ b/framework/ipc/src/org/apache/cloudstack/framework/async/AsyncCallbackDispatcher.java
@@ -21,10 +21,11 @@ package org.apache.cloudstack.framework.async;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.Map;
 
-import net.sf.cglib.proxy.Callback;
-import net.sf.cglib.proxy.CallbackFilter;
 import net.sf.cglib.proxy.Enhancer;
+import net.sf.cglib.proxy.Factory;
 import net.sf.cglib.proxy.MethodInterceptor;
 import net.sf.cglib.proxy.MethodProxy;
 
@@ -35,53 +36,72 @@ public class AsyncCallbackDispatcher<T, R> implements AsyncCompletionCallback {
     private static final Logger s_logger = Logger.getLogger(AsyncCallbackDispatcher.class);
 
     private Method _callbackMethod;
-	private final T _targetObject;
-	private Object _contextObject;
-	private Object _resultObject;
-	private AsyncCallbackDriver _driver = new InplaceAsyncCallbackDriver();
-
-	private AsyncCallbackDispatcher(T target) {
-		assert(target != null);
-		_targetObject = target;
-	}
-
-	public AsyncCallbackDispatcher<T, R> attachDriver(AsyncCallbackDriver driver) {
-		assert(driver != null);
-		_driver = driver;
-
-		return this;
-	}
-
-	public Method getCallbackMethod() {
-		return _callbackMethod;
-	}
-
-	@SuppressWarnings("unchecked")
-	public T getTarget() {
-	    Enhancer en = new Enhancer();
-
-	    Class<?> clz = _targetObject.getClass();
-	    String clzName = clz.getName();
-	    if(clzName.contains("EnhancerByCloudStack"))
-	        clz = clz.getSuperclass();
-
-	    en.setSuperclass(clz);
-	    en.setCallbacks(new Callback[]{new MethodInterceptor() {
-            @Override
-            public Object intercept(Object arg0, Method arg1, Object[] arg2,
-                MethodProxy arg3) throws Throwable {
-                _callbackMethod = arg1;
-                _callbackMethod.setAccessible(true);
-                return null;
-            }
-        },
-        new MethodInterceptor() {
-            @Override
-            public Object intercept(Object arg0, Method arg1, Object[] arg2,
-                MethodProxy arg3) throws Throwable {
-                return null;
+    private final T _targetObject;
+    private Object _contextObject;
+    private Object _resultObject;
+    private AsyncCallbackDriver _driver = new InplaceAsyncCallbackDriver();
+    private static Map<Class, Enhancer> enMap = new HashMap<Class, Enhancer>();
+
+    private AsyncCallbackDispatcher(T target) {
+        assert (target != null);
+        _targetObject = target;
+    }
+
+    public AsyncCallbackDispatcher<T, R> attachDriver(AsyncCallbackDriver driver) {
+        assert (driver != null);
+        _driver = driver;
+
+        return this;
+    }
+
+    public Method getCallbackMethod() {
+        return _callbackMethod;
+    }
+
+    @SuppressWarnings("unchecked")
+    public T getTarget() {
+        Class<?> clz = _targetObject.getClass();
+        String clzName = clz.getName();
+        if (clzName.contains("EnhancerByCloudStack"))
+            clz = clz.getSuperclass();
+
+
+        Enhancer en = null;
+        synchronized (enMap) {
+            en = enMap.get(clz);
+            if (en == null) {
+                en = new Enhancer();
+
+                en.setSuperclass(clz);
+                en.setCallback(new MethodInterceptor() {
+                    @Override
+                    public Object intercept(Object arg0, Method arg1, Object[] arg2, MethodProxy arg3) throws Throwable {
+                        return null;
+                        }
+                    });
+                enMap.put(clz, en);
             }
         }
+
+        try {
+            T t = (T)en.create();
+            Factory factory = (Factory)t;
+            factory.setCallback(0, new MethodInterceptor() {
+                @Override
+                public Object intercept(Object arg0, Method arg1, Object[] arg2, MethodProxy arg3) throws Throwable {
+                    if (arg1.getParameterTypes().length == 0 && arg1.getName().equals("finalize")) {
+                        return null;
+                    } else {
+                        _callbackMethod = arg1;
+                        _callbackMethod.setAccessible(true);
+                        return null;
+                    }
+                }
+            });
+            return t;
+        } catch (Throwable e) {
+            s_logger.error("Unexpected exception", e);
+        }
 	    });
 	    en.setCallbackFilter(new CallbackFilter() {
 	        @Override