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

Timestamp:

Jan 2, 2015 12:31:45 PM (10 years ago)

Author:

vboxsync

Message:

VBoxDTrace: working on the interfaces between the two modules... (r40)

Location:

trunk/src/VBox/ExtPacks/VBoxDTrace/onnv

Files:

• lib/libdtrace/common/dt_subr.c (modified) (6 diffs)
• uts/common/dtrace/dtrace.c (modified) (3 diffs)

trunk/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_subr.c

@@ -47 +47 @@
 #  include <unistd.h>
 # endif
+# include <VBox/sup.h>
 #endif /* VBOX */
 
@@ -483 +484 @@
 {
         const dtrace_vector_t *v = dtp->dt_vector;
+#ifdef VBOX
+        int rc;
+#endif
 
         if (v != NULL)
@@ -491 +495 @@
                 return (ioctl(dtp->dt_fd, val, arg));
 #else
+# if 1
+        rc = SUPR3CallR0Service(RT_STR_TUPLE("VBoxDTrace"), val, (uintptr_t)arg, NULL);
+        if (RT_SUCCESS(rc)) {
+
+        }
+# else
         /* Fake ioctl */
         switch (val) {
@@ -531 +541 @@
 
         }
-        AssertFailed(); /** @todo FIXME */
+# endif
 #endif
 
@@ -538 +548 @@
 }
 
+#ifndef /* VBOX - who needs this? */
 int
 dt_status(dtrace_hdl_t *dtp, processorid_t cpu)
@@ -553 +564 @@
         return (v->dtv_status(dtp->dt_varg, cpu));
 }
+#endif
 
 #ifndef VBOX

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

@@ -14695 +14695 @@
  * DTrace Driver Cookbook Functions
  */
+#ifndef VBOX
 /*ARGSUSED*/
 static int
 dtrace_attach(dev_info_t *devi, ddi_attach_cmd_t cmd)
+#else
+int dtrace_attach(dev_info_t *devi, ddi_attach_cmd_t cmd)
+#endif
 {
         dtrace_provider_id_t id;
@@ -15037 +15041 @@
 
 /*ARGSUSED*/
+#ifndef VBOX
 static int
 dtrace_ioctl(dev_t dev, int cmd, intptr_t arg, int md, cred_t *cr, int *rv)
+#else
+int dtrace_ioctl(dev_t dev, int cmd, intptr_t arg, int md, cred_t *cr, int *rv)
+#endif
 {
         minor_t minor = getminor(dev);
@@ -15793 +15801 @@
 }
 
+#ifndef VBOX
 /*ARGSUSED*/
 static int
 dtrace_detach(dev_info_t *dip, ddi_detach_cmd_t cmd)
+#else
+int dtrace_detach(dev_info_t *dip, ddi_detach_cmd_t cmd)
+#endif
 {
         dtrace_state_t *state;