Changeset 76082 in vbox for trunk/src/VBox/Main/include

Timestamp:

Dec 9, 2018 7:25:00 PM (6 years ago)

Author:

vboxsync

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

127323

Message:

VBoxSDS: Implemented (disabled) monitoring client (VBoxSVC) process termination to bypass the 5 min denalty for abended clients. Really handy for development. bugref:3300

File:

• trunk/src/VBox/Main/include/VirtualBoxSDSImpl.h (modified) (3 diffs)

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

@@ -21 +21 @@
 #include "VirtualBoxBase.h"
 
+///* Enable the watcher code in debug builds. */
+//#ifdef DEBUG
+//# define WITH_WATCHER
+//#endif
+
 
 class VBoxSDSPerUserData; /* See VirtualBoxSDSImpl.cpp. */
+struct VBoxSDSWatcher;    /* See VirtualBoxSDSImpl.cpp. */
 
 /**
@@ -51 +57 @@
     /** Per user data map (key is SID string).
      * This is an insert-only map! */
-    UserDataMap_T       m_UserDataMap;
-    /** Lock protecting m_UserDataMap.*/
-    RTCRITSECTRW        m_MapCritSect;
+    UserDataMap_T           m_UserDataMap;
+    /** Number of registered+watched VBoxSVC processes. */
+    uint32_t                m_cVBoxSvcProcesses;
+#ifdef WITH_WATCHER
+    /** Number of watcher threads.   */
+    uint32_t                m_cWatchers;
+    /** Pointer to an array of watcher pointers. */
+    VBoxSDSWatcher        **m_papWatchers;
+    /** Lock protecting m_papWatchers and associated structures. */
+    RTCRITSECT              m_WatcherCritSect;
+#endif
+    /** Lock protecting m_UserDataMap . */
+    RTCRITSECTRW            m_MapCritSect;
 
 public:
@@ -101 +117 @@
      */
     VBoxSDSPerUserData *i_lookupOrCreatePerUserData(com::Utf8Str const &a_rStrUserSid, com::Utf8Str const &a_rStrUsername);
+
+#ifdef WITH_WATCHER
+    static DECLCALLBACK(int) i_watcherThreadProc(RTTHREAD hSelf, void *pvUser);
+    bool i_watchIt(VBoxSDSPerUserData *pProcess, HANDLE hProcess, RTPROCESS pid);
+    void i_stopWatching(VBoxSDSPerUserData *pProcess, RTPROCESS pid);
+    void i_shutdownAllWatchers(void);
+
+    void i_decrementClientCount();
+    void i_incrementClientCount();
+#endif
     /** @} */
 };
 
+#ifdef WITH_WATCHER
+void VBoxSDSNotifyClientCount(uint32_t cClients);
+#endif
 
 #endif // !____H_VIRTUALBOXSDSIMPL