mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove the EKG build flag, since Gentoo for some reason decided to enable this flag, depsite it not being intended for production use and so enabled by default.

Browse source
This commit is contained in:
Joey Hess 2016-07-06 15:09:56 -04:00
parent 6edb485ef1
commit 8b36d54319
Failed to extract signature
5 changed files with 15 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
BuildFlags.hs
View file

@ -78,10 +78,6 @@ buildFlags = filter (not . null)
#endif #endif
#ifdef WITH_MAGICMIME #ifdef WITH_MAGICMIME
, "MagicMime" , "MagicMime"
#endif
#ifdef WITH_EKG
#warning Building with EKG. This build of git-annex should only be used for performance debugging, not for production use..
, "EKG"
#endif #endif
-- Always enabled now, but users may be used to seeing these flags -- Always enabled now, but users may be used to seeing these flags
-- listed. -- listed.

3
CHANGELOG
View file

@ -9,6 +9,9 @@ git-annex (6.20160614) UNRELEASED; urgency=medium
* Remove unnecessary rpaths in the git-annex binary, but only when * Remove unnecessary rpaths in the git-annex binary, but only when
it's built using make, not cabal. it's built using make, not cabal.
This speeds up git-annex statup time by around 50%. This speeds up git-annex statup time by around 50%.
* Remove the EKG build flag, since Gentoo for some reason decided to
enable this flag, depsite it not being intended for production use and
so enabled by default.
-- Joey Hess <id@joeyh.name> Mon, 13 Jun 2016 21:52:24 -0400 -- Joey Hess <id@joeyh.name> Mon, 13 Jun 2016 21:52:24 -0400

9
CmdLine/GitAnnex.hs
View file

@ -119,9 +119,6 @@ import qualified Command.TestRemote
#ifdef WITH_BENCHMARK #ifdef WITH_BENCHMARK
import qualified Command.Benchmark import qualified Command.Benchmark
#endif #endif
#ifdef WITH_EKG
import System.Remote.Monitoring
#endif
cmds :: Parser TestOptions -> Maybe TestRunner -> [Command] cmds :: Parser TestOptions -> Maybe TestRunner -> [Command]
cmds testoptparser testrunner = cmds testoptparser testrunner =
@ -232,11 +229,7 @@ cmds testoptparser testrunner =
] ]
run :: Parser TestOptions -> Maybe TestRunner -> [String] -> IO () run :: Parser TestOptions -> Maybe TestRunner -> [String] -> IO ()
run testoptparser testrunner args = do run testoptparser testrunner args = go envmodes
#ifdef WITH_EKG
_ <- forkServer "localhost" 4242
#endif
go envmodes
where where
go [] = dispatch True args go [] = dispatch True args
(cmds testoptparser testrunner) (cmds testoptparser testrunner)

11
doc/bugs/bind__58___resource_busy___40__Address_already_in_use__41__/comment_3_65488c9eacd5c007151e35504aab92c9._comment Normal file
View file

@ -0,0 +1,11 @@
[[!comment format=mdwn
username="joey"
subject="""comment 3"""
date="2016-07-06T19:08:10Z"
content="""
Good greif, gentoo really does enable the ekg build flag.
Well, I removed the flag, I guess I need to be careful with exposing build
flags that are not for production use if there are distributions that
enable every possible flag willy-nilly.
"""]]

9
git-annex.cabal
View file

@ -292,10 +292,6 @@ Flag MagicMime
Flag ConcurrentOutput Flag ConcurrentOutput
Description: Use concurrent-output library Description: Use concurrent-output library
Flag EKG
Description: Enable use of EKG to monitor git-annex as it runs (at http://localhost:4242/)
Default: False
Flag Benchmark Flag Benchmark
Description: Enable benchmarking Description: Enable benchmarking
Default: False Default: False
@ -470,11 +466,6 @@ Executable git-annex
Build-Depends: concurrent-output (>= 1.6) Build-Depends: concurrent-output (>= 1.6)
CPP-Options: -DWITH_CONCURRENTOUTPUT CPP-Options: -DWITH_CONCURRENTOUTPUT
if flag(EKG)
Build-Depends: ekg
GHC-Options: -with-rtsopts=-T
CPP-Options: -DWITH_EKG
if flag(Benchmark) if flag(Benchmark)
Build-Depends: criterion, deepseq Build-Depends: criterion, deepseq
CPP-Options: -DWITH_BENCHMARK CPP-Options: -DWITH_BENCHMARK