Skip to content

deallocation support for DispatchData on Linux #108

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 21, 2016
Merged

deallocation support for DispatchData on Linux #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 28 additions & 24 deletions src/swift/Data.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ public struct DispatchData : RandomAccessCollection {

public static let empty: DispatchData = DispatchData(data: _swift_dispatch_data_empty())

#if false /* FIXME: dragging in _TMBO (Objective-C) */
public enum Deallocator {
/// Use `free`
case free
Expand All @@ -28,7 +27,13 @@ public struct DispatchData : RandomAccessCollection {
case unmap

/// A custom deallocator
case custom(DispatchQueue?, @convention(block) () -> Void)
// FIXME: Want @convention(block) here to minimize the overhead of
// doing the conversion (once per custom enum instance instead
// of once per call to DispatchData.init using the enum instance).
// However, adding the annotation here results in Data.o containing
// a reference to _TMBO (opaque metadata for Builtin.UnknownObject)
// which is only made available on platforms with Objective-C.
case custom(DispatchQueue?, () -> Void)

private var _deallocator: (DispatchQueue?, @convention(block) () -> Void) {
switch self {
Expand All @@ -38,51 +43,50 @@ public struct DispatchData : RandomAccessCollection {
}
}
}
#endif
internal var __wrapped: dispatch_data_t

internal var __wrapped: __DispatchData

/// Initialize a `Data` with copied memory content.
///
/// - parameter bytes: A pointer to the memory. It will be copied.
/// - parameter count: The number of bytes to copy.
public init(bytes buffer: UnsafeBufferPointer<UInt8>) {
__wrapped = dispatch_data_create(
buffer.baseAddress!, buffer.count, nil, _dispatch_data_destructor_default())
let d = dispatch_data_create(buffer.baseAddress!, buffer.count, nil, _dispatch_data_destructor_default())
self.init(data: d)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does the compiler not force you to make this convenience because of the self.init?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(Not that it's a problem, I just figured it would complain)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Compiler doesn't complain. I think it is allowed because this init is public and the init being calling with self.init is internal. (or there's a compiler bug...)

}
#if false /* FIXME: dragging in _TMBO (Objective-C) */

/// Initialize a `Data` without copying the bytes.
///
/// - parameter bytes: A pointer to the bytes.
/// - parameter count: The size of the bytes.
/// - parameter bytes: A buffer pointer containing the data.
/// - parameter deallocator: Specifies the mechanism to free the indicated buffer.
public init(bytesNoCopy bytes: UnsafeBufferPointer<UInt8>, deallocator: Deallocator = .free) {
let (q, b) = deallocator._deallocator

__wrapped = dispatch_data_create(bytes.baseAddress!, bytes.count, q?.__wrapped, b)
let d = dispatch_data_create(bytes.baseAddress!, bytes.count, q?.__wrapped, b)
self.init(data: d)
}
#endif

internal init(data: dispatch_data_t) {
__wrapped = data
__wrapped = __DispatchData(data: data)
}

public var count: Int {
return CDispatch.dispatch_data_get_size(__wrapped)
return CDispatch.dispatch_data_get_size(__wrapped.__wrapped)
}

public func withUnsafeBytes<Result, ContentType>(
body: @noescape (UnsafePointer<ContentType>) throws -> Result) rethrows -> Result
{
var ptr: UnsafePointer<Void>? = nil
var size = 0;
let data = CDispatch.dispatch_data_create_map(__wrapped, &ptr, &size)
let data = CDispatch.dispatch_data_create_map(__wrapped.__wrapped, &ptr, &size)
defer { _fixLifetime(data) }
return try body(UnsafePointer<ContentType>(ptr!))
}

public func enumerateBytes(
block: @noescape (buffer: UnsafeBufferPointer<UInt8>, byteIndex: Int, stop: inout Bool) -> Void)
{
_swift_dispatch_data_apply(__wrapped) { (data: dispatch_data_t, offset: Int, ptr: UnsafePointer<Void>, size: Int) in
_swift_dispatch_data_apply(__wrapped.__wrapped) { (data: dispatch_data_t, offset: Int, ptr: UnsafePointer<Void>, size: Int) in
let bp = UnsafeBufferPointer(start: UnsafePointer<UInt8>(ptr), count: size)
var stop = false
block(buffer: bp, byteIndex: offset, stop: &stop)
Expand All @@ -103,8 +107,8 @@ public struct DispatchData : RandomAccessCollection {
///
/// - parameter data: The data to append to this data.
public mutating func append(_ other: DispatchData) {
let data = CDispatch.dispatch_data_create_concat(__wrapped, other.__wrapped)
__wrapped = data
let data = CDispatch.dispatch_data_create_concat(__wrapped.__wrapped, other.__wrapped.__wrapped)
__wrapped = __DispatchData(data: data)
}

/// Append a buffer of bytes to the data.
Expand All @@ -116,7 +120,7 @@ public struct DispatchData : RandomAccessCollection {

private func _copyBytesHelper(to pointer: UnsafeMutablePointer<UInt8>, from range: CountableRange<Index>) {
var copiedCount = 0
_ = CDispatch.dispatch_data_apply(__wrapped) { (data: dispatch_data_t, offset: Int, ptr: UnsafePointer<Void>, size: Int) in
_ = CDispatch.dispatch_data_apply(__wrapped.__wrapped) { (data: dispatch_data_t, offset: Int, ptr: UnsafePointer<Void>, size: Int) in
let limit = Swift.min((range.endIndex - range.startIndex) - copiedCount, size)
memcpy(pointer + copiedCount, ptr, limit)
copiedCount += limit
Expand Down Expand Up @@ -177,7 +181,7 @@ public struct DispatchData : RandomAccessCollection {
/// Sets or returns the byte at the specified index.
public subscript(index: Index) -> UInt8 {
var offset = 0
let subdata = CDispatch.dispatch_data_copy_region(__wrapped, index, &offset)
let subdata = CDispatch.dispatch_data_copy_region(__wrapped.__wrapped, index, &offset)

var ptr: UnsafePointer<Void>? = nil
var size = 0
Expand All @@ -197,13 +201,13 @@ public struct DispatchData : RandomAccessCollection {
/// - parameter range: The range to copy.
public func subdata(in range: CountableRange<Index>) -> DispatchData {
let subrange = CDispatch.dispatch_data_create_subrange(
__wrapped, range.startIndex, range.endIndex - range.startIndex)
__wrapped.__wrapped, range.startIndex, range.endIndex - range.startIndex)
return DispatchData(data: subrange)
}

public func region(location: Int) -> (data: DispatchData, offset: Int) {
var offset: Int = 0
let data = CDispatch.dispatch_data_copy_region(__wrapped, location, &offset)
let data = CDispatch.dispatch_data_copy_region(__wrapped.__wrapped, location, &offset)
return (DispatchData(data: data), offset)
}

Expand Down Expand Up @@ -237,7 +241,7 @@ public struct DispatchDataIterator : IteratorProtocol, Sequence {
public init(_data: DispatchData) {
var ptr: UnsafePointer<Void>?
self._count = 0
self._data = CDispatch.dispatch_data_create_map(_data.__wrapped, &ptr, &self._count)
self._data = __DispatchData(data: CDispatch.dispatch_data_create_map(_data.__wrapped.__wrapped, &ptr, &self._count))
self._ptr = UnsafePointer(ptr)
self._position = _data.startIndex

Expand All @@ -254,7 +258,7 @@ public struct DispatchDataIterator : IteratorProtocol, Sequence {
return element
}

internal let _data: dispatch_data_t
internal let _data: __DispatchData
internal var _ptr: UnsafePointer<UInt8>!
internal var _count: Int
internal var _position: DispatchData.Index
Expand Down
4 changes: 2 additions & 2 deletions src/swift/IO.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public extension DispatchIO {
}

public class func write(fromFileDescriptor: Int32, data: DispatchData, runningHandlerOn queue: DispatchQueue, handler: (data: DispatchData?, error: Int32) -> Void) {
dispatch_write(fromFileDescriptor, data.__wrapped, queue.__wrapped) { (data: dispatch_data_t?, error: Int32) in
dispatch_write(fromFileDescriptor, data.__wrapped.__wrapped, queue.__wrapped) { (data: dispatch_data_t?, error: Int32) in
handler(data: data.flatMap { DispatchData(data: $0) }, error: error)
}
}
Expand Down Expand Up @@ -82,7 +82,7 @@ public extension DispatchIO {
}

public func write(offset: off_t, data: DispatchData, queue: DispatchQueue, ioHandler: (done: Bool, data: DispatchData?, error: Int32) -> Void) {
dispatch_io_write(self.__wrapped, offset, data.__wrapped, queue.__wrapped) { (done: Bool, data: dispatch_data_t?, error: Int32) in
dispatch_io_write(self.__wrapped, offset, data.__wrapped.__wrapped, queue.__wrapped) { (done: Bool, data: dispatch_data_t?, error: Int32) in
ioHandler(done: done, data: data.flatMap { DispatchData(data: $0) }, error: error)
}
}
Expand Down
22 changes: 19 additions & 3 deletions src/swift/Wrapper.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,22 @@ extension DispatchSource : DispatchSourceProcess,
}
#endif

internal class __DispatchData : DispatchObject {
internal let __wrapped:dispatch_data_t

final internal override func wrapped() -> dispatch_object_t {
return unsafeBitCast(__wrapped, to: dispatch_object_t.self)
}

internal init(data:dispatch_data_t) {
__wrapped = data
}

deinit {
_swift_dispatch_release(wrapped())
}
}

public typealias DispatchSourceHandler = @convention(block) () -> Void

public protocol DispatchSourceType {
Expand Down Expand Up @@ -307,9 +323,9 @@ internal enum _OSQoSClass : UInt32 {
case 0x21: self = .QOS_CLASS_USER_INTERACTIVE
case 0x19: self = .QOS_CLASS_USER_INITIATED
case 0x15: self = .QOS_CLASS_DEFAULT
case 0x11: self = QOS_CLASS_UTILITY
case 0x09: self = QOS_CLASS_BACKGROUND
case 0x00: self = QOS_CLASS_UNSPECIFIED
case 0x11: self = .QOS_CLASS_UTILITY
case 0x09: self = .QOS_CLASS_BACKGROUND
case 0x00: self = .QOS_CLASS_UNSPECIFIED
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not related to primary DispatchData changes; fixing compiler warning (will be an error in Swift3).

default: return nil
}
}
Expand Down