Changeset 16301 in vbox for trunk/src/VBox

Timestamp:

Jan 28, 2009 12:25:26 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

42130

Message:

webservice: logging improvements, optimizations

Location:

trunk/src/VBox/Main/webservice

Files:

• vboxweb.cpp (modified) (5 diffs)
• vboxweb.h (modified) (1 diff)

trunk/src/VBox/Main/webservice/vboxweb.cpp

@@ -245 +245 @@
     int rc;
 
+    // intialize runtime
+    RTR3Init();
+
     RTStrmPrintf(g_pStdErr, "Sun xVM VirtualBox Webservice Version %s\n"
                             "(C) 2005-2009 Sun Microsystems, Inc.\n"
                             "All rights reserved.\n", VBOX_VERSION_STRING);
-
-    // intialize runtime
-    RTR3Init(); /** @todo r=bird: This isn't at top of main(), is it? */
 
     int c;
@@ -304 +304 @@
                 }
 
-                WebLog("Opened log file \"%s\"\n", ValueUnion.psz);
+                WebLog("Sun xVM VirtualBox Webservice Version %s\n"
+                       "Opened log file \"%s\"\n", VBOX_VERSION_STRING, ValueUnion.psz);
             }
             break;
@@ -344 +345 @@
 
     // intialize COM/XPCOM
-    ComPtr<ISession> session;
+//     ComPtr<ISession> session;
     if ((rc = com::Initialize()))
         RTStrmPrintf(g_pStdErr, "[!] Failed to initialize COM!\n");
     else if ((rc = g_pVirtualBox.createLocalObject(CLSID_VirtualBox)))
         RTStrmPrintf(g_pStdErr, "[!] Failed to create the local VirtualBox object!\n");
-    else if ((rc = session.createInprocObject(CLSID_Session)))
-        RTStrmPrintf(g_pStdErr, "[!] Failed to create the inproc VirtualBox object!\n");
+//     else if ((rc = session.createInprocObject(CLSID_Session)))
+//         RTStrmPrintf(g_pStdErr, "[!] Failed to create the inproc VirtualBox object!\n");
 
     if (rc)
@@ -688 +689 @@
  * two integers representing a session and object ID, respectively.
  *
- * @param id
+ * @param sz Buffer with at least 34 bytes space to receive MOR string.
  * @param sessid
  * @param objid
  * @return
  */
-WSDLT_ID MakeManagedObjectRef(uint64_t &sessid,
-                              uint64_t &objid)
-{
-    char sz[34];
+void MakeManagedObjectRef(char *sz,
+                          uint64_t &sessid,
+                          uint64_t &objid)
+{
     RTStrFormatNumber(sz, sessid, 16, 16, 0, RTSTR_F_64BIT | RTSTR_F_ZEROPAD);
     sz[16] = '-';
     RTStrFormatNumber(sz + 17, objid, 16, 16, 0, RTSTR_F_64BIT | RTSTR_F_ZEROPAD);
-    return sz;
 }
 
@@ -1024 +1024 @@
     ULONG64 cTotal = ++g_cManagedObjects;           // raise global count and make a copy for the debug message below
 
-    _strID = MakeManagedObjectRef(session._uSessionID, _id);
+    char sz[34];
+    MakeManagedObjectRef(sz, session._uSessionID, _id);
+    _strID = sz;
 
     session._pp->_mapManagedObjectsById[_id] = this;

trunk/src/VBox/Main/webservice/vboxweb.h

@@ -220 +220 @@
     else
     {
+        // pRef->getComPtr returns a ComPtr<IUnknown>; by casting it to
+        // ComPtr<T>, we implicitly do a queryInterface() call
         if (pComPtr = pRef->getComPtr())
             return 0;
 
-        WEBDEBUG(("    Interface not support for object reference %s, which is of class %s\n", id.c_str(), pRef->getInterfaceName()));
+        WEBDEBUG(("    Interface not supported for object reference %s, which is of class %s\n", id.c_str(), pRef->getInterfaceName()));
         rc = VERR_WEB_UNSUPPORTED_INTERFACE;
         RaiseSoapInvalidObjectFault(soap, id);      // @todo better message