Skip to content
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.

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

New function to implement Data -> String fastpath #1

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
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
54 changes: 53 additions & 1 deletion DataToString.swift
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,28 @@ let lock = DispatchSemaphore(value: 1)
var completeLoops:Int = 0
var RUNNING = true

class Holder {
var pointer: UnsafeMutablePointer<UInt8>!
var count: Int!


init(data: Data)
{
let rawData: UnsafePointer<UInt8>
rawData = data.withUnsafeBytes { (u8Ptr: UnsafePointer<UInt8>) in
return u8Ptr
}
let uint8Pointer = UnsafeMutablePointer<UInt8>.allocate(capacity: data.count)
uint8Pointer.initialize(from: rawData, count: data.count)
pointer = uint8Pointer
count = data.count
}

deinit {
pointer.deallocate(capacity: count)
}
}

func makeString(data: Data) -> String {
let array = Array(data) + [0]
return array.withUnsafeBytes { rawBuffer in
Expand All @@ -129,10 +151,26 @@ func makeStringB(data: Data) -> String {
} ?? ""
}

func dataToString(data: Data) -> String {
let holder = Holder(data: data)
Copy link
Owner

Choose a reason for hiding this comment

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

Need to either add a condition here that only goes down this path if the Data's encoding is ASCII / UTF8 (similar to Philippe's code). The condition might belong in here, or rename this function to indicate that it is specifically an ASCII fastpath.


let string = String(_StringCore(
baseAddress: holder.pointer,
count: Int(data.count),
elementShift: 0,
hasCocoaBuffer: false,
owner: holder
))

return string
}


// Block to be scheduled
func code(block: Int, loops: Int) -> () -> Void {
return {
var string: String?
var nsstring: NSString?
Copy link
Owner

Choose a reason for hiding this comment

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

can you remove this (unused) ref + the commented block? I suspect method 0 is also not required.

let lDATA = DATAS[block-1]
if METHOD == 1 {
for _ in 1...EFFORT {
Expand All @@ -142,7 +180,21 @@ return {
for _ in 1...EFFORT {
string = makeString(data: lDATA)
}
} else {
} else if METHOD == 0 {
for _ in 1...EFFORT {
string = String(repeating: "a", count: 6)
}
// } else if METHOD == 3 {
// for _ in 1...EFFORT {
// nsstring = NSString(data: lDATA, encoding: Encoding.utf8.rawValue)!
// }
}
else if METHOD == 3 {
for _ in 1...EFFORT {
string = dataToString(data: lDATA)
}
}
else {
for _ in 1...EFFORT {
string = makeStringB(data: lDATA)
}
Expand Down