Changeset 90267 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

Jul 20, 2021 8:51:42 PM (4 years ago)

Author:

vboxsync

Message:

HGCM,HostServices: Set the default limits before calling the service load function. bugref:9379

File:

• trunk/src/VBox/Main/src-client/HGCM.cpp (modified) (2 diffs)

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

@@ -349 +349 @@
             m_fntable.pHelpers   = &m_svcHelpers;
 
+            /*  Total max calls: (2048 + 1024 + 1024) * 8192 = 33 554 432 */
+            m_fntable.idxLegacyClientCategory = HGCM_CLIENT_CATEGORY_KERNEL;
+            m_fntable.acMaxClients[HGCM_CLIENT_CATEGORY_KERNEL] = _2K;
+            m_fntable.acMaxClients[HGCM_CLIENT_CATEGORY_ROOT]   = _1K;
+            m_fntable.acMaxClients[HGCM_CLIENT_CATEGORY_USER]   = _1K;
+            m_fntable.acMaxCallsPerClient[HGCM_CLIENT_CATEGORY_KERNEL] = _8K;
+            m_fntable.acMaxCallsPerClient[HGCM_CLIENT_CATEGORY_ROOT]   = _4K;
+            m_fntable.acMaxCallsPerClient[HGCM_CLIENT_CATEGORY_USER]   = _2K;
+            /** @todo provide way to configure different values via extra data.   */
+
             rc = m_pfnLoad(&m_fntable);
 
@@ -361 +371 @@
                    )
                 {
-                    /*
-                     * Set default limits if not filled in by the service.
-                     *  Total max calls: (2048 + 1024 + 1024) * 8192 = 33 554 432
-                     */
                     Assert(m_fntable.idxLegacyClientCategory < RT_ELEMENTS(m_fntable.acMaxClients));
-
-                    if (m_fntable.acMaxClients[HGCM_CLIENT_CATEGORY_KERNEL] == 0)
-                        m_fntable.acMaxClients[HGCM_CLIENT_CATEGORY_KERNEL] = _2K;
-                    if (m_fntable.acMaxClients[HGCM_CLIENT_CATEGORY_ROOT]   == 0)
-                        m_fntable.acMaxClients[HGCM_CLIENT_CATEGORY_ROOT]   = _1K;
-                    if (m_fntable.acMaxClients[HGCM_CLIENT_CATEGORY_USER]   == 0)
-                        m_fntable.acMaxClients[HGCM_CLIENT_CATEGORY_USER]   = _1K;
-
-                    if (m_fntable.acMaxCallsPerClient[HGCM_CLIENT_CATEGORY_KERNEL] == 0)
-                        m_fntable.acMaxCallsPerClient[HGCM_CLIENT_CATEGORY_KERNEL] = _8K;
-                    if (m_fntable.acMaxCallsPerClient[HGCM_CLIENT_CATEGORY_ROOT]   == 0)
-                        m_fntable.acMaxCallsPerClient[HGCM_CLIENT_CATEGORY_ROOT]   = _4K;
-                    if (m_fntable.acMaxCallsPerClient[HGCM_CLIENT_CATEGORY_USER]   == 0)
-                        m_fntable.acMaxCallsPerClient[HGCM_CLIENT_CATEGORY_USER]   = _2K;
-
-                    /** @todo provide way to configure different values via extra data.   */
-
                     LogRel2(("HGCMService::loadServiceDLL: acMaxClients={%u,%u,%u} acMaxCallsPerClient={%u,%u,%u} => %RU64 calls; idxLegacyClientCategory=%d; %s\n",
                              m_fntable.acMaxClients[HGCM_CLIENT_CATEGORY_KERNEL],