2015-12-07 13:57:01 -05:00
|
|
|
// Copyright 2015 The Hugo Authors. All rights reserved.
|
2013-09-29 02:09:03 -04:00
|
|
|
//
|
2015-11-23 22:16:36 -05:00
|
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
2013-09-29 02:09:03 -04:00
|
|
|
// you may not use this file except in compliance with the License.
|
|
|
|
// You may obtain a copy of the License at
|
2015-11-23 22:16:36 -05:00
|
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
2013-09-29 02:09:03 -04:00
|
|
|
//
|
|
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
|
|
// See the License for the specific language governing permissions and
|
|
|
|
// limitations under the License.
|
|
|
|
|
|
|
|
package commands
|
|
|
|
|
|
|
|
import (
|
|
|
|
"os"
|
2016-11-18 18:06:54 -05:00
|
|
|
"runtime"
|
2013-09-29 02:09:03 -04:00
|
|
|
"runtime/pprof"
|
2016-11-18 18:06:54 -05:00
|
|
|
"time"
|
2016-02-13 07:46:08 -05:00
|
|
|
|
|
|
|
"github.com/spf13/cobra"
|
2016-11-18 18:06:54 -05:00
|
|
|
jww "github.com/spf13/jwalterweatherman"
|
2013-09-29 02:09:03 -04:00
|
|
|
)
|
|
|
|
|
2016-02-05 12:41:40 -05:00
|
|
|
var (
|
|
|
|
benchmarkTimes int
|
2016-11-18 18:06:54 -05:00
|
|
|
cpuProfileFile string
|
|
|
|
memProfileFile string
|
2016-02-05 12:41:40 -05:00
|
|
|
)
|
2013-09-29 02:09:03 -04:00
|
|
|
|
2015-12-02 13:56:36 -05:00
|
|
|
var benchmarkCmd = &cobra.Command{
|
2013-09-29 02:09:03 -04:00
|
|
|
Use: "benchmark",
|
2016-06-09 10:03:25 -04:00
|
|
|
Short: "Benchmark Hugo by building a site a number of times.",
|
2015-08-04 05:15:12 -04:00
|
|
|
Long: `Hugo can build a site many times over and analyze the running process
|
|
|
|
creating a benchmark.`,
|
2013-09-29 02:09:03 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
func init() {
|
2016-02-05 12:41:40 -05:00
|
|
|
initHugoBuilderFlags(benchmarkCmd)
|
2016-02-05 15:30:48 -05:00
|
|
|
initBenchmarkBuildingFlags(benchmarkCmd)
|
2015-12-02 14:00:47 -05:00
|
|
|
|
2016-11-18 18:06:54 -05:00
|
|
|
benchmarkCmd.Flags().StringVar(&cpuProfileFile, "cpuprofile", "", "path/filename for the CPU profile file")
|
|
|
|
benchmarkCmd.Flags().StringVar(&memProfileFile, "memprofile", "", "path/filename for the memory profile file")
|
2015-12-02 13:56:36 -05:00
|
|
|
benchmarkCmd.Flags().IntVarP(&benchmarkTimes, "count", "n", 13, "number of times to build the site")
|
2015-12-02 14:00:47 -05:00
|
|
|
|
|
|
|
benchmarkCmd.RunE = benchmark
|
2013-09-29 02:09:03 -04:00
|
|
|
}
|
|
|
|
|
2015-12-02 14:00:47 -05:00
|
|
|
func benchmark(cmd *cobra.Command, args []string) error {
|
:sparkles: Implement Page bundling and image handling
This commit is not the smallest in Hugo's history.
Some hightlights include:
* Page bundles (for complete articles, keeping images and content together etc.).
* Bundled images can be processed in as many versions/sizes as you need with the three methods `Resize`, `Fill` and `Fit`.
* Processed images are cached inside `resources/_gen/images` (default) in your project.
* Symbolic links (both files and dirs) are now allowed anywhere inside /content
* A new table based build summary
* The "Total in nn ms" now reports the total including the handling of the files inside /static. So if it now reports more than you're used to, it is just **more real** and probably faster than before (see below).
A site building benchmark run compared to `v0.31.1` shows that this should be slightly faster and use less memory:
```bash
▶ ./benchSite.sh "TOML,num_langs=.*,num_root_sections=5,num_pages=(500|1000),tags_per_page=5,shortcodes,render"
benchmark old ns/op new ns/op delta
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 101785785 78067944 -23.30%
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 185481057 149159919 -19.58%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 103149918 85679409 -16.94%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 203515478 169208775 -16.86%
benchmark old allocs new allocs delta
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 532464 391539 -26.47%
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 1056549 772702 -26.87%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 555974 406630 -26.86%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 1086545 789922 -27.30%
benchmark old bytes new bytes delta
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 53243246 43598155 -18.12%
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 105811617 86087116 -18.64%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 54558852 44545097 -18.35%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 106903858 86978413 -18.64%
```
Fixes #3651
Closes #3158
Fixes #1014
Closes #2021
Fixes #1240
Updates #3757
2017-07-24 03:00:23 -04:00
|
|
|
c, err := InitializeConfig(false, nil, benchmarkCmd)
|
2017-03-25 09:37:04 -04:00
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
2017-01-10 04:55:03 -05:00
|
|
|
|
2016-11-18 18:06:54 -05:00
|
|
|
var memProf *os.File
|
|
|
|
if memProfileFile != "" {
|
|
|
|
memProf, err = os.Create(memProfileFile)
|
2015-02-05 09:48:09 -05:00
|
|
|
if err != nil {
|
2015-12-02 05:42:53 -05:00
|
|
|
return err
|
2015-02-05 09:48:09 -05:00
|
|
|
}
|
2016-11-18 18:06:54 -05:00
|
|
|
}
|
2013-09-29 02:09:03 -04:00
|
|
|
|
2016-11-18 18:06:54 -05:00
|
|
|
var cpuProf *os.File
|
|
|
|
if cpuProfileFile != "" {
|
|
|
|
cpuProf, err = os.Create(cpuProfileFile)
|
2015-02-05 09:48:09 -05:00
|
|
|
if err != nil {
|
2015-12-02 05:42:53 -05:00
|
|
|
return err
|
2015-02-05 09:48:09 -05:00
|
|
|
}
|
2016-11-18 18:06:54 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
var memStats runtime.MemStats
|
|
|
|
runtime.ReadMemStats(&memStats)
|
|
|
|
memAllocated := memStats.TotalAlloc
|
|
|
|
mallocs := memStats.Mallocs
|
|
|
|
if cpuProf != nil {
|
|
|
|
pprof.StartCPUProfile(cpuProf)
|
|
|
|
}
|
2015-02-05 09:48:09 -05:00
|
|
|
|
2016-11-18 18:06:54 -05:00
|
|
|
t := time.Now()
|
|
|
|
for i := 0; i < benchmarkTimes; i++ {
|
:sparkles: Implement Page bundling and image handling
This commit is not the smallest in Hugo's history.
Some hightlights include:
* Page bundles (for complete articles, keeping images and content together etc.).
* Bundled images can be processed in as many versions/sizes as you need with the three methods `Resize`, `Fill` and `Fit`.
* Processed images are cached inside `resources/_gen/images` (default) in your project.
* Symbolic links (both files and dirs) are now allowed anywhere inside /content
* A new table based build summary
* The "Total in nn ms" now reports the total including the handling of the files inside /static. So if it now reports more than you're used to, it is just **more real** and probably faster than before (see below).
A site building benchmark run compared to `v0.31.1` shows that this should be slightly faster and use less memory:
```bash
▶ ./benchSite.sh "TOML,num_langs=.*,num_root_sections=5,num_pages=(500|1000),tags_per_page=5,shortcodes,render"
benchmark old ns/op new ns/op delta
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 101785785 78067944 -23.30%
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 185481057 149159919 -19.58%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 103149918 85679409 -16.94%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 203515478 169208775 -16.86%
benchmark old allocs new allocs delta
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 532464 391539 -26.47%
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 1056549 772702 -26.87%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 555974 406630 -26.86%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 1086545 789922 -27.30%
benchmark old bytes new bytes delta
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 53243246 43598155 -18.12%
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 105811617 86087116 -18.64%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 54558852 44545097 -18.35%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 106903858 86978413 -18.64%
```
Fixes #3651
Closes #3158
Fixes #1014
Closes #2021
Fixes #1240
Updates #3757
2017-07-24 03:00:23 -04:00
|
|
|
if err = c.resetAndBuildSites(); err != nil {
|
2016-11-18 18:06:54 -05:00
|
|
|
return err
|
2015-02-05 09:48:09 -05:00
|
|
|
}
|
2013-09-29 02:09:03 -04:00
|
|
|
}
|
2016-11-18 18:06:54 -05:00
|
|
|
totalTime := time.Since(t)
|
2015-02-05 09:48:09 -05:00
|
|
|
|
2016-11-18 18:06:54 -05:00
|
|
|
if memProf != nil {
|
|
|
|
pprof.WriteHeapProfile(memProf)
|
|
|
|
memProf.Close()
|
|
|
|
}
|
|
|
|
if cpuProf != nil {
|
|
|
|
pprof.StopCPUProfile()
|
|
|
|
cpuProf.Close()
|
|
|
|
}
|
|
|
|
|
|
|
|
runtime.ReadMemStats(&memStats)
|
|
|
|
totalMemAllocated := memStats.TotalAlloc - memAllocated
|
|
|
|
totalMallocs := memStats.Mallocs - mallocs
|
2015-12-02 05:42:53 -05:00
|
|
|
|
2016-11-18 18:06:54 -05:00
|
|
|
jww.FEEDBACK.Println()
|
|
|
|
jww.FEEDBACK.Printf("Average time per operation: %vms\n", int(1000*totalTime.Seconds()/float64(benchmarkTimes)))
|
|
|
|
jww.FEEDBACK.Printf("Average memory allocated per operation: %vkB\n", totalMemAllocated/uint64(benchmarkTimes)/1024)
|
|
|
|
jww.FEEDBACK.Printf("Average allocations per operation: %v\n", totalMallocs/uint64(benchmarkTimes))
|
|
|
|
|
|
|
|
return nil
|
2013-09-29 02:09:03 -04:00
|
|
|
}
|