Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove race conditions #233

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove race conditions #233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions realize/cli.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ type (
Before Func `yaml:"-" json:"-"`
Change Func `yaml:"-" json:"-"`
Reload Func `yaml:"-" json:"-"`

mu sync.Mutex
}

// Context is used as argument for func
Expand Down
86 changes: 43 additions & 43 deletions realize/projects.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,12 @@ import (
"strconv"
"strings"
"sync"
"sync/atomic"
"time"

"github.com/fsnotify/fsnotify"
)

var (
msg string
out BufferOut
)
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why were these even global variables?


// Watch info
type Watch struct {
Exts []string `yaml:"extensions" json:"extensions"`
Expand Down Expand Up @@ -58,7 +54,7 @@ type Project struct {
last last
files int64
folders int64
init bool
init int32
Name string `yaml:"name" json:"name"`
Path string `yaml:"path" json:"path"`
Env map[string]string `yaml:"env,omitempty" json:"env,omitempty"`
Expand Down Expand Up @@ -134,8 +130,8 @@ func (p *Project) Before() {
}
}
// start message
msg = fmt.Sprintln(p.pname(p.Name, 1), ":", Blue.Bold("Watching"), Magenta.Bold(p.files), "file/s", Magenta.Bold(p.folders), "folder/s")
out = BufferOut{Time: time.Now(), Text: "Watching " + strconv.FormatInt(p.files, 10) + " files/s " + strconv.FormatInt(p.folders, 10) + " folder/s"}
msg := fmt.Sprintln(p.pname(p.Name, 1), ":", Blue.Bold("Watching"), Magenta.Bold(p.files), "file/s", Magenta.Bold(p.folders), "folder/s")
out := BufferOut{Time: time.Now(), Text: "Watching " + strconv.FormatInt(p.files, 10) + " files/s " + strconv.FormatInt(p.folders, 10) + " folder/s"}
p.stamp("log", out, msg, "")
}

Expand All @@ -146,8 +142,8 @@ func (p *Project) Err(err error) {
return
}
if err != nil {
msg = fmt.Sprintln(p.pname(p.Name, 2), ":", Red.Regular(err.Error()))
out = BufferOut{Time: time.Now(), Text: err.Error()}
msg := fmt.Sprintln(p.pname(p.Name, 2), ":", Red.Regular(err.Error()))
out := BufferOut{Time: time.Now(), Text: err.Error()}
p.stamp("error", out, msg, "")
}
}
Expand All @@ -164,8 +160,8 @@ func (p *Project) Change(event fsnotify.Event) {
ext = "DIR"
}
// change message
msg = fmt.Sprintln(p.pname(p.Name, 4), ":", Magenta.Bold(strings.ToUpper(ext)), "changed", Magenta.Bold(event.Name))
out = BufferOut{Time: time.Now(), Text: ext + " changed " + event.Name}
msg := fmt.Sprintln(p.pname(p.Name, 4), ":", Magenta.Bold(strings.ToUpper(ext)), "changed", Magenta.Bold(event.Name))
out := BufferOut{Time: time.Now(), Text: ext + " changed " + event.Name}
p.stamp("log", out, msg, "")
}

