-
Notifications
You must be signed in to change notification settings - Fork 0
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
alexwishart
wants to merge
7
commits into
master
Choose a base branch
from
alex
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
1fdcf77
Adding function to test Data->String optimisation
a940a6f
Fix type
5ef6b85
New implementation for Data->String
e2c68bf
Remove print statement
70d78a5
Attempt to fix memory leak
a7026fc
Fix reference to pointer
05b2ddc
Revert accidental changes to StrignToData
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 | ||
|
@@ -129,10 +151,26 @@ func makeStringB(data: Data) -> String { | |
} ?? "" | ||
} | ||
|
||
func dataToString(data: Data) -> String { | ||
let holder = Holder(data: data) | ||
|
||
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? | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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 { | ||
|
@@ -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) | ||
} | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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.