Changeset 54408 in vbox

Timestamp:

Feb 24, 2015 2:06:56 AM (10 years ago)

Author:

vboxsync

Message:

IPRT/r0drv: Added RTMpOnPair and RTMpOnPairIsConcurrentExecSupported, currently generic wrappers around RTMpOnAll but this will change where possible.

Location:

trunk

Files:

• include/iprt/err.h (modified) (2 diffs)
• include/iprt/mp.h (modified) (2 diffs)
• src/VBox/Runtime/Makefile.kmk (modified) (6 diffs)
• src/VBox/Runtime/generic/RTMpOnPair-generic.cpp (added)
• src/VBox/Runtime/r0drv/generic/RTMpOn-r0drv-generic.cpp (modified) (3 diffs)

trunk/include/iprt/err.h

@@ -926 +926 @@
 /** The requested allocation is too big. */
 #define VERR_ALLOCATION_TOO_BIG             (-22407)
+/** Mismatch. */
+#define VERR_MISMATCH                       (-22408)
+/** Wrong type. */
+#define VERR_WRONG_TYPE                     (-22409)
 /** @} */
 
@@ -1602 +1606 @@
 /** The specified cpu was not found. */
 #define VERR_CPU_NOT_FOUND                      (-801)
+/** Not all of the requested CPUs showed up in the PFNRTMPWORKER. */
+#define VERR_NOT_ALL_CPUS_SHOWED                (-802)
+/** Internal processing error in the RTMp code.*/
+#define VERR_CPU_IPE_1                          (-803)
 /** @} */
 

trunk/include/iprt/mp.h

@@ -246 +246 @@
 typedef FNRTMPWORKER *PFNRTMPWORKER;
 
+/** @name RTMPON_F_XXX - RTMpOn flags.
+ * @{ */
+/** Caller doesn't care if pfnWorker is executed at the same time on the
+ *  specified CPUs or not, as long as it gets executed. */
+#define RTMPON_F_WHATEVER_EXEC      0
+/** The caller insists on pfnWorker being executed more or less concurrently
+ * on the specified CPUs. */
+#define RTMPON_F_CONCURRENT_EXEC    RT_BIT_32(1)
+/** Mask of valid bits. */
+#define RTMPON_F_VALID_MASK         UINT32_C(0x00000001)
+/** @}*/
+
 /**
  * Checks if the RTMpOnAll() is safe with regards to all threads executing
@@ -308 +320 @@
  */
 RTDECL(int) RTMpOnSpecific(RTCPUID idCpu, PFNRTMPWORKER pfnWorker, void *pvUser1, void *pvUser2);
+
+/**
+ * Executes a function on two specific CPUs in the system.
+ *
+ * @returns IPRT status code.
+ * @retval  VINF_SUCCESS on success.
+ * @retval  VERR_NOT_SUPPORTED if this kind of operation isn't supported by the
+ *          system or if the specified modifier flag isn't supported.
+ * @retval  VERR_CPU_OFFLINE if one or more of the CPUs are offline (see
+ *          remarks).
+ * @retval  VERR_CPU_NOT_FOUND if on or both of the CPUs weren't found.
+ * @retval  VERR_NOT_ALL_CPUS_SHOWED if one of the CPUs didn't show.
+ *
+ * @param   idCpu1          The id of the first CPU.
+ * @param   idCpu2          The id of the second CPU.
+ * @param   fFlags          Combination of RTMPON_F_XXX flags.
+ * @param   pfnWorker       The worker function.
+ * @param   pvUser1         The first user argument for the worker.
+ * @param   pvUser2         The second user argument for the worker.
+ *
+ * @remarks There is a possible race between one (or both) of the CPUs going
+ *          offline while setting up the call.  The worker function must take
+ *          this into account.
+ */
+RTDECL(int) RTMpOnPair(RTCPUID idCpu1, RTCPUID idCpu2, uint32_t fFlags, PFNRTMPWORKER pfnWorker, void *pvUser1, void *pvUser2);
+
+/**
+ * Indicates whether RTMpOnPair supports running the pfnWorker concurrently on
+ * both CPUs using RTMPON_F_CONCURRENT_EXEC.
+ *
+ * @returns true if supported, false if not.
+ */
+RTDECL(bool) RTMpOnPairIsConcurrentExecSupported(void);
+
 
 /**

trunk/src/VBox/Runtime/Makefile.kmk

@@ -1870 +1870 @@
         generic/RTMpGetCoreCount-generic.cpp \
         generic/mppresent-generic.cpp \
+        generic/RTMpOnPair-generic.cpp \
         r0drv/linux/alloc-r0drv-linux.c \
         r0drv/linux/assert-r0drv-linux.c \
@@ -2001 +2002 @@
         generic/mppresent-generic.cpp \
         generic/RTMpGetCoreCount-generic.cpp \
+        generic/RTMpOnPair-generic.cpp \
         nt/RTErrConvertFromNtStatus.cpp \
         r0drv/generic/threadctxhooks-r0drv-generic.cpp \
@@ -2040 +2042 @@
         generic/RTTimerCreate-generic.cpp \
         generic/RTMpGetCoreCount-generic.cpp \
+        generic/RTMpOnPair-generic.cpp \
         generic/mppresent-generic.cpp \
         generic/timer-generic.cpp \
@@ -2137 +2140 @@
         generic/RTLogWriteDebugger-generic.cpp \
         generic/RTLogWriteStdOut-stub-generic.cpp \
+        generic/RTMpOnPair-generic.cpp \
         generic/RTTimerCreate-generic.cpp \
         generic/mppresent-generic.cpp \
@@ -2167 +2171 @@
         generic/RTLogWriteStdOut-stub-generic.cpp \
         generic/RTMpGetCoreCount-generic.cpp \
+        generic/RTMpOnPair-generic.cpp \
         generic/RTTimerCreate-generic.cpp \
         generic/mppresent-generic.cpp \
@@ -2202 +2207 @@
         common/string/strchr.asm \
         generic/RTAssertShouldPanic-generic.cpp \
+        generic/RTMpOnPair-generic.cpp \
         generic/RTTimerCreate-generic.cpp \
         generic/mppresent-generic.cpp \

trunk/src/VBox/Runtime/r0drv/generic/RTMpOn-r0drv-generic.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2008-2010 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -45 +45 @@
 
 
+RTDECL(bool) RTMpOnAllIsConcurrentSafe(void)
+{
+    return false;
+}
+RT_EXPORT_SYMBOL(RTMpOnAllIsConcurrentSafe);
+
+
 RTDECL(int) RTMpOnOthers(PFNRTMPWORKER pfnWorker, void *pvUser1, void *pvUser2)
 {
@@ -65 +72 @@
 RT_EXPORT_SYMBOL(RTMpOnSpecific);
 
+
+RTDECL(int) RTMpOnPair(RTCPUID idCpu1, RTCPUID idCpu2, PFNRTMPWORKER pfnWorker, void *pvUser1, void *pvUser2)
+{
+    NOREF(idCpu1);
+    NOREF(idCpu2);
+    NOREF(pfnWorker);
+    NOREF(pvUser1);
+    NOREF(pvUser2);
+    return VERR_NOT_SUP_IN_RAW_MODE;
+}
+RT_EXPORT_SYMBOL(RTMpOnPair);
+
+
+
+RTDECL(bool) RTMpOnPairIsConcurrentExecSupported(void)
+{
+    return false;
+}
+RT_EXPORT_SYMBOL(RTMpOnPairIsConcurrentExecSupported);
+