xnu-7195.101.1.tar.gz

[apple/xnu.git] / osfmk / i386 / pmCPU.c

diff --git a/osfmk/i386/pmCPU.c b/osfmk/i386/pmCPU.c
index ff49e3fe2bbbeb95ad645e0f42f10ffc2a40e1da..038ae1313cdedd19d329b15af6f78c9da308f31f 100644 (file)
--- a/osfmk/i386/pmCPU.c
+++ b/osfmk/i386/pmCPU.c
@@ -109,7 +109,7 @@ machine_idle(void)
        uint64_t                ctime, rtime, itime;
 #if CST_DEMOTION_DEBUG
        processor_t             cproc = my_cpu->cpu_processor;
        uint64_t                ctime, rtime, itime;
 #if CST_DEMOTION_DEBUG
        processor_t             cproc = my_cpu->cpu_processor;

-       uint64_t                cwakeups = PROCESSOR_DATA(cproc, wakeups_issued_total);
+       uint64_t                cwakeups = my_cpu->cpu_wakeups_issued_total;

 #endif /* CST_DEMOTION_DEBUG */
        uint64_t esdeadline, ehdeadline;
        boolean_t do_process_pending_timers = FALSE;
 #endif /* CST_DEMOTION_DEBUG */
        uint64_t esdeadline, ehdeadline;
        boolean_t do_process_pending_timers = FALSE;


@@ -223,7 +223,7 @@ machine_idle_exit:
                TCOAL_DEBUG(0xBBBB0000 | DBG_FUNC_END, ctime, esdeadline, idle_pending_timers_processed, 0, 0);
        }
 #if CST_DEMOTION_DEBUG
                TCOAL_DEBUG(0xBBBB0000 | DBG_FUNC_END, ctime, esdeadline, idle_pending_timers_processed, 0, 0);
        }
 #if CST_DEMOTION_DEBUG

-       uint64_t nwakeups = PROCESSOR_DATA(cproc, wakeups_issued_total);
+       uint64_t nwakeups = my_cpu->cpu_wakeups_issued_total;

 
        if ((nwakeups == cwakeups) && (topoParms.nLThreadsPerPackage == my_cpu->lcpu.package->num_idle)) {
                KERNEL_DEBUG_CONSTANT(0xceaa0000, cwakeups, 0, 0, 0, 0);
 
        if ((nwakeups == cwakeups) && (topoParms.nLThreadsPerPackage == my_cpu->lcpu.package->num_idle)) {
                KERNEL_DEBUG_CONSTANT(0xceaa0000, cwakeups, 0, 0, 0, 0);


@@ -750,7 +750,7 @@ pmThreadGetUrgency(uint64_t *rt_period, uint64_t *rt_deadline)
        thread_urgency_t urgency;
        uint64_t        arg1, arg2;
 
        thread_urgency_t urgency;
        uint64_t        arg1, arg2;
 

-       urgency = thread_get_urgency(current_processor()->next_thread, &arg1, &arg2);
+       urgency = thread_get_urgency(THREAD_NULL, &arg1, &arg2);

 
        if (urgency == THREAD_URGENCY_REAL_TIME) {
                if (rt_period != NULL) {
 
        if (urgency == THREAD_URGENCY_REAL_TIME) {
                if (rt_period != NULL) {