Skip to content

SR-2656: extra releases of dispatch_data_t objects on Linux #175

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
Sep 22, 2016
Merged

SR-2656: extra releases of dispatch_data_t objects on Linux #175

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
10 changes: 7 additions & 3 deletions src/swift/Data.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,11 @@ public struct DispatchData : RandomAccessCollection {
}

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

internal init(borrowedData: dispatch_data_t) {
__wrapped = __DispatchData(data: borrowedData, owned: false)
}

public var count: Int {
Expand Down Expand Up @@ -110,7 +114,7 @@ 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.__wrapped, other.__wrapped.__wrapped)
__wrapped = __DispatchData(data: data)
__wrapped = __DispatchData(data: data, owned: true)
}

/// Append a buffer of bytes to the data.
Expand Down Expand Up @@ -244,7 +248,7 @@ public struct DispatchDataIterator : IteratorProtocol, Sequence {
public init(_data: DispatchData) {
var ptr: UnsafeRawPointer?
self._count = 0
self._data = __DispatchData(data: CDispatch.dispatch_data_create_map(_data.__wrapped.__wrapped, &ptr, &self._count))
self._data = __DispatchData(data: CDispatch.dispatch_data_create_map(_data.__wrapped.__wrapped, &ptr, &self._count), owned: true)
self._ptr = ptr
self._position = _data.startIndex

Expand Down
8 changes: 4 additions & 4 deletions src/swift/IO.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,13 @@ public extension DispatchIO {

public class func read(fromFileDescriptor: Int32, maxLength: Int, runningHandlerOn queue: DispatchQueue, handler: @escaping (_ data: DispatchData, _ error: Int32) -> Void) {
dispatch_read(fromFileDescriptor, maxLength, queue.__wrapped) { (data: dispatch_data_t, error: Int32) in
handler(DispatchData(data: data), error)
handler(DispatchData(borrowedData: data), error)
}
}

public class func write(toFileDescriptor: Int32, data: DispatchData, runningHandlerOn queue: DispatchQueue, handler: @escaping (_ data: DispatchData?, _ error: Int32) -> Void) {
dispatch_write(toFileDescriptor, data.__wrapped.__wrapped, queue.__wrapped) { (data: dispatch_data_t?, error: Int32) in
handler(data.flatMap { DispatchData(data: $0) }, error)
handler(data.flatMap { DispatchData(borrowedData: $0) }, error)
}
}

Expand Down Expand Up @@ -77,13 +77,13 @@ public extension DispatchIO {

public func read(offset: off_t, length: Int, queue: DispatchQueue, ioHandler: @escaping (_ done: Bool, _ data: DispatchData?, _ error: Int32) -> Void) {
dispatch_io_read(self.__wrapped, offset, length, queue.__wrapped) { (done: Bool, data: dispatch_data_t?, error: Int32) in
ioHandler(done, data.flatMap { DispatchData(data: $0) }, error)
ioHandler(done, data.flatMap { DispatchData(borrowedData: $0) }, error)
}
}

public func write(offset: off_t, data: DispatchData, queue: DispatchQueue, ioHandler: @escaping (_ done: Bool, _ data: DispatchData?, _ error: Int32) -> Void) {
dispatch_io_write(self.__wrapped, offset, data.__wrapped.__wrapped, queue.__wrapped) { (done: Bool, data: dispatch_data_t?, error: Int32) in
ioHandler(done, data.flatMap { DispatchData(data: $0) }, error)
ioHandler(done, data.flatMap { DispatchData(borrowedData: $0) }, error)
}
}

Expand Down
8 changes: 6 additions & 2 deletions src/swift/Wrapper.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,17 +192,21 @@ extension DispatchSource : DispatchSourceProcess,

internal class __DispatchData : DispatchObject {
internal let __wrapped:dispatch_data_t
internal let __owned:Bool

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

internal init(data:dispatch_data_t) {
internal init(data:dispatch_data_t, owned:Bool) {
__wrapped = data
__owned = owned
}

deinit {
_swift_dispatch_release(wrapped())
if __owned {
_swift_dispatch_release(wrapped())
}
}
}

Expand Down