--- xnu/xnu-1228/iokit/Kernel/IOTimerEventSource.cpp
+++ xnu/xnu-3789.21.4/iokit/Kernel/IOTimerEventSource.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 1998-2000, 2009-2010 Apple Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -25,17 +25,6 @@
  * 
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
-/*
- * Copyright (c) 1999 Apple Computer, Inc.  All rights reserved. 
- *
- * IOTimerEventSource.cpp
- *
- * HISTORY
- * 2-Feb-1999		Joe Liu (jliu) created.
- * 1999-10-14		Godfrey van der Linden(gvdl)
- *		Revamped to use thread_call APIs
- *
- */
 
 #include <sys/cdefs.h>
 
@@ -51,6 +40,10 @@
 #include <IOKit/IOWorkLoop.h>
 
 #include <IOKit/IOTimeStamp.h>
+#include <IOKit/IOKitDebug.h>
+#if CONFIG_DTRACE
+#include <mach/sdt.h>
+#endif
 
 #define super IOEventSource
 OSDefineMetaClassAndStructors(IOTimerEventSource, IOEventSource)
@@ -63,19 +56,50 @@
 OSMetaClassDefineReservedUnused(IOTimerEventSource, 6);
 OSMetaClassDefineReservedUnused(IOTimerEventSource, 7);
 
+#if IOKITSTATS
+
+#define IOStatisticsInitializeCounter() \
+do { \
+	IOStatistics::setCounterType(IOEventSource::reserved->counter, kIOStatisticsTimerEventSourceCounter); \
+} while (0)
+
+#define IOStatisticsOpenGate() \
+do { \
+	IOStatistics::countOpenGate(me->IOEventSource::reserved->counter); \
+} while (0)
+
+#define IOStatisticsCloseGate() \
+do { \
+	IOStatistics::countCloseGate(me->IOEventSource::reserved->counter); \
+} while (0)
+
+#define IOStatisticsTimeout() \
+do { \
+	IOStatistics::countTimerTimeout(me->IOEventSource::reserved->counter); \
+} while (0)
+
+#else
+
+#define IOStatisticsInitializeCounter()
+#define IOStatisticsOpenGate()
+#define IOStatisticsCloseGate()
+#define IOStatisticsTimeout()
+
+#endif /* IOKITSTATS */
+
 // 
 // reserved != 0 means IOTimerEventSource::timeoutAndRelease is being used,
 // not a subclassed implementation. 
 //
 
-bool IOTimerEventSource::checkForWork() { return false; }
-
 // Timeout handler function. This function is called by the kernel when
 // the timeout interval expires.
 //
 void IOTimerEventSource::timeout(void *self)
 {
     IOTimerEventSource *me = (IOTimerEventSource *) self;
+
+    IOStatisticsTimeout();
 
     if (me->enabled && me->action)
     {
@@ -85,22 +109,40 @@
         {
             Action doit;
             wl->closeGate();
+            IOStatisticsCloseGate();
             doit = (Action) me->action;
             if (doit && me->enabled && AbsoluteTime_to_scalar(&me->abstime))
             {
-                IOTimeStampConstant(IODBG_TIMES(IOTIMES_ACTION),
-                                    (unsigned int) doit, (unsigned int) me->owner);
+            	bool    trace = (gIOKitTrace & kIOTraceTimers) ? true : false;
+            	
+            	if (trace)
+                	IOTimeStampStartConstant(IODBG_TIMES(IOTIMES_ACTION),
+											 VM_KERNEL_UNSLIDE(doit), (uintptr_t) me->owner);
+				
                 (*doit)(me->owner, me);
+#if CONFIG_DTRACE
+		DTRACE_TMR3(iotescallout__expire, Action, doit, OSObject, me->owner, void, me->workLoop);
+#endif
+                
+				if (trace)
+                	IOTimeStampEndConstant(IODBG_TIMES(IOTIMES_ACTION),
+										   VM_KERNEL_UNSLIDE(doit), (uintptr_t) me->owner);
             }
+            IOStatisticsOpenGate();
             wl->openGate();
         }
     }
 }
 
