xnu-7195.101.1.tar.gz

[apple/xnu.git] / iokit / Kernel / IOSharedDataQueue.cpp

diff --git a/iokit/Kernel/IOSharedDataQueue.cpp b/iokit/Kernel/IOSharedDataQueue.cpp
index 71d3c681774f1ffa00555830bcf7a6628b6b78a3..4443e5fa7a75e18fec60261db6932eb010c22ded 100644 (file)
--- a/iokit/Kernel/IOSharedDataQueue.cpp
+++ b/iokit/Kernel/IOSharedDataQueue.cpp
@@ -26,10 +26,13 @@
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 

+#define IOKIT_ENABLE_SHARED_PTR
+

 #include <IOKit/IOSharedDataQueue.h>
 #include <IOKit/IODataQueueShared.h>
 #include <IOKit/IOLib.h>
 #include <IOKit/IOMemoryDescriptor.h>
 #include <IOKit/IOSharedDataQueue.h>
 #include <IOKit/IODataQueueShared.h>
 #include <IOKit/IOLib.h>
 #include <IOKit/IOMemoryDescriptor.h>

+#include <libkern/c++/OSSharedPtr.h>

 
 #ifdef enqueue
 #undef enqueue
 
 #ifdef enqueue
 #undef enqueue


@@ -43,29 +46,28 @@
 
 OSDefineMetaClassAndStructors(IOSharedDataQueue, IODataQueue)
 
 
 OSDefineMetaClassAndStructors(IOSharedDataQueue, IODataQueue)
 

-IOSharedDataQueue *IOSharedDataQueue::withCapacity(UInt32 size)
+OSSharedPtr<IOSharedDataQueue>
+IOSharedDataQueue::withCapacity(UInt32 size)

 {
 {

-       IOSharedDataQueue *dataQueue = new IOSharedDataQueue;
+       OSSharedPtr<IOSharedDataQueue> dataQueue = OSMakeShared<IOSharedDataQueue>();

 
        if (dataQueue) {
                if (!dataQueue->initWithCapacity(size)) {
 
        if (dataQueue) {
                if (!dataQueue->initWithCapacity(size)) {

-                       dataQueue->release();
-                       dataQueue = NULL;
+                       return nullptr;

                }
        }
 
        return dataQueue;
 }
 
                }
        }
 
        return dataQueue;
 }
 

-IOSharedDataQueue *
+OSSharedPtr<IOSharedDataQueue>

 IOSharedDataQueue::withEntries(UInt32 numEntries, UInt32 entrySize)
 {
 IOSharedDataQueue::withEntries(UInt32 numEntries, UInt32 entrySize)
 {

-       IOSharedDataQueue *dataQueue = new IOSharedDataQueue;
+       OSSharedPtr<IOSharedDataQueue> dataQueue = OSMakeShared<IOSharedDataQueue>();

 
        if (dataQueue) {
                if (!dataQueue->initWithEntries(numEntries, entrySize)) {
 
        if (dataQueue) {
                if (!dataQueue->initWithEntries(numEntries, entrySize)) {

-                       dataQueue->release();
-                       dataQueue = NULL;
+                       return nullptr;

                }
        }
 
                }
        }
 


@@ -147,10 +149,10 @@ IOSharedDataQueue::free()
        super::free();
 }
 
        super::free();
 }
 

-IOMemoryDescriptor *
+OSSharedPtr<IOMemoryDescriptor>

 IOSharedDataQueue::getMemoryDescriptor()
 {
 IOSharedDataQueue::getMemoryDescriptor()
 {

-       IOMemoryDescriptor *descriptor = NULL;
+       OSSharedPtr<IOMemoryDescriptor> descriptor;

 
        if (dataQueue != NULL) {
                descriptor = IOMemoryDescriptor::withAddress(dataQueue, getQueueSize() + DATA_QUEUE_MEMORY_HEADER_SIZE + DATA_QUEUE_MEMORY_APPENDIX_SIZE, kIODirectionOutIn);
 
        if (dataQueue != NULL) {
                descriptor = IOMemoryDescriptor::withAddress(dataQueue, getQueueSize() + DATA_QUEUE_MEMORY_HEADER_SIZE + DATA_QUEUE_MEMORY_APPENDIX_SIZE, kIODirectionOutIn);


@@ -182,7 +184,7 @@ IOSharedDataQueue::peek()
                UInt32              headOffset   = dataQueue->head;
                UInt32              queueSize    = getQueueSize();
 
                UInt32              headOffset   = dataQueue->head;
                UInt32              queueSize    = getQueueSize();
 

-               if (headOffset >= queueSize) {
+               if (headOffset > queueSize) {

                        return NULL;
                }
 
                        return NULL;
                }