Changeset 58976 in vbox

Timestamp:

Dec 3, 2015 9:42:04 PM (9 years ago)

Author:

vboxsync

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

104498

Message:

VBoxTpG,SUPDrv: Extended VTGDESCPROVIDER again to facilitate HM in ring-0; major support driver version bump.

Location:

trunk

Files:

• include/VBox/VBoxTpG.h (modified) (2 diffs)
• src/VBox/HostDrivers/Support/SUPDrv-dtrace.cpp (modified) (4 diffs)
• src/VBox/HostDrivers/Support/SUPDrvIOC.h (modified) (1 diff)
• src/VBox/HostDrivers/Support/SUPDrvTracer.cpp (modified) (1 diff)
• src/bldprogs/VBoxTpG.cpp (modified) (4 diffs)

trunk/include/VBox/VBoxTpG.h

@@ -296 +296 @@
 typedef struct VTGDESCPROVIDER
 {
-    VTGSTROFF       offName;
-    uint16_t        iFirstProbe;
-    uint16_t        cProbes;
-    VTGDESCATTR     AttrSelf;
-    VTGDESCATTR     AttrModules;
-    VTGDESCATTR     AttrFunctions;
-    VTGDESCATTR     AttrNames;
-    VTGDESCATTR     AttrArguments;
-    uint8_t         bReserved;
-    uint32_t        cProbesEnabled;
+    VTGSTROFF           offName;
+    uint16_t            iFirstProbe;
+    uint16_t            cProbes;
+    VTGDESCATTR         AttrSelf;
+    VTGDESCATTR         AttrModules;
+    VTGDESCATTR         AttrFunctions;
+    VTGDESCATTR         AttrNames;
+    VTGDESCATTR         AttrArguments;
+    uint8_t             bReserved;
+    uint32_t volatile   cProbesEnabled;
+    /** This increases every time a probe is enabled or disabled.
+     * Can be used in non-ring-3 context via PROVIDER_GET_SETTINGS_SEQ_NO() in
+     * order to only configure probes related stuff when actually required.  */
+    uint32_t volatile   uSettingsSerialNo;
 } VTGDESCPROVIDER;
-AssertCompileSize(VTGDESCPROVIDER, 28);
+AssertCompileSize(VTGDESCPROVIDER, 32);
 /** Pointer to a VTG provider descriptor. */
 typedef VTGDESCPROVIDER    *PVTGDESCPROVIDER;
@@ -414 +418 @@
 
 /** The current VTGOBJHDR::szMagic value. */
-#define VTGOBJHDR_MAGIC     "VTG Object Header v1.6\0"
+#define VTGOBJHDR_MAGIC     "VTG Object Header v1.7\0"
 
 /** The name of the VTG data object header symbol in the object file. */

trunk/src/VBox/HostDrivers/Support/SUPDrv-dtrace.cpp

@@ -452 +452 @@
                 ASMAtomicIncU32(&pProv->pacProbeEnabled[idxProbe]);
                 ASMAtomicIncU32(&pProv->pDesc->cProbesEnabled);
+                ASMAtomicIncU32(&pProv->pDesc->uSettingsSerialNo);
             }
         }
@@ -462 +463 @@
                 ASMAtomicIncU32(&pProv->paR0Probes[idxProbe].cEnabled);
                 ASMAtomicIncU32(&pProv->pDesc->cProbesEnabled);
+                ASMAtomicIncU32(&pProv->pDesc->uSettingsSerialNo);
             }
 
@@ -499 +501 @@
                 ASMAtomicDecU32(&pProv->pacProbeEnabled[idxProbe]);
                 ASMAtomicIncU32(&pProv->pDesc->cProbesEnabled);
+                ASMAtomicIncU32(&pProv->pDesc->uSettingsSerialNo);
             }
         }
@@ -509 +512 @@
                 ASMAtomicDecU32(&pProv->paR0Probes[idxProbe].cEnabled);
                 ASMAtomicDecU32(&pProv->pDesc->cProbesEnabled);
+                ASMAtomicIncU32(&pProv->pDesc->uSettingsSerialNo);
             }
 

trunk/src/VBox/HostDrivers/Support/SUPDrvIOC.h

@@ -215 +215 @@
  *          - nothing.
  */
-#define SUPDRV_IOC_VERSION                              0x00250000
+#define SUPDRV_IOC_VERSION                              0x00260000
 
 /** SUP_IOCTL_COOKIE. */

trunk/src/VBox/HostDrivers/Support/SUPDrvTracer.cpp

@@ -539 +539 @@
         MY_CHECK_RET(pProvider->bReserved == 0, VERR_SUPDRV_VTG_BAD_PROVIDER);
         MY_CHECK_RET(pProvider->cProbesEnabled == 0, VERR_SUPDRV_VTG_BAD_PROVIDER);
+        MY_CHECK_RET(pProvider->uSettingsSerialNo == 0, VERR_SUPDRV_VTG_BAD_PROVIDER);
     }
 

trunk/src/bldprogs/VBoxTpG.cpp

@@ -533 +533 @@
                     "                ;0         1         2         3\n"
                     "                ;012345678901234567890123456789012\n"
-                    "    db          'VTG Object Header v1.6', 0, 0\n"
+                    "    db          'VTG Object Header v1.7', 0, 0\n"
                     "    dd          %u\n"
                     "    dd          NAME(g_acVTGProbeEnabled_End) - NAME(g_VTGObjHeader)\n"
@@ -740 +740 @@
                         "VTG_GLOBAL g_cVTGProviderProbesEnabled_%s, data\n"
                         "    dd 0\n"
+                        "VTG_GLOBAL g_cVTGProviderSettingsSeqNo_%s, data\n"
+                        "    dd 0\n"
                         ,
                         iProvider, pProvider->pszName,
@@ -750 +752 @@
                         pProvider->AttrName.enmCode,        pProvider->AttrName.enmData,        pProvider->AttrName.enmDataDep,
                         pProvider->AttrArguments.enmCode,   pProvider->AttrArguments.enmData,   pProvider->AttrArguments.enmDataDep,
+                        pProvider->pszName,
                         pProvider->pszName);
         iProvider++;
@@ -1004 +1007 @@
             generateProviderDefineName(szTmp, sizeof(szTmp), pProv->pszName);
             ScmStreamPrintf(pStrm,
-                            "extern uint32_t        g_cVTGProviderProbesEnabled_%s;\n"
+                            "extern uint32_t const volatile g_cVTGProviderProbesEnabled_%s;\n"
                             "# define %s_ANY_PROBES_ENABLED() \\\n"
                             "    (RT_UNLIKELY(g_cVTGProviderProbesEnabled_%s != 0))\n"
+                            "extern uint32_t const volatile g_cVTGProviderSettingsSeqNo_%s;\n"
+                            "# define %s_GET_SETTINGS_SEQ_NO() (g_cVTGProviderSettingsSeqNo_%s)\n"
                             "\n",
+                            pProv->pszName,
+                            szTmp, pProv->pszName,
                             pProv->pszName,
                             szTmp, pProv->pszName);