-void IOTimerEventSource::timeoutAndRelease(void * self, void * count)
+void IOTimerEventSource::timeoutAndRelease(void * self, void * c)
 {
     IOTimerEventSource *me = (IOTimerEventSource *) self;
-
+	/* The second parameter (a pointer) gets abused to carry an SInt32, so on LP64, "count"
+	   must be cast to "long" before, in order to tell GCC we're not truncating a pointer. */
+	SInt32 count = (SInt32) (long) c;
+
+    IOStatisticsTimeout();
+	
     if (me->enabled && me->action)
     {
         IOWorkLoop *
@@ -109,13 +151,26 @@
         {
             Action doit;
             wl->closeGate();
+            IOStatisticsCloseGate();
             doit = (Action) me->action;
-            if (doit && (me->reserved->calloutGeneration == (SInt32) count))
+            if (doit && (me->reserved->calloutGeneration == count))
             {
-                IOTimeStampConstant(IODBG_TIMES(IOTIMES_ACTION),
-                                    (unsigned int) doit, (unsigned int) me->owner);
+            	bool    trace = (gIOKitTrace & kIOTraceTimers) ? true : false;
+            	
+            	if (trace)
+                	IOTimeStampStartConstant(IODBG_TIMES(IOTIMES_ACTION),
+											 VM_KERNEL_UNSLIDE(doit), (uintptr_t) me->owner);
+				
                 (*doit)(me->owner, me);
+#if CONFIG_DTRACE
+		DTRACE_TMR3(iotescallout__expire, Action, doit, OSObject, me->owner, void, me->workLoop);
+#endif
+                
+				if (trace)
+                	IOTimeStampEndConstant(IODBG_TIMES(IOTIMES_ACTION),
+										   VM_KERNEL_UNSLIDE(doit), (uintptr_t) me->owner);
             }
+            IOStatisticsOpenGate();
             wl->openGate();
         }
     }
@@ -142,6 +197,8 @@
     if (!calloutEntry)
         return false;
 
+    IOStatisticsInitializeCounter();
+
     return true;
 }
 
@@ -227,6 +284,7 @@
     return wakeAtTime(end);
 }
 
+#if !defined(__LP64__)
 IOReturn IOTimerEventSource::setTimeout(mach_timespec_t interval)
 {
     AbsoluteTime end, nsecs;
@@ -239,6 +297,7 @@
 
     return wakeAtTime(end);
 }
+#endif
 
 IOReturn IOTimerEventSource::setTimeout(AbsoluteTime interval)
 {
@@ -273,6 +332,7 @@
     return wakeAtTime(end);
 }
 
+#if !defined(__LP64__)
 IOReturn IOTimerEventSource::wakeAtTime(mach_timespec_t inAbstime)
 {
     AbsoluteTime end, nsecs;
@@ -285,6 +345,7 @@
 
     return wakeAtTime(end);
 }
+#endif
 
 void IOTimerEventSource::setWorkLoop(IOWorkLoop *inWorkLoop)
 {
@@ -299,7 +360,7 @@
         return kIOReturnNoResources;
 
     abstime = inAbstime;
-    if ( enabled && AbsoluteTime_to_scalar(&abstime) && workLoop )
+    if ( enabled && AbsoluteTime_to_scalar(&inAbstime) && AbsoluteTime_to_scalar(&abstime) && workLoop )
     {
         if (reserved)
         {
@@ -308,14 +369,14 @@
             reserved->workLoop = workLoop;
             reserved->calloutGeneration++;
             if (thread_call_enter1_delayed((thread_call_t) calloutEntry, 
-                    (void *) reserved->calloutGeneration, abstime))
+                    (void *)(uintptr_t) reserved->calloutGeneration, inAbstime))
             {
                 release();
                 workLoop->release();
             }
         }
         else
-            thread_call_enter_delayed((thread_call_t) calloutEntry, abstime);
+            thread_call_enter_delayed((thread_call_t) calloutEntry, inAbstime);
     }
 
     return kIOReturnSuccess;