Changeset 53664 in vbox for trunk

Timestamp:

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

Author:

vboxsync

Message:

VBoxDTrace: build on linux. (r41)

Location:

trunk/src/VBox/ExtPacks/VBoxDTrace

Files:

• VBoxDTrace/Makefile.kmk (modified) (1 diff)
• include/VBoxDTraceTypes.h (modified) (5 diffs)
• onnv/lib/libdtrace/common/dt_aggregate.c (modified) (1 diff)
• onnv/lib/libdtrace/common/dt_impl.h (modified) (1 diff)
• onnv/lib/libdtrace/common/dt_subr.c (modified) (2 diffs)
• onnv/uts/common/dtrace/dtrace.c (modified) (3 diffs)

trunk/src/VBox/ExtPacks/VBoxDTrace/VBoxDTrace/Makefile.kmk

@@ -36 +36 @@
 VBoxDTrace_DEFS = RTMEM_WRAP_TO_EF_APIS
 VBoxDTrace_SDKS = VBOX_ZLIB
+ifn1of ($(KBUILD_TARGET), win)
+ VBoxDTrace_CFLAGS = -Wno-format
+endif
 VBoxDTrace_INCS = \
         ../include \

trunk/src/VBox/ExtPacks/VBoxDTrace/include/VBoxDTraceTypes.h

@@ -37 +37 @@
 #ifdef IN_RING3
 # include <sys/types.h>
+# include <limits.h>
 #endif
 
@@ -50 +51 @@
 typedef uint64_t                    u_longlong_t;
 typedef uint64_t                    hrtime_t;
-typedef RTCCUINTREG                 greg_t;
+typedef RTCCINTREG                  greg_t;
 typedef uintptr_t                   pc_t;
-typedef uintptr_t                   id_t;
+typedef uint32_t                    id_t;
 typedef unsigned int                model_t;
 typedef uint32_t                    zoneid_t;
@@ -67 +68 @@
 #define SEC                         (1)
 #define MAXPATHLEN                  RTPATH_MAX
+#undef PATH_MAX
 #define PATH_MAX                    RTPATH_MAX
 #define NBBY                        (8)
@@ -119 +121 @@
 #define VBDTSTATIC              static
 #define VBDTUNASS(a_Value)      = a_Value
+#define VBDTGCC(a_Value)        = a_Value
 
 /*
@@ -393 +396 @@
  */
 extern int dtrace_attach(dev_info_t *devi, ddi_attach_cmd_t cmd);
+extern int dtrace_detach(dev_info_t *dip, ddi_detach_cmd_t cmd);
 extern int dtrace_ioctl(dev_t dev, int cmd, intptr_t arg, int md, cred_t *cr, int *rv);
 

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

@@ -653 +653 @@
 
         for (i = 0; i < agp->dtat_ncpus; i++) {
-                if (rval = dt_aggregate_snap_cpu(dtp, agp->dtat_cpus[i]))
+                if ((rval = dt_aggregate_snap_cpu(dtp, agp->dtat_cpus[i])))
                         return (rval);
         }

trunk/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_impl.h

@@ -635 +635 @@
 extern int yydebug;             /* lex debugging */
 extern dt_node_t *yypragma;     /* lex token list for control lines */
+#ifdef VBOX
+extern int yylex(void);
+#endif
 
 extern const dtrace_attribute_t _dtrace_maxattr; /* maximum attributes */

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

@@ -548 +548 @@
 }
 
-#ifndef /* VBOX - who needs this? */
 int
 dt_status(dtrace_hdl_t *dtp, processorid_t cpu)
@@ -564 +563 @@
         return (v->dtv_status(dtp->dt_varg, cpu));
 }
-#endif
 
 #ifndef VBOX

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

@@ -10410 +10410 @@
                 buf = &bufs[cp->cpu_id];
 #else
-    for (iCpu = 0; iCpu < RTCPUSET_MAX_CPUS; iCpu++) {
+        for (iCpu = 0; iCpu < RTCPUSET_MAX_CPUS; iCpu++) {
                 if (   !RTCpuSetIsMember(&CpuSet, iCpu)
-                        || (cpu != (processorid_t)DTRACE_CPUALL && cpu != iCpu))
+                    || (cpu != (processorid_t)DTRACE_CPUALL && cpu != iCpu))
                         continue;
 
@@ -12658 +12658 @@
 {
         dtrace_optval_t *opt = state->dts_options, size;
-        processorid_t cpu;
+        processorid_t cpu VBDTUNASS(DTRACE_CPUALL);
         int flags = 0, rval;
 
@@ -13629 +13629 @@
          */
         for (;;) {
-                dtrace_helper_provider_t *prov;
+                dtrace_helper_provider_t *prov VBDTGCC(NULL);
 
                 /*