Expand All @@ -175,23 +171,20 @@ func (p *Project) Reload(path string, stop <-chan bool) {
p.parent.Reload(Context{Project: p, Watcher: p.watcher, Path: path, Stop: stop})
return
}
var done bool
var done int32
var install, build Response
go func() {
for {
select {
case <-stop:
done = true
return
}
select {
case <-stop:
atomic.StoreInt32(&done, 1)
}
}()
if done {
if atomic.LoadInt32(&done) == 1 {
return
}
// before command
p.cmd(stop, "before", false)
if done {
if atomic.LoadInt32(&done) == 1 {
return
}
// Go supported tools
Expand All @@ -206,34 +199,34 @@ func (p *Project) Reload(path string, stop <-chan bool) {
p.tools(stop, path, fi)
}
// Prevent fake events on polling startup
p.init = true
atomic.StoreInt32(&p.init, 1)
// prevent errors using realize without config with only run flag
if p.Tools.Run.Status && !p.Tools.Install.Status && !p.Tools.Build.Status {
p.Tools.Install.Status = true
}
if done {
if atomic.LoadInt32(&done) == 1 {
return
}
if p.Tools.Install.Status {
msg = fmt.Sprintln(p.pname(p.Name, 1), ":", Green.Regular(p.Tools.Install.name), "started")
out = BufferOut{Time: time.Now(), Text: p.Tools.Install.name + " started"}
msg := fmt.Sprintln(p.pname(p.Name, 1), ":", Green.Regular(p.Tools.Install.name), "started")
out := BufferOut{Time: time.Now(), Text: p.Tools.Install.name + " started"}
p.stamp("log", out, msg, "")
start := time.Now()
install = p.Tools.Install.Compile(p.Path, stop)
install.print(start, p)
}
if done {
if atomic.LoadInt32(&done) == 1 {
return
}
if p.Tools.Build.Status {
msg = fmt.Sprintln(p.pname(p.Name, 1), ":", Green.Regular(p.Tools.Build.name), "started")
out = BufferOut{Time: time.Now(), Text: p.Tools.Build.name + " started"}
msg := fmt.Sprintln(p.pname(p.Name, 1), ":", Green.Regular(p.Tools.Build.name), "started")
out := BufferOut{Time: time.Now(), Text: p.Tools.Build.name + " started"}
p.stamp("log", out, msg, "")
start := time.Now()
build = p.Tools.Build.Compile(p.Path, stop)
build.print(start, p)
}
if done {
if atomic.LoadInt32(&done) == 1 {
return
}
if install.Err == nil && build.Err == nil && p.Tools.Run.Status {
Expand Down Expand Up @@ -267,7 +260,7 @@ func (p *Project) Reload(path string, stop <-chan bool) {
}
}()
}
if done {
if atomic.LoadInt32(&done) == 1 {
return
}
p.cmd(stop, "after", false)
Expand Down Expand Up @@ -439,13 +432,13 @@ func (p *Project) tools(stop <-chan bool, path string, fi os.FileInfo) {
if fi.IsDir() {
path, _ = filepath.Abs(fi.Name())
}
msg = fmt.Sprintln(p.pname(p.Name, 2), ":", Red.Bold(r.Name), Red.Regular("there are some errors in"), ":", Magenta.Bold(path))
buff := BufferOut{Time: time.Now(), Text: "there are some errors in", Path: path, Type: r.Name, Stream: r.Err.Error()}
p.stamp("error", buff, msg, r.Err.Error())
msg := fmt.Sprintln(p.pname(p.Name, 2), ":", Red.Bold(r.Name), Red.Regular("there are some errors in"), ":", Magenta.Bold(path))
out := BufferOut{Time: time.Now(), Text: "there are some errors in", Path: path, Type: r.Name, Stream: r.Err.Error()}
p.stamp("error", out, msg, r.Err.Error())
} else if r.Out != "" {
msg = fmt.Sprintln(p.pname(p.Name, 3), ":", Red.Bold(r.Name), Red.Regular("outputs"), ":", Blue.Bold(path))
buff := BufferOut{Time: time.Now(), Text: "outputs", Path: path, Type: r.Name, Stream: r.Out}
p.stamp("out", buff, msg, r.Out)
msg := fmt.Sprintln(p.pname(p.Name, 3), ":", Red.Bold(r.Name), Red.Regular("outputs"), ":", Blue.Bold(path))
out := BufferOut{Time: time.Now(), Text: "outputs", Path: path, Type: r.Name, Stream: r.Out}
p.stamp("out", out, msg, r.Out)
}
}
}
Expand All @@ -471,7 +464,8 @@ func (p *Project) cmd(stop <-chan bool, flag string, global bool) {
case <-done:
return
case r := <-result:
msg = fmt.Sprintln(p.pname(p.Name, 5), ":", Green.Bold("Command"), Green.Bold("\"")+r.Name+Green.Bold("\""))
msg := fmt.Sprintln(p.pname(p.Name, 5), ":", Green.Bold("Command"), Green.Bold("\"")+r.Name+Green.Bold("\""))
var out BufferOut
if r.Err != nil {
out = BufferOut{Time: time.Now(), Text: r.Err.Error(), Type: flag}
p.stamp("error", out, msg, fmt.Sprint(Red.Regular(r.Err.Error())))
Expand All @@ -490,7 +484,7 @@ func (p *Project) walk(path string, info os.FileInfo, err error) error {
}

if p.Validate(path, true) {
result := p.watcher.Walk(path, p.init)
result := p.watcher.Walk(path, atomic.LoadInt32(&p.init) == 1)
if result != "" {
if p.parent.Settings.Recovery.Index {
log.Println("Indexing", path)
Expand Down Expand Up @@ -527,23 +521,29 @@ func (p *Project) stamp(t string, o BufferOut, msg string, stream string) {
content := []string{ctime.Format("2006-01-02 15:04:05"), strings.ToUpper(p.Name), ":", o.Text, "\r\n", stream}
switch t {
case "out":
p.parent.mu.Lock()
p.Buffer.StdOut = append(p.Buffer.StdOut, o)
p.parent.mu.Unlock()
if p.parent.Settings.Files.Outputs.Status {
f := p.parent.Settings.Create(p.Path, p.parent.Settings.Files.Outputs.Name)
if _, err := f.WriteString(strings.Join(content, " ")); err != nil {
p.parent.Settings.Fatal(err, "")
}
}
case "log":
p.parent.mu.Lock()
p.Buffer.StdLog = append(p.Buffer.StdLog, o)
p.parent.mu.Unlock()
if p.parent.Settings.Files.Logs.Status {
f := p.parent.Settings.Create(p.Path, p.parent.Settings.Files.Logs.Name)
if _, err := f.WriteString(strings.Join(content, " ")); err != nil {
p.parent.Settings.Fatal(err, "")
}
}
case "error":
p.parent.mu.Lock()
p.Buffer.StdErr = append(p.Buffer.StdErr, o)
p.parent.mu.Unlock()
if p.parent.Settings.Files.Errors.Status {
f := p.parent.Settings.Create(p.Path, p.parent.Settings.Files.Errors.Name)
if _, err := f.WriteString(strings.Join(content, " ")); err != nil {
Expand All @@ -562,7 +562,7 @@ func (p *Project) stamp(t string, o BufferOut, msg string, stream string) {
}()
}

func (p Project) buildEnvs() (envs []string) {
func (p *Project) buildEnvs() (envs []string) {
for k, v := range p.Env {
envs = append(envs, fmt.Sprintf("%s=%s", strings.Replace(k, "=", "", -1), v))
}
Expand Down Expand Up @@ -679,12 +679,12 @@ func (p *Project) run(path string, stream chan Response, stop <-chan bool) (err
// Print with time after
func (r *Response) print(start time.Time, p *Project) {
if r.Err != nil {
msg = fmt.Sprintln(p.pname(p.Name, 2), ":", Red.Bold(r.Name), "\n", r.Err.Error())
out = BufferOut{Time: time.Now(), Text: r.Err.Error(), Type: r.Name, Stream: r.Out}
msg := fmt.Sprintln(p.pname(p.Name, 2), ":", Red.Bold(r.Name), "\n", r.Err.Error())
out := BufferOut{Time: time.Now(), Text: r.Err.Error(), Type: r.Name, Stream: r.Out}
p.stamp("error", out, msg, r.Out)
} else {
msg = fmt.Sprintln(p.pname(p.Name, 5), ":", Green.Bold(r.Name), "completed in", Magenta.Regular(big.NewFloat(float64(time.Since(start).Seconds())).Text('f', 3), " s"))
out = BufferOut{Time: time.Now(), Text: r.Name + " in " + big.NewFloat(float64(time.Since(start).Seconds())).Text('f', 3) + " s"}
msg := fmt.Sprintln(p.pname(p.Name, 5), ":", Green.Bold(r.Name), "completed in", Magenta.Regular(big.NewFloat(float64(time.Since(start).Seconds())).Text('f', 3), " s"))
out := BufferOut{Time: time.Now(), Text: r.Name + " in " + big.NewFloat(float64(time.Since(start).Seconds())).Text('f', 3) + " s"}
p.stamp("log", out, msg, r.Out)
}
}
Expand Down
15 changes: 12 additions & 3 deletions realize/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,20 @@ type Server struct {
// Websocket projects
func (s *Server) projects(c echo.Context) (err error) {
websocket.Handler(func(ws *websocket.Conn) {
s.Parent.mu.Lock()
msg, _ := json.Marshal(s.Parent)
err = websocket.Message.Send(ws, string(msg))
s.Parent.mu.Unlock()

websocket.Message.Send(ws, string(msg))
go func() {
for {
select {
case <-s.Parent.Sync:
s.Parent.mu.Lock()
msg, _ := json.Marshal(s.Parent)
err = websocket.Message.Send(ws, string(msg))
s.Parent.mu.Unlock()

err := websocket.Message.Send(ws, string(msg))
if err != nil {
break
}
Expand All @@ -52,11 +58,14 @@ func (s *Server) projects(c echo.Context) (err error) {
for {
// Read
text := ""
err = websocket.Message.Receive(ws, &text)
err := websocket.Message.Receive(ws, &text)
if err != nil {
break
} else {
s.Parent.mu.Lock()
err := json.Unmarshal([]byte(text), &s.Parent)
s.Parent.mu.Unlock()

if err == nil {
s.Parent.Settings.Write(s.Parent)
break
Expand Down