Loading...
--- xnu/xnu-3248.50.21/iokit/Kernel/IOInterruptEventSource.cpp
+++ xnu/xnu-1504.15.3/iokit/Kernel/IOInterruptEventSource.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998-2014 Apple Inc. All rights reserved.
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
*
* @APPLE_OSREFERENCE_LICENSE_HEADER_START@
*
@@ -25,7 +25,13 @@
*
* @APPLE_OSREFERENCE_LICENSE_HEADER_END@
*/
-
+/*
+Copyright (c) 1998 Apple Computer, Inc. All rights reserved.
+
+HISTORY
+ 1998-7-13 Godfrey van der Linden(gvdl)
+ Created.
+*/
#include <IOKit/IOInterruptEventSource.h>
#include <IOKit/IOKitDebug.h>
#include <IOKit/IOLib.h>
@@ -33,32 +39,6 @@
#include <IOKit/IOInterrupts.h>
#include <IOKit/IOTimeStamp.h>
#include <IOKit/IOWorkLoop.h>
-#include <IOKit/IOInterruptAccountingPrivate.h>
-
-#if IOKITSTATS
-
-#define IOStatisticsInitializeCounter() \
-do { \
- IOStatistics::setCounterType(IOEventSource::reserved->counter, kIOStatisticsInterruptEventSourceCounter); \
-} while (0)
-
-#define IOStatisticsCheckForWork() \
-do { \
- IOStatistics::countInterruptCheckForWork(IOEventSource::reserved->counter); \
-} while (0)
-
-#define IOStatisticsInterrupt() \
-do { \
- IOStatistics::countInterrupt(IOEventSource::reserved->counter); \
-} while (0)
-
-#else
-
-#define IOStatisticsInitializeCounter()
-#define IOStatisticsCheckForWork()
-#define IOStatisticsInterrupt()
-
-#endif // IOKITSTATS
#define super IOEventSource
@@ -82,14 +62,6 @@
if ( !super::init(inOwner, (IOEventSourceAction) inAction) )
return false;
- reserved = IONew(ExpansionData, 1);
-
- if (!reserved) {
- return false;
- }
-
- bzero(reserved, sizeof(ExpansionData));
-
provider = inProvider;
producerCount = consumerCount = 0;
autoDisable = explicitDisable = false;
@@ -97,39 +69,10 @@
// Assumes inOwner holds a reference(retain) on the provider
if (inProvider) {
- if (IA_ANY_STATISTICS_ENABLED) {
- /*
- * We only treat this as an "interrupt" if it has a provider; if it does,
- * set up the objects necessary to track interrupt statistics. Interrupt
- * event sources without providers are most likely being used as simple
- * event source in order to poke at workloops and kick off work.
- *
- * We also avoid try to avoid interrupt accounting overhead if none of
- * the statistics are enabled.
- */
- reserved->statistics = IONew(IOInterruptAccountingData, 1);
-
- if (!reserved->statistics) {
- /*
- * We rely on the free() routine to clean up after us if init fails
- * midway.
- */
- return false;
- }
-
- bzero(reserved->statistics, sizeof(IOInterruptAccountingData));
-
- reserved->statistics->owner = this;
- }
-
res = (kIOReturnSuccess == registerInterruptHandler(inProvider, inIntIndex));
-
- if (res) {
+ if (res)
intIndex = inIntIndex;
- }
- }
-
- IOStatisticsInitializeCounter();
+ }
return res;
}
@@ -156,53 +99,8 @@
ret = provider->registerInterrupt(inIntIndex, this, intHandler);
- /*
- * Add statistics to the provider. The setWorkLoop convention should ensure
- * that we always go down the unregister path before we register (outside of
- * init()), so we don't have to worry that we will invoke addInterruptStatistics
- * erroneously.
- */
- if ((ret == kIOReturnSuccess) && (reserved->statistics)) {
- /*
- * Stash the normal index value, for the sake of debugging.
- */
- reserved->statistics->interruptIndex = inIntIndex;
-
- /*
- * We need to hook the interrupt information up to the provider so that it
- * can find the statistics for this interrupt when desired. The provider is
- * responsible for maintaining the reporter for a particular interrupt, and
- * needs a handle on the statistics so that it can request that the reporter
- * be updated as needed. Errors are considered "soft" for the moment (it
- * will either panic, or fail in a way such that we can still service the
- * interrupt).
- */
- provider->addInterruptStatistics(reserved->statistics, inIntIndex);
-
- /*
- * Add the statistics object to the global list of statistics objects; this
- * is an aid to debugging (we can trivially find statistics for all eligible
- * interrupts, and dump them; potentially helpful if the system is wedged
- * due to interrupt activity).
- */
- interruptAccountingDataAddToList(reserved->statistics);
- }
-
return (ret);
}
-
-void
-IOInterruptEventSource::unregisterInterruptHandler(IOService *inProvider,
- int inIntIndex)
-{
- if (reserved->statistics) {
- interruptAccountingDataRemoveFromList(reserved->statistics);
- provider->removeInterruptStatistics(reserved->statistics->interruptIndex);
- }
-
- provider->unregisterInterrupt(inIntIndex);
-}
-
IOInterruptEventSource *
IOInterruptEventSource::interruptEventSource(OSObject *inOwner,
@@ -223,15 +121,7 @@
void IOInterruptEventSource::free()
{
if (provider && intIndex >= 0)
- unregisterInterruptHandler(provider, intIndex);
-
- if (reserved) {
- if (reserved->statistics) {
- IODelete(reserved->statistics, IOInterruptAccountingData, 1);
- }
-
- IODelete(reserved, ExpansionData, 1);
- }
+ provider->unregisterInterrupt(intIndex);
super::free();
}
@@ -256,24 +146,19 @@
void IOInterruptEventSource::setWorkLoop(IOWorkLoop *inWorkLoop)
{
- if (inWorkLoop) super::setWorkLoop(inWorkLoop);
-
- if (provider) {
- if (!inWorkLoop) {
- if (intIndex >= 0) {
- /*
- * It isn't necessarily safe to wait until free() to unregister the interrupt;
- * our provider may disappear.
- */
- unregisterInterruptHandler(provider, intIndex);
- intIndex = ~intIndex;
- }
- } else if ((intIndex < 0) && (kIOReturnSuccess == registerInterruptHandler(provider, ~intIndex))) {
+ super::setWorkLoop(inWorkLoop);
+
+ if (!provider)
+ return;
+
+ if ( !inWorkLoop ) {
+ if (intIndex >= 0) {
+ provider->unregisterInterrupt(intIndex);
intIndex = ~intIndex;
}
- }
-
- if (!inWorkLoop) super::setWorkLoop(inWorkLoop);
+ } else if ((intIndex < 0) && (kIOReturnSuccess == registerInterruptHandler(provider, ~intIndex))) {
+ intIndex = ~intIndex;
+ }
}
const IOService *IOInterruptEventSource::getProvider() const
@@ -293,105 +178,47 @@
bool IOInterruptEventSource::checkForWork()
{
- uint64_t startSystemTime = 0;
- uint64_t endSystemTime = 0;
- uint64_t startCPUTime = 0;
- uint64_t endCPUTime = 0;
unsigned int cacheProdCount = producerCount;
int numInts = cacheProdCount - consumerCount;
IOInterruptEventAction intAction = (IOInterruptEventAction) action;
bool trace = (gIOKitTrace & kIOTraceIntEventSource) ? true : false;
-
- IOStatisticsCheckForWork();
-
+
if ( numInts > 0 )
{
if (trace)
IOTimeStampStartConstant(IODBG_INTES(IOINTES_ACTION),
- VM_KERNEL_UNSLIDE(intAction), (uintptr_t) owner, (uintptr_t) this, (uintptr_t) workLoop);
-
- if (reserved->statistics) {
- if (IA_GET_STATISTIC_ENABLED(kInterruptAccountingSecondLevelSystemTimeIndex)) {
- startSystemTime = mach_absolute_time();
- }
-
- if (IA_GET_STATISTIC_ENABLED(kInterruptAccountingSecondLevelCPUTimeIndex)) {
- startCPUTime = thread_get_runtime_self();
- }
- }
+ (uintptr_t) intAction, (uintptr_t) owner, (uintptr_t) this, (uintptr_t) workLoop);
// Call the handler
- (*intAction)(owner, this, numInts);
-
- if (reserved->statistics) {
- if (IA_GET_STATISTIC_ENABLED(kInterruptAccountingSecondLevelCountIndex)) {
- IA_ADD_VALUE(&reserved->statistics->interruptStatistics[kInterruptAccountingSecondLevelCountIndex], 1);
- }
-
- if (IA_GET_STATISTIC_ENABLED(kInterruptAccountingSecondLevelCPUTimeIndex)) {
- endCPUTime = thread_get_runtime_self();
- IA_ADD_VALUE(&reserved->statistics->interruptStatistics[kInterruptAccountingSecondLevelCPUTimeIndex], endCPUTime - startCPUTime);
- }
-
- if (IA_GET_STATISTIC_ENABLED(kInterruptAccountingSecondLevelSystemTimeIndex)) {
- endSystemTime = mach_absolute_time();
- IA_ADD_VALUE(&reserved->statistics->interruptStatistics[kInterruptAccountingSecondLevelSystemTimeIndex], endSystemTime - startSystemTime);
- }
- }
+ (*intAction)(owner, this, numInts);
if (trace)
IOTimeStampEndConstant(IODBG_INTES(IOINTES_ACTION),
- VM_KERNEL_UNSLIDE(intAction), (uintptr_t) owner, (uintptr_t) this, (uintptr_t) workLoop);
-
- consumerCount = cacheProdCount;
- if (autoDisable && !explicitDisable)
- enable();
- }
+ (uintptr_t) intAction, (uintptr_t) owner, (uintptr_t) this, (uintptr_t) workLoop);
+
+ consumerCount = cacheProdCount;
+ if (autoDisable && !explicitDisable)
+ enable();
+ }
else if ( numInts < 0 )
{
if (trace)
IOTimeStampStartConstant(IODBG_INTES(IOINTES_ACTION),
- VM_KERNEL_UNSLIDE(intAction), (uintptr_t) owner, (uintptr_t) this, (uintptr_t) workLoop);
-
- if (reserved->statistics) {
- if (IA_GET_STATISTIC_ENABLED(kInterruptAccountingSecondLevelSystemTimeIndex)) {
- startSystemTime = mach_absolute_time();
- }
-
- if (IA_GET_STATISTIC_ENABLED(kInterruptAccountingSecondLevelCPUTimeIndex)) {
- startCPUTime = thread_get_runtime_self();
- }
- }
+ (uintptr_t) intAction, (uintptr_t) owner, (uintptr_t) this, (uintptr_t) workLoop);
// Call the handler
- (*intAction)(owner, this, -numInts);
-
- if (reserved->statistics) {
- if (IA_GET_STATISTIC_ENABLED(kInterruptAccountingSecondLevelCountIndex)) {
- IA_ADD_VALUE(&reserved->statistics->interruptStatistics[kInterruptAccountingSecondLevelCountIndex], 1);
- }
-
- if (IA_GET_STATISTIC_ENABLED(kInterruptAccountingSecondLevelCPUTimeIndex)) {
- endCPUTime = thread_get_runtime_self();
- IA_ADD_VALUE(&reserved->statistics->interruptStatistics[kInterruptAccountingSecondLevelCPUTimeIndex], endCPUTime - startCPUTime);
- }
-
- if (IA_GET_STATISTIC_ENABLED(kInterruptAccountingSecondLevelSystemTimeIndex)) {
- endSystemTime = mach_absolute_time();
- IA_ADD_VALUE(&reserved->statistics->interruptStatistics[kInterruptAccountingSecondLevelSystemTimeIndex], endSystemTime - startSystemTime);
- }
- }
+ (*intAction)(owner, this, -numInts);
if (trace)
IOTimeStampEndConstant(IODBG_INTES(IOINTES_ACTION),
- VM_KERNEL_UNSLIDE(intAction), (uintptr_t) owner, (uintptr_t) this, (uintptr_t) workLoop);
-
- consumerCount = cacheProdCount;
- if (autoDisable && !explicitDisable)
- enable();
- }
-
+ (uintptr_t) intAction, (uintptr_t) owner, (uintptr_t) this, (uintptr_t) workLoop);
+
+ consumerCount = cacheProdCount;
+ if (autoDisable && !explicitDisable)
+ enable();
+ }
+
return false;
}
@@ -399,21 +226,14 @@
(void */*refcon*/, IOService */*prov*/, int /*source*/)
{
bool trace = (gIOKitTrace & kIOTraceIntEventSource) ? true : false;
-
- IOStatisticsInterrupt();
+
producerCount++;
-
+
if (trace)
IOTimeStampStartConstant(IODBG_INTES(IOINTES_SEMA), (uintptr_t) this, (uintptr_t) owner);
-
- if (reserved->statistics) {
- if (IA_GET_STATISTIC_ENABLED(kInterruptAccountingFirstLevelCountIndex)) {
- IA_ADD_VALUE(&reserved->statistics->interruptStatistics[kInterruptAccountingFirstLevelCountIndex], 1);
- }
- }
signalWorkAvailable();
-
+
if (trace)
IOTimeStampEndConstant(IODBG_INTES(IOINTES_SEMA), (uintptr_t) this, (uintptr_t) owner);
}
@@ -422,23 +242,16 @@
(void */*refcon*/, IOService *prov, int source)
{
bool trace = (gIOKitTrace & kIOTraceIntEventSource) ? true : false;
-
+
prov->disableInterrupt(source); /* disable the interrupt */
-
- IOStatisticsInterrupt();
+
producerCount++;
-
+
if (trace)
IOTimeStampStartConstant(IODBG_INTES(IOINTES_SEMA), (uintptr_t) this, (uintptr_t) owner);
-
- if (reserved->statistics) {
- if (IA_GET_STATISTIC_ENABLED(kInterruptAccountingFirstLevelCountIndex)) {
- IA_ADD_VALUE(&reserved->statistics->interruptStatistics[kInterruptAccountingFirstLevelCountIndex], 1);
- }
- }
signalWorkAvailable();
-
+
if (trace)
IOTimeStampEndConstant(IODBG_INTES(IOINTES_SEMA), (uintptr_t) this, (uintptr_t) owner);
}
@@ -451,10 +264,3 @@
else
normalInterruptOccurred(refcon, prov, source);
}
-
-IOReturn IOInterruptEventSource::warmCPU
- (uint64_t abstime)
-{
-
- return ml_interrupt_prewarm(abstime);
-}