diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2017-01-31 18:40:42 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-01-31 19:06:22 -0400 |
| commit | 7fd21be7f967bdc21530b730f595379b23fe1174 (patch) | |
| tree | d2af9101541d8166b2035271967bb3ac01751e36 /Command | |
| parent | 164466c987a7607a5f598b36e5b3111a68bd101f (diff) | |
Some optimisations to string splitting code.
Turns out that Data.List.Utils.split is slow and makes a lot of
allocations. Here's a much simpler single character splitter that behaves
the same (even in wacky corner cases) while running in half the time and
75% the allocations.
As well as being an optimisation, this helps move toward eliminating use of
missingh.
(Data.List.Split.splitOn is nearly as slow as Data.List.Utils.split and
allocates even more.)
I have not benchmarked the effect on git-annex, but would not be surprised
to see some parsing of eg, large streams from git commands run twice as
fast, and possibly in less memory.
This commit was sponsored by Boyd Stephen Smith Jr. on Patreon.
Diffstat (limited to 'Command')
| -rw-r--r-- | Command/AddUrl.hs | 2 | ||||
| -rw-r--r-- | Command/Map.hs | 2 | ||||
| -rw-r--r-- | Command/Unused.hs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Command/AddUrl.hs b/Command/AddUrl.hs index 8cc148440..169875f4b 100644 --- a/Command/AddUrl.hs +++ b/Command/AddUrl.hs @@ -387,7 +387,7 @@ url2file url pathdepth pathmax = case pathdepth of ] frombits a = intercalate "/" $ a urlbits urlbits = map (truncateFilePath pathmax . sanitizeFilePath) $ - filter (not . null) $ split "/" fullurl + filter (not . null) $ splitc '/' fullurl urlString2file :: URLString -> Maybe Int -> Int -> FilePath urlString2file s pathdepth pathmax = case Url.parseURIRelaxed s of diff --git a/Command/Map.hs b/Command/Map.hs index 43c00d257..b04beb477 100644 --- a/Command/Map.hs +++ b/Command/Map.hs @@ -92,7 +92,7 @@ hostname r | otherwise = "localhost" basehostname :: Git.Repo -> String -basehostname r = fromMaybe "" $ headMaybe $ split "." $ hostname r +basehostname r = fromMaybe "" $ headMaybe $ splitc '.' $ hostname r {- A name to display for a repo. Uses the name from uuid.log if available, - or the remote name if not. -} diff --git a/Command/Unused.hs b/Command/Unused.hs index 1711fe047..3953f4486 100644 --- a/Command/Unused.hs +++ b/Command/Unused.hs @@ -269,7 +269,7 @@ withKeysReferencedDiff a getdiff extractsha = do forM_ ds go liftIO $ void clean where - go d = do + go d = do let sha = extractsha d unless (sha == nullSha) $ (parseLinkOrPointer <$> catObject sha) |