Changeset 53645 in vbox for trunk/src/VBox/ExtPacks/VBoxDTrace/onnv

Timestamp:

Jan 2, 2015 12:17:02 PM (10 years ago)

Author:

vboxsync

Message:

VBoxDTrace: no unresolved dtrace_*. (r15)

File:

• trunk/src/VBox/ExtPacks/VBoxDTrace/onnv/uts/common/dtrace/dtrace.c (modified) (14 diffs)

trunk/src/VBox/ExtPacks/VBoxDTrace/onnv/uts/common/dtrace/dtrace.c

@@ -104 +104 @@
 # include <limits.h>
 
+/*
+ * Use asm.h to implemente some of the simple stuff in dtrace_asm.s.
+ */
+# include <iprt/asm.h>
+# include <iprt/asm-amd64-x86.h>
+# define dtrace_casptr(a_ppvDst, a_pvOld, a_pvNew) \
+        VBoxDtCompareAndSwapPtr(a_ppvDst, a_pvOld, a_pvNew)
+DECLINLINE(void *) VBoxDtCompareAndSwapPtr(void * volatile *ppvDst, void *pvOld, void *pvNew)
+{
+        void *pvRet;
+        ASMAtomicCmpXchgExPtrVoid(ppvDst, pvNew, pvOld, &pvRet);
+        return pvRet;
+}
+
+# define dtrace_cas32(a_pu32Dst, a_pu32Old, a_pu32New) \
+        VBoxDtCompareAndSwapU32(a_pu32Dst, a_pu32Old, a_pu32New)
+DECLINLINE(uint32_t) VBoxDtCompareAndSwapU32(uint32_t volatile *pu32Dst, uint32_t u32Old, uint32_t u32New)
+{
+        uint32_t u32Ret;
+        ASMAtomicCmpXchgExU32(pu32Dst, u32New, u32Old, &u32Ret);
+        return u32Ret;
+}
+
+#define dtrace_membar_consumer()                ASMReadFence()
+#define dtrace_membar_producer()                ASMWriteFence()
+#define dtrace_interrupt_disable()              ASMIntDisableFlags()
+#define dtrace_interrupt_enable(a_EFL)  ASMSetFlags(a_EFL)
+
+/*
+ * NULL must be set to 0 or we'll end up with a billion warnings(=errors).
+ */
 # undef NULL
 # define NULL (0)
@@ -1850 +1881 @@
         }
 
+#ifndef VBOX
         ASSERT(0);
+#else
+        AssertFatalFailed();
+#endif
 }
 
@@ -2706 +2741 @@
                                 return (val);
 
+#ifndef VBOX
                         ASSERT(0);
+#else
+                        AssertFatalFailed();
+#endif
                 }
 
@@ -2748 +2787 @@
 
         case DIF_VAR_VTIMESTAMP:
+#ifndef VBOX
                 ASSERT(dtrace_vtime_references != 0);
                 return (curthread->t_dtrace_vtime);
+#else
+                cpu_core[VBDT_GET_CPUID()].cpuc_dtrace_flags |= CPU_DTRACE_ILLOP;
+                return (0);
+#endif
 
         case DIF_VAR_WALLTIMESTAMP:
@@ -5700 +5744 @@
 }
 
+#ifdef VBOX
+extern void dtrace_probe6(dtrace_id_t, uintptr_t arg0, uintptr_t arg1,
+                                                  uintptr_t arg2, uintptr_t arg3, uintptr_t arg4, uintptr_t arg5);
+# define dtrace_probe_error(a1, a2, a3, a4, a5, a6) \
+        dtrace_probe6(dtrace_probeid_error, (uintptr_t)a1, a2, a3, a4, a5, a6)
+#endif
+
 /*
  * If you're looking for the epicenter of DTrace, you just found it.  This
@@ -6219 +6270 @@
 
                         default:
+#ifndef VBOX
                                 ASSERT(0);
+#else
+                                AssertFatalMsgFailed(("%d\n", act->dta_kind));
+#endif
                         }
 
@@ -6283 +6338 @@
                                  * reference, not by value.
                                  */
+#ifndef VBOX
                                 ASSERT(0);
+#else
+                                AssertFatalMsgFailed(("%zu\n", size));
+#endif
                                 break;
                         }
@@ -8685 +8744 @@
 dtrace_difo_hold(dtrace_difo_t *dp)
 {
+#ifndef VBOX
         VBDTTYPE(uint_t,int) i;
+#endif
 
         ASSERT(MUTEX_HELD(&dtrace_lock));
@@ -8692 +8753 @@
         ASSERT(dp->dtdo_refcnt != 0);
 
+#ifndef VBOX
         /*
          * We need to check this DIF object for references to the variable
@@ -8705 +8767 @@
                         dtrace_vtime_enable();
         }
+#endif
 }
 
@@ -8924 +8987 @@
 
                 default:
+#ifndef VBOX
                         ASSERT(0);
+#else
+                        AssertFatalMsgFailed(("%d\n", scope));
+#endif
                 }
 
@@ -9040 +9107 @@
 
                 default:
+#ifndef VBOX
                         ASSERT(0);
-#ifdef VBOX
-                        continue;
+#else
+                        AssertFatalMsgFailed(("%d\n", scope));
 #endif
                 }
@@ -9080 +9148 @@
 dtrace_difo_release(dtrace_difo_t *dp, dtrace_vstate_t *vstate)
 {
+#ifndef VBOX
         VBDTTYPE(uint_t,int)  i;
+#endif
 
         ASSERT(MUTEX_HELD(&dtrace_lock));
         ASSERT(dp->dtdo_refcnt != 0);
 
+#ifndef VBOX
         for (i = 0; i < dp->dtdo_varlen; i++) {
                 dtrace_difv_t *v = &dp->dtdo_vartab[i];
@@ -9095 +9166 @@
                         dtrace_vtime_disable();
         }
+#endif
 
         if (--dp->dtdo_refcnt == 0)