system_cmds-300.tar.gz

[apple/system_cmds.git] / sc_usage.tproj / sc_usage.c

diff --git a/sc_usage.tproj/sc_usage.c b/sc_usage.tproj/sc_usage.c
index adab8fab5e097bd92d3e85228e466739e15635a2..68089931ab58404655e106d686627209a23a785a 100644 (file)
--- a/sc_usage.tproj/sc_usage.c
+++ b/sc_usage.tproj/sc_usage.c
@@ -3,21 +3,22 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * "Portions Copyright (c) 1999 Apple Computer, Inc.  All Rights
- * Reserved.  This file contains Original Code and/or Modifications of
- * Original Code as defined in and that are subject to the Apple Public
- * Source License Version 1.0 (the 'License').  You may not use this file
- * except in compliance with the License.  Please obtain a copy of the
- * License at http://www.apple.com/publicsource and read it before using
- * this file.
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
  * 
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License."
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
@@ -1402,7 +1403,7 @@ sample_sc()
                struct sc_entry *se;
                struct entry *te;
 
-               thread  = kd[i].arg5 & KDBG_THREAD_MASK;
+               thread  = kd[i].arg5;
                debugid = kd[i].debugid;
                type    = kd[i].debugid & DBG_FUNC_MASK;
 
@@ -1410,7 +1411,7 @@ sample_sc()
                switched_out = (struct th_info *)0;
                switched_in  = (struct th_info *)0;
 
-               now = kd[i].timestamp;
+               now = kd[i].timestamp & KDBG_TIMESTAMP_MASK;
                
                baseid = debugid & 0xffff0000;
 
@@ -1469,7 +1470,7 @@ sample_sc()
                else if (baseid == msc_base)
                        code = 512 + ((debugid >> 2) & 0x1ff);
                else if (type == mach_sched || type == mach_stkhandoff) {
-                       switched_out = find_thread((kd[i].arg5 & KDBG_THREAD_MASK));
+                       switched_out = find_thread(kd[i].arg5);
                        switched_in  = find_thread(kd[i].arg2);
 
                        if (in_idle) {