xnu-1228.3.13.tar.gz

[apple/xnu.git] / osfmk / kern / sched_average.c

diff --git a/osfmk/kern/sched_average.c b/osfmk/kern/sched_average.c
index 5545079938c988daef49e5b983e3afb8ca0a6fb0..e1c02d7a008f270e4db81e29d6836b254c890f30 100644 (file)
--- a/osfmk/kern/sched_average.c
+++ b/osfmk/kern/sched_average.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2007 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -110,72 +110,62 @@ typedef struct sched_average      *sched_average_t;
 void
 compute_averages(void)
 {
-       register processor_set_t        pset = &default_pset;
-       register int                            ncpus;
-       register int                            nthreads, nshared;
-       sched_average_t                         avg;
-       register uint32_t                       factor_now = 0;
-       register uint32_t                       average_now = 0;
-       register uint32_t                       load_now = 0;
-
-       if ((ncpus = pset->processor_count) > 0) {
-               /*
-                *      Retrieve counts, ignoring
-                *      the current thread.
-                */
-               nthreads = pset->run_count - 1;
-               nshared = pset->share_count;
-
-               /*
-                *      Load average and mach factor calculations for
-                *      those which ask about these things.
-                */
-               average_now = nthreads * LOAD_SCALE;
-
-               if (nthreads > ncpus)
-                       factor_now = (ncpus * LOAD_SCALE) / (nthreads + 1);
+       int                                     ncpus, nthreads, nshared;
+       uint32_t                        factor_now, average_now, load_now = 0;
+       sched_average_t         avg;
+
+       /*
+        *      Retrieve counts, ignoring
+        *      the current thread.
+        */
+       ncpus = processor_avail_count;
+       nthreads = sched_run_count - 1;
+       nshared = sched_share_count;
+
+       /*
+        *      Load average and mach factor calculations for
+        *      those which ask about these things.
+        */
+       average_now = nthreads * LOAD_SCALE;
+
+       if (nthreads > ncpus)
+               factor_now = (ncpus * LOAD_SCALE) / (nthreads + 1);
+       else
+               factor_now = (ncpus - nthreads) * LOAD_SCALE;
+
+       sched_mach_factor =     ((sched_mach_factor << 2) + factor_now) / 5;
+       sched_load_average = ((sched_load_average << 2) + average_now) / 5;
+
+       /*
+        *      Compute the timeshare priority
+        *      conversion factor based on loading.
+        */
+       if (nshared > nthreads)
+               nshared = nthreads;
+
+       if (nshared > ncpus) {
+               if (ncpus > 1)
+                       load_now = nshared / ncpus;
                else
-                       factor_now = (ncpus - nthreads) * LOAD_SCALE;
-
-               pset->mach_factor =     ((pset->mach_factor << 2) + factor_now) / 5;
-               pset->load_average = ((pset->load_average << 2) + average_now) / 5;
-
-               /*
-                *      Compute the timeshare priority
-                *      conversion factor based on loading.
-                */
-               if (nshared > nthreads)
-                       nshared = nthreads;
-
-               if (nshared > ncpus) {
-                       if (ncpus > 1)
-                               load_now = nshared / ncpus;
-                       else
-                               load_now = nshared;
-
-                       if (load_now > NRQS - 1)
-                               load_now = NRQS - 1;
-               }
+                       load_now = nshared;
 
-               /*
-                *      The conversion factor consists of
-                *      two components: a fixed value based
-                *      on the absolute time unit, and a
-                *      dynamic portion based on loading.
-                *
-                *      Zero loading results in a out of range
-                *      shift count.  Accumulated usage is ignored
-                *      during conversion and new usage deltas
-                *      are discarded.
-                */
-               pset->pri_shift = sched_pri_shift - sched_load_shifts[load_now];
-       }
-       else {
-               pset->mach_factor = pset->load_average = 0;
-               pset->pri_shift = INT8_MAX;
-               nthreads = pset->run_count;
+               if (load_now > NRQS - 1)
+                       load_now = NRQS - 1;
        }
 
+       /*
+        *      The conversion factor consists of
+        *      two components: a fixed value based
+        *      on the absolute time unit, and a
+        *      dynamic portion based on loading.
+        *
+        *      Zero loading results in a out of range
+        *      shift count.  Accumulated usage is ignored
+        *      during conversion and new usage deltas
+        *      are discarded.
+        */
+       sched_pri_shift = sched_fixed_shift - sched_load_shifts[load_now];
+
        /*
         *      Sample total running threads.
         */