Changeset 40212 in vbox

Timestamp:

Feb 22, 2012 2:32:06 PM (13 years ago)

Author:

vboxsync

Message:

Main: Added facility for auto-logon modules; added book-keeping of last facility statuses (10 max).

Location:

trunk/src/VBox/Main

Files:

• idl/VirtualBox.xidl (modified) (1 diff)
• include/AdditionsFacilityImpl.h (modified) (4 diffs)
• src-client/AdditionsFacilityImpl.cpp (modified) (6 diffs)

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -8351 +8351 @@
       <desc>VirtualBox base driver (VBoxGuest).</desc>
     </const>
+    <const name="AutoLogon"               value="90">
+      <desc>Auto-logon modules (VBoxGINA, VBoxCredProv, pam_vbox).</desc>
+    </const>
     <const name="VBoxService"             value="100">
       <desc>VirtualBox system service (VBoxService).</desc>

trunk/src/VBox/Main/include/AdditionsFacilityImpl.h

@@ -4 +4 @@
 
 /*
- * Copyright (C) 2011 Oracle Corporation
+ * Copyright (C) 2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -18 +18 @@
 #define ____H_ADDITIONSFACILITYIMPL
 
+#include <vector>
+#include <iprt/time.h>
+
 #include "VirtualBoxBase.h"
-#include <iprt/time.h>
 
 class Guest;
@@ -60 +62 @@
     {
         /** The facilitie's name. */
-        const char            *mName; /* utf-8 */
+        const char              *mName; /* utf-8 */
         /** The facilitie's type. */
         AdditionsFacilityType_T  mType;
@@ -78 +80 @@
 
 private:
+    /** A structure for keeping a facility status
+     *  set at a certain time. Good for book-keeping. */
+    struct FacilityState
+    {
+        RTTIMESPEC                mTimestamp;
+        /** The facilitie's current status. */
+        AdditionsFacilityStatus_T mStatus;
+    };
+
     struct Data
     {
-        /** Timestamp of last updated status.
-         *  @todo Add a UpdateRecord struct to keep track of all
-         *        status changed + their time; nice for some GUIs. */
-        RTTIMESPEC mLastUpdated;
-        /** The facilitie's current status. */
-        AdditionsFacilityStatus_T mStatus;
+        /** Record of current and previous facility
+         *  states, limited to the 10 last states set.
+         *  Note: This intentionally only is kept in
+         *        Main so far! */
+        std::vector<FacilityState> mStates;
         /** The facilitie's ID/type. */
-        AdditionsFacilityType_T mType;
+        AdditionsFacilityType_T    mType;
     } mData;
 };

trunk/src/VBox/Main/src-client/AdditionsFacilityImpl.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2011 Oracle Corporation
+ * Copyright (C) 2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -28 +28 @@
     { "Unknown", AdditionsFacilityType_None, AdditionsFacilityClass_None },
     { "VirtualBox Base Driver", AdditionsFacilityType_VBoxGuestDriver, AdditionsFacilityClass_Driver },
+    { "Auto Logon", AdditionsFacilityType_AutoLogon, AdditionsFacilityClass_Feature },
     { "VirtualBox System Service", AdditionsFacilityType_VBoxService, AdditionsFacilityClass_Service },
     { "VirtualBox Desktop Integration", AdditionsFacilityType_VBoxTrayClient, AdditionsFacilityClass_Program },
@@ -65 +66 @@
     AssertReturn(autoInitSpan.isOk(), E_FAIL);
 
-    mData.mStatus       = a_enmStatus;
-    mData.mType         = a_enmFacility;
-    mData.mLastUpdated  = *a_pTimeSpecTS;
+    FacilityState state;
+    state.mStatus    = a_enmStatus;
+    state.mTimestamp = *a_pTimeSpecTS;
+    NOREF(a_fFlags);
+
+    Assert(mData.mStates.size() == 0);
+    mData.mStates.push_back(state);
+    mData.mType      = a_enmFacility;
     /** @todo mClass is not initialized here. */
     NOREF(a_fFlags);
@@ -89 +95 @@
     if (autoUninitSpan.uninitDone())
         return;
+
+    mData.mStates.clear();
 }
 
@@ -193 +201 @@
 LONG64 AdditionsFacility::getLastUpdated() const
 {
-    return RTTimeSpecGetMilli(&mData.mLastUpdated);
+    if (mData.mStates.size())
+        return RTTimeSpecGetMilli(&mData.mStates.front().mTimestamp);
+
+    AssertMsgFailed(("Unknown timestamp of facility!\n"));
+    return 0; /* Should never happen! */
 }
 
 AdditionsFacilityStatus_T AdditionsFacility::getStatus() const
 {
-    return mData.mStatus;
+    if (mData.mStates.size())
+        return mData.mStates.back().mStatus;
+
+    AssertMsgFailed(("Unknown status of facility!\n"));
+    return AdditionsFacilityStatus_Unknown; /* Should never happen! */
 }
 
@@ -211 +227 @@
 void AdditionsFacility::update(AdditionsFacilityStatus_T a_enmStatus, uint32_t a_fFlags, PCRTTIMESPEC a_pTimeSpecTS)
 {
-    mData.mStatus       = a_enmStatus;
-    mData.mLastUpdated  = *a_pTimeSpecTS;
+    FacilityState state;
+    state.mStatus    = a_enmStatus;
+    state.mTimestamp = *a_pTimeSpecTS;
     NOREF(a_fFlags);
-}
-
+
+    mData.mStates.push_back(state);
+    if (mData.mStates.size() > 10) /* Only keep the last 10 states. */
+        mData.mStates.erase(mData.mStates.begin());
+}
+