儲存庫 vbox 的更動 62432

時間撮記:

2016-7-22 上午11:49:59 (8 年 以前)

作者:

vboxsync

訊息:

dtrace: MSC level 4 warnings.

檔案:

• trunk/src/VBox/ExtPacks/VBoxDTrace/onnv/uts/common/dtrace/dtrace.c (修改) (13 筆差異)

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

@@ -139 +139 @@
 # undef NULL
 # define NULL (0)
+
+# ifdef _MSC_VER
+//#  pragma warning(disable: 4389) /* signed/unsigned mismatch */
+# endif
+
 #endif /* VBOX */
 
@@ -2325 +2330 @@
                 }
 
-                if (dtrace_cas32((uint32_t *)&spec->dtsp_state,
-                    current, DTRACESPEC_ACTIVE) == current)
+                if (   (dtrace_speculation_state_t)dtrace_cas32((uint32_t *)&spec->dtsp_state, current, DTRACESPEC_ACTIVE)
+                    == current)
                         return (i + 1);
         }
@@ -2421 +2426 @@
 #endif
                 }
-        } while (dtrace_cas32((uint32_t *)&spec->dtsp_state,
-            current, new) != current);
+        } while ((dtrace_speculation_state_t)dtrace_cas32((uint32_t *)&spec->dtsp_state, current, new) != current);
 
         /*
@@ -2539 +2543 @@
 #endif
                 }
-        } while (dtrace_cas32((uint32_t *)&spec->dtsp_state,
-            current, new) != current);
+        } while ((dtrace_speculation_state_t)dtrace_cas32((uint32_t *)&spec->dtsp_state, current, new) != current);
 
         buf->dtb_offset = 0;
@@ -2730 +2733 @@
 #endif
                 }
-        } while (dtrace_cas32((uint32_t *)&spec->dtsp_state,
-            current, new) != current);
+        } while ((dtrace_speculation_state_t)dtrace_cas32((uint32_t *)&spec->dtsp_state, current, new) != current);
 
         ASSERT(new == DTRACESPEC_ACTIVEONE || new == DTRACESPEC_ACTIVEMANY);
@@ -6064 +6066 @@
                                 do {
                                         current = state->dts_activity;
-                                } while (dtrace_cas32(activity, current,
-                                    DTRACE_ACTIVITY_KILLED) != current);
+                                } while (   (dtrace_speculation_state_t)dtrace_cas32(activity, current, DTRACE_ACTIVITY_KILLED)
+                                         != current);
 
                                 continue;
@@ -6359 +6361 @@
                                         current = DTRACE_ACTIVITY_ACTIVE;
 
-                                if (dtrace_cas32(activity, current,
-                                    DTRACE_ACTIVITY_DRAINING) != current) {
+                                if (   (dtrace_speculation_state_t)dtrace_cas32(activity, current, DTRACE_ACTIVITY_DRAINING)
+                                    != current) {
                                         *flags |= CPU_DTRACE_DROP;
                                         continue;
@@ -6780 +6782 @@
                 priv = DTRACE_PRIV_ALL;
 #ifdef VBOX
-                *uidp = ~0;
+                *uidp = UINT32_MAX;
                 *zoneidp = 0;
 #endif
@@ -9737 +9739 @@
 
         case DTRACEAGG_MAX:
-                agg->dtag_initial = INT64_MIN;
+                agg->dtag_initial = (uint64_t)INT64_MIN;
                 agg->dtag_aggregate = dtrace_aggregate_max;
                 break;
@@ -11294 +11296 @@
          */
         for (enab = dtrace_retained; enab != NULL; enab = enab->dten_next) {
+#ifndef VBOX
                 cred_t *cr = enab->dten_vstate->dtvs_state->dts_cred.dcr_cred;
 
-#ifndef VBOX
                 if (INGLOBALZONE(curproc) ||
                     cr != NULL && getzoneid() == crgetzoneid(cr))
@@ -12615 +12617 @@
             NULL, NULL, NULL, 0, VM_SLEEP | VMC_IDENTIFIER);
 #else
-        state->dts_aggid_arena = vmem_create(c, (void *)1, _1G, 1,
+        state->dts_aggid_arena = vmem_create(c, (void *)(uintptr_t)1, _1G, 1,
             NULL, NULL, NULL, 0, VM_SLEEP | VMC_IDENTIFIER);
 #endif
@@ -12801 +12803 @@
 {
         dtrace_optval_t *opt = state->dts_options, size;
-        processorid_t cpu VBDTUNASS(DTRACE_CPUALL);
+        processorid_t cpu VBDTUNASS((processorid_t)DTRACE_CPUALL);
         int flags = 0, rval;
 
@@ -14931 +14933 @@
             NULL, NULL, NULL, 0, VM_SLEEP | VMC_IDENTIFIER);
 #else
-        dtrace_arena = vmem_create("dtrace", (void *)1, UINT32_MAX - 16, 1,
+        dtrace_arena = vmem_create("dtrace", (void *)(uintptr_t)1, UINT32_MAX - 16, 1,
             NULL, NULL, NULL, 0, VM_SLEEP | VMC_IDENTIFIER);
 #endif