Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

assistant: The ConfigMonitor left one zombie behind each time it chec…

…ked for changes, now fixed.
  • Loading branch information...
commit a5dded0401f1fe540b2a1b6edd7743f2cebc2f75 1 parent b543842
@joeyh authored
View
6 Git/Command.hs
@@ -94,6 +94,12 @@ pipeNullSplit params repo = do
where
sep = "\0"
+pipeNullSplitStrict :: [CommandParam] -> Repo -> IO [String]
+pipeNullSplitStrict params repo = do
+ s <- pipeReadStrict params repo
+ return $ filter (not . null) $ split sep s
+ where
+ sep = "\0"
pipeNullSplitZombie :: [CommandParam] -> Repo -> IO [String]
pipeNullSplitZombie params repo = leaveZombie <$> pipeNullSplit params repo
View
12 Git/LsTree.hs
@@ -29,15 +29,17 @@ data TreeItem = TreeItem
, file :: FilePath
} deriving Show
-{- Lists the complete contents of a tree. -}
+{- Lists the complete contents of a tree, with lazy output. -}
lsTree :: Ref -> Repo -> IO [TreeItem]
-lsTree t repo = map parseLsTree <$>
- pipeNullSplitZombie [Params "ls-tree --full-tree -z -r --", File $ show t] repo
+lsTree t repo = map parseLsTree <$> pipeNullSplitZombie ps repo
+ where
+ ps = [Params "ls-tree --full-tree -z -r --", File $ show t]
{- Lists specified files in a tree. -}
lsTreeFiles :: Ref -> [FilePath] -> Repo -> IO [TreeItem]
-lsTreeFiles t fs repo = map parseLsTree <$>
- pipeNullSplitZombie ([Params "ls-tree -z --", File $ show t] ++ map File fs) repo
+lsTreeFiles t fs repo = map parseLsTree <$> pipeNullSplitStrict ps repo
+ where
+ ps = [Params "ls-tree -z --", File $ show t] ++ map File fs
{- Parses a line of ls-tree output.
- (The --long format is not currently supported.) -}
View
2  debian/changelog
@@ -24,6 +24,8 @@ git-annex (4.20130315) UNRELEASED; urgency=low
* webapp: Improved alerts displayed when syncing with remotes, and
when syncing with a remote fails.
* webapp: Force wrap long filenames in transfer display.
+ * assistant: The ConfigMonitor left one zombie behind each time
+ it checked for changes, now fixed.
-- Joey Hess <joeyh@debian.org> Fri, 15 Mar 2013 00:10:07 -0400
View
4 doc/bugs/long_running_assistant_causes_resource_starvation_on_OSX.mdwn
@@ -24,3 +24,7 @@ Please provide any additional information below.
I'm really not sure what to look for next. Happy to take suggestions.
[!tag /design/assistant]]
+
+> [[done]], I found the zombie leak; the ConfigMonitor was
+> leaving one zombie every time it checked a push/pull.
+> Not a fast leak, but over time they would add up. --[[Joey]]
Please sign in to comment.
Something went wrong with that request. Please try again.