Changeset 53668 in vbox for trunk/src/VBox/ExtPacks/VBoxDTrace/onnv/uts

Timestamp:

Jan 2, 2015 12:33:14 PM (10 years ago)

Author:

vboxsync

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

97445

Message:

VBoxDTrace: More unresolved ring-0 stuff. (r45)

File:

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

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

@@ -12511 +12511 @@
 #endif
 {
+#ifndef VBOX
         minor_t minor;
         major_t major;
+#endif
         char c[30];
         dtrace_state_t *state;
@@ -12539 +12541 @@
         state->dts_epid = DTRACE_EPIDNONE + 1;
 
+#ifndef VBOX
         (void) snprintf(c, sizeof (c), "dtrace_aggid_%d", minor);
+#else
+        (void) snprintf(c, sizeof (c), "dtrace_aggid_%p", state);
+#endif
         state->dts_aggid_arena = vmem_create(c, (void *)1, UINT32_MAX, 1,
             NULL, NULL, NULL, 0, VM_SLEEP | VMC_IDENTIFIER);
@@ -14785 +14791 @@
         dtrace_enabling_t *enab;
 
+#ifndef VBOX
+        if (   VBoxDtMutexInit(&dtrace_lock)
+            || VBoxDtMutexInit(&dtrace_provider_lock)
+            || VBoxDtMutexInit(&dtrace_meta_lock)
+# ifdef DEBUG
+            || VBoxDtMutexInit(&dtrace_errlock);
+# endif
+            )
+            return (DDI_FAILURE);
+#endif
+
         mutex_enter(&cpu_lock);
         mutex_enter(&dtrace_provider_lock);