Changeset 61186 in vbox for trunk/src/VBox/Main/webservice

Timestamp:

May 25, 2016 7:52:06 AM (9 years ago)

Author:

vboxsync

Message:

Main/webservice/python: Release the webservice server side object when the local stub is destroyed (fixes increasing memory usage with vboxwebsrv and VBoxSVC)

File:

• trunk/src/VBox/Main/webservice/websrv-python.xsl (modified) (7 diffs)

trunk/src/VBox/Main/webservice/websrv-python.xsl

@@ -175 +175 @@
        self.handle = handle
        self.isarray = isarray
-<!--
-    This doesn't work now
-       mgr.register(handle)
+       if self.isarray:
+           for strHnd in handle:
+               mgr.register(strHnd)
+       else:
+           mgr.register(self.handle)
 
    def __del__(self):
-       mgr.unregister(self.handle)
--->
+       self.releaseRemote()
+
    def releaseRemote(self):
         try:
-            req=IManagedObjectRef_releaseRequestMsg()
-            req._this=handle
-            self.mgr.getPort().IManagedObjectRef_release(req)
+            if self.handle is not None:
+               if self.isarray:
+                   for strHnd in self.handle:
+                       self.mgr.unregister(strHnd)
+               else:
+                   self.mgr.unregister(self.handle)
+               self.handle = None;
         except:
             pass
@@ -211 +217 @@
 
    def __str__(self):
-        return self.handle
+        if self.isarray:
+            return str(self.handle)
+        else:
+            return self.handle
 
    def isValid(self):
@@ -495 +504 @@
 from VirtualBox_client import *
 
-class ManagedManager:
-  def __init__(self):
+class ObjectRefManager:
+  def __init__(self, sessionmgr):
      self.map = {}
-
-  def register(self,handle):
+     self.sessionmgr = sessionmgr
+
+  def register(self, handle):
      if handle == None:
         return
@@ -506 +516 @@
      self.map[handle]=c
 
-  def unregister(self,handle):
+  def unregister(self, handle):
      if handle == None:
         return
@@ -517 +527 @@
             req=IManagedObjectRef_releaseRequestMsg()
             req._this=handle
-            self.mgr.getPort().IManagedObjectRef_release(req)
+            self.sessionmgr.getPort().IManagedObjectRef_release(req)
         except:
             pass
-        self.map[handle] = -1
+        del self.map[handle]
      else:
         self.map[handle] = c
@@ -873 +883 @@
 import base64
 
-class IWebsessionManager2(IWebsessionManager):
+class IWebsessionManager2(IWebsessionManager, ObjectRefManager):
   def __init__(self, url):
        self.url = url
@@ -879 +889 @@
        self.handle = None
        self.mgr = self
+       ObjectRefManager.__init__(self, self.mgr)
 
   def getPort(self):