MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-10-30 00:05:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Stop profiling on exit of main goroutine (#1670)

Browse Source 
* Stop profiling on exit of main goroutine

Previously, profiling was stopped since Stop() method was called on exit of cli.BeforeFunc.
This lead to profiling to be stopped prematurely.

* Moved profiling switch statement to a separate func
This commit is contained in:
Krishnan Parthasarathi 2016-05-20 03:20:54 +05:30 committed by Harshavardhana
parent dc36594ef4
commit 2f05aacbf2
1 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
main.go
View File

@ -150,6 +150,19 @@ func mustGetProfilePath() string {
return filepath.Join(mustGetConfigPath(), globalMinioProfilePath)
}
func setupProfilingFromEnv(profiler *interface {
Stop()
}) {
switch os.Getenv("MINIO_PROFILER") {
case "cpu":
*profiler = profile.Start(profile.CPUProfile, profile.ProfilePath(mustGetProfilePath()))
case "mem":
*profiler = profile.Start(profile.MemProfile, profile.ProfilePath(mustGetProfilePath()))
case "block":
*profiler = profile.Start(profile.BlockProfile, profile.ProfilePath(mustGetProfilePath()))
}
}
func main() {
// Set global trace flag.
trace := os.Getenv("MINIO_TRACE")
@ -159,6 +172,9 @@ func main() {
probe.SetAppInfo("Release-Tag", minioReleaseTag)
probe.SetAppInfo("Commit-ID", minioShortCommitID)
var profiler interface {
Stop()
}
app := registerApp()
app.Before = func(c *cli.Context) error {
// Sets new config folder.
@ -195,18 +211,20 @@ func main() {
// Enable profiling supported modes are [cpu, mem, block].
// ``MINIO_PROFILER`` supported options are [cpu, mem, block].
switch os.Getenv("MINIO_PROFILER") {
case "cpu":
defer profile.Start(profile.CPUProfile, profile.ProfilePath(mustGetProfilePath())).Stop()
case "mem":
defer profile.Start(profile.MemProfile, profile.ProfilePath(mustGetProfilePath())).Stop()
case "block":
defer profile.Start(profile.BlockProfile, profile.ProfilePath(mustGetProfilePath())).Stop()
}
setupProfilingFromEnv(&profiler)
// Return here.
return nil
}
// Stop profiling on exit.
// N B If any inner function calls os.Exit() the defer(s) stacked wouldn't be called
defer func() {
if profiler != nil {
profiler.Stop()
}
}()
// Run the app - exit on error.
app.RunAndExitOnError()
}