git.iko.soy/obelisk
on master help sign in
Make commmand line argument handling more clear for ob profile

- Use list of strings for rts args - Move time handling to the profile function, out of argument handling

commit38e68c0fbd33805dc238af21d0f72f000b7df4ea authorMatthew Bauer <mjbauer95@gmail.com> dateWed 19 Feb 2020, 14:34 (7 years ago) parent42524b0
2 files changed+16−15
compare with master
unifiedsplit
lib/command/src/Obelisk/Command.hs+3−11 lib/command/src/Obelisk/Command/Run.hs+13−4
lib/command/src/Obelisk/Command.hs+3−11
@@ -16,8 +16,6 @@ import Data.List
1616import qualified Data.Text as T
1717import Data.Text.Encoding
1818import Data.Text.Encoding.Error (lenientDecode)
19−import Data.Time.Clock
20−import Data.Time.Format (formatTime, defaultTimeLocale)
2119import GHC.StaticPtr
2220import Options.Applicative
2321import Options.Applicative.Help.Pretty (text, (<$$>))
@@ -89,7 +87,7 @@ data ObCommand
8987 = ObCommand_Init InitSource Bool
9088 | ObCommand_Deploy DeployCommand
9189 | ObCommand_Run
92− | ObCommand_Profile (Maybe FilePath) String
90+ | ObCommand_Profile String [String]
9391 | ObCommand_Thunk ThunkCommand
9492 | ObCommand_Repl
9593 | ObCommand_Watch
@@ -111,7 +109,7 @@ obCommand cfg = hsubparser
111109 [ command "init" $ info (ObCommand_Init <$> initSource <*> initForce) $ progDesc "Initialize an Obelisk project"
112110 , command "deploy" $ info (ObCommand_Deploy <$> deployCommand cfg) $ progDesc "Prepare a deployment for an Obelisk project"
113111 , command "run" $ info (pure ObCommand_Run) $ progDesc "Run current project in development mode"
114− , command "profile" $ info (ObCommand_Profile <$> (optional (strOption (long "output" <> short 'o' <> help "Base output to use for profiling output. Suffixes are added to this based on the profiling type. Defaults to a timestamped path in the profile/ directory in the project's root." <> metavar "PATH"))) <*> (strOption (long "rts-flags" <> help "RTS Flags to pass to the executable." <> value "-p -hc" <> metavar "FLAGS" <> showDefault))) $ progDesc "Run current project with profiling enabled"
112+ , command "profile" $ info (ObCommand_Profile <$> (strOption (long "output" <> short 'o' <> help "Base output to use for profiling output. Suffixes are added to this based on the profiling type. Defaults to a timestamped path in the profile/ directory in the project's root." <> metavar "PATH" <> value "profile/%Y-%m-%dT%H:%M:%S" <> showDefault)) <*> (words <$> strOption (long "rts-flags" <> help "RTS Flags to pass to the executable." <> value "-p -hc" <> metavar "FLAGS" <> showDefault))) $ progDesc "Run current project with profiling enabled"
115113 , command "thunk" $ info (ObCommand_Thunk <$> thunkCommand) $ progDesc "Manipulate thunk directories"
116114 , command "repl" $ info (pure ObCommand_Repl) $ progDesc "Open an interactive interpreter"
117115 , command "watch" $ info (pure ObCommand_Watch) $ progDesc "Watch current project for errors and warnings"
@@ -370,13 +368,7 @@ ob = \case
370368 DeployCommand_Update -> deployUpdate "."
371369 DeployCommand_Test (platform, extraArgs) -> deployMobile platform extraArgs
372370 ObCommand_Run -> run
373− ObCommand_Profile mBasePath rtsFlags -> do
374− basePath <- case mBasePath of
375− Just path -> pure path
376− Nothing -> do
377− time <- liftIO $ getCurrentTime
378− pure $ "profile" </> formatTime defaultTimeLocale "%Y-%m-%dT%H:%M:%S" time
379− profile basePath rtsFlags
371+ ObCommand_Profile basePath rtsFlags -> profile basePath rtsFlags
380372 ObCommand_Thunk tc -> case tc of
381373 ThunkCommand_Update thunks config -> for_ thunks (updateThunkToLatest config)
382374 ThunkCommand_Unpack thunks -> for_ thunks unpackThunk
lib/command/src/Obelisk/Command/Run.hs+13−4
@@ -26,6 +26,8 @@ import qualified Data.Set as Set
2626import Data.String.Here (hereLit)
2727import Data.Text (Text)
2828import qualified Data.Text as T
29+import Data.Time.Clock
30+import Data.Time.Format (formatTime, defaultTimeLocale)
2931import Data.Traversable (for)
3032import Debug.Trace (trace)
3133import Distribution.Compiler (CompilerFlavor(..))
@@ -77,12 +79,19 @@ preprocessorIdentifier = "__preprocessor-apply-packages"
7779
7880profile
7981 :: MonadObelisk m
80− => FilePath
81− -> String
82+ => String
83+ -> [String]
8284 -> m ()
83−profile profileBaseName rtsFlags = withProjectRoot "." $ \root -> do
85+profile profileBasePattern rtsFlags = withProjectRoot "." $ \root -> do
8486 putLog Debug "Using profiled build of project."
87+
88+ time <- liftIO $ getCurrentTime
89+ let profileBaseName = formatTime defaultTimeLocale profileBasePattern time
90+
91+ putLog Debug $ T.pack $ "Storing profiled data under base name of " <> profileBaseName
92+
8593 liftIO $ createDirectoryIfMissing False $ takeDirectory profileBaseName
94+
8695 let nixBuildExpr = [hereLit|
8796with (import ./. {});
8897let
@@ -124,7 +133,7 @@ in obelisk.nixpkgs.runCommand "ob-run" {
124133 , profileBaseName
125134 , "+RTS"
126135 , "-po" <> profileBaseName
127− ] <> words rtsFlags
136+ ] <> rtsFlags
128137 <> [ "-RTS" ]
129138 _ <- liftIO $ waitForProcess ph
130139 pure ()