mirror of
https://github.com/gohugoio/hugo.git
synced 2025-04-15 09:06:36 +00:00
Parallelizing the largest build processes (templates, pages, indexes). Seeing 300%+ improvement of total build time.
This commit is contained in:
parent
d84f707da1
commit
3dfb475136
2 changed files with 81 additions and 53 deletions
|
@ -27,6 +27,7 @@ import (
|
||||||
"io"
|
"io"
|
||||||
"os"
|
"os"
|
||||||
"strings"
|
"strings"
|
||||||
|
"sync"
|
||||||
"time"
|
"time"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -249,7 +250,13 @@ func (s *Site) CreatePages() (err error) {
|
||||||
if len(s.Source.Files()) < 1 {
|
if len(s.Source.Files()) < 1 {
|
||||||
return fmt.Errorf("No source files found in %s", s.absContentDir())
|
return fmt.Errorf("No source files found in %s", s.absContentDir())
|
||||||
}
|
}
|
||||||
for _, file := range s.Source.Files() {
|
|
||||||
|
var wg sync.WaitGroup
|
||||||
|
for _, fi := range s.Source.Files() {
|
||||||
|
wg.Add(1)
|
||||||
|
go func(file *source.File) (err error) {
|
||||||
|
defer wg.Done()
|
||||||
|
|
||||||
page, err := ReadFrom(file.Contents, file.LogicalName)
|
page, err := ReadFrom(file.Contents, file.LogicalName)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
|
@ -270,8 +277,12 @@ func (s *Site) CreatePages() (err error) {
|
||||||
if s.Config.BuildDrafts || !page.Draft {
|
if s.Config.BuildDrafts || !page.Draft {
|
||||||
s.Pages = append(s.Pages, page)
|
s.Pages = append(s.Pages, page)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return
|
||||||
|
}(fi)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
wg.Wait()
|
||||||
s.Pages.Sort()
|
s.Pages.Sort()
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
@ -368,8 +379,12 @@ func (s *Site) RenderAliases() error {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *Site) RenderPages() (err error) {
|
func (s *Site) RenderPages() (err error) {
|
||||||
for _, p := range s.Pages {
|
var wg sync.WaitGroup
|
||||||
|
for _, page := range s.Pages {
|
||||||
|
wg.Add(1)
|
||||||
|
go func(p *Page) (err error) {
|
||||||
var layout []string
|
var layout []string
|
||||||
|
defer wg.Done()
|
||||||
|
|
||||||
if !p.IsRenderable() {
|
if !p.IsRenderable() {
|
||||||
self := "__" + p.TargetPath()
|
self := "__" + p.TargetPath()
|
||||||
|
@ -383,17 +398,25 @@ func (s *Site) RenderPages() (err error) {
|
||||||
layout = append(layout, "_default/single.html")
|
layout = append(layout, "_default/single.html")
|
||||||
}
|
}
|
||||||
|
|
||||||
err := s.render(p, p.TargetPath(), layout...)
|
return s.render(p, p.TargetPath(), layout...)
|
||||||
|
}(page)
|
||||||
|
}
|
||||||
|
wg.Wait()
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
}
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *Site) RenderIndexes() error {
|
func (s *Site) RenderIndexes() (err error) {
|
||||||
|
var wg sync.WaitGroup
|
||||||
for singular, plural := range s.Config.Indexes {
|
for singular, plural := range s.Config.Indexes {
|
||||||
for k, o := range s.Indexes[plural] {
|
for key, oo := range s.Indexes[plural] {
|
||||||
|
wg.Add(1)
|
||||||
|
|
||||||
|
go func(k string, o WeightedPages) (err error) {
|
||||||
|
defer wg.Done()
|
||||||
n := s.NewNode()
|
n := s.NewNode()
|
||||||
n.Title = strings.Title(k)
|
n.Title = strings.Title(k)
|
||||||
base := plural + "/" + k
|
base := plural + "/" + k
|
||||||
|
@ -402,7 +425,7 @@ func (s *Site) RenderIndexes() error {
|
||||||
n.Data[singular] = o
|
n.Data[singular] = o
|
||||||
n.Data["Pages"] = o.Pages()
|
n.Data["Pages"] = o.Pages()
|
||||||
layout := "indexes/" + singular + ".html"
|
layout := "indexes/" + singular + ".html"
|
||||||
err := s.render(n, base+".html", layout)
|
err = s.render(n, base+".html", layout)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
@ -415,8 +438,11 @@ func (s *Site) RenderIndexes() error {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
return
|
||||||
|
}(key, oo)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
wg.Wait()
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
2
main.go
2
main.go
|
@ -15,8 +15,10 @@ package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"github.com/spf13/hugo/commands"
|
"github.com/spf13/hugo/commands"
|
||||||
|
"runtime"
|
||||||
)
|
)
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
|
runtime.GOMAXPROCS(runtime.NumCPU())
|
||||||
commands.Execute()
|
commands.Execute()
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue