Skip to content

Commit

Permalink
alert: Add optimizations (thrasher-corp#939)
Browse files Browse the repository at this point in the history
* alert: Add optimizations

* alert: add basic benchmarks

* alert: fix linter issue

* documentation: change to text/template as html/template escapes to protect against code injection. Add readme.md for alert.

* README: Add package name

* alert: link up with engine settings

* request: isVerbose refactor

* Update exchanges/alert/alert_test.go

Co-authored-by: Scott <[email protected]>

* Update exchanges/alert/alert.go

Co-authored-by: Scott <[email protected]>

* glorious: nits

* glorious: fun police

* documentation: regen

Co-authored-by: Ryan O'Hara-Reid <[email protected]>
Co-authored-by: Scott <[email protected]>
  • Loading branch information
3 people authored Jul 1, 2022
1 parent 1736c1e commit 68db415
Show file tree
Hide file tree
Showing 11 changed files with 413 additions and 61 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -144,10 +144,10 @@ Binaries will be published once the codebase reaches a stable condition.
|User|Contribution Amount|
|--|--|
| [thrasher-](https://github.com/thrasher-) | 666 |
| [shazbert](https://github.com/shazbert) | 249 |
| [gloriousCode](https://github.com/gloriousCode) | 195 |
| [shazbert](https://github.com/shazbert) | 256 |
| [gloriousCode](https://github.com/gloriousCode) | 196 |
| [dependabot-preview[bot]](https://github.com/apps/dependabot-preview) | 88 |
| [dependabot[bot]](https://github.com/apps/dependabot) | 73 |
| [dependabot[bot]](https://github.com/apps/dependabot) | 88 |
| [xtda](https://github.com/xtda) | 47 |
| [lrascao](https://github.com/lrascao) | 27 |
| [Rots](https://github.com/Rots) | 15 |
Expand Down
14 changes: 8 additions & 6 deletions cmd/documentation/documentation.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ import (
"errors"
"flag"
"fmt"
"html/template"
"log"
"net/http"
"os"
"path/filepath"
"strings"
"text/template"
"time"

"github.com/thrasher-corp/gocryptotrader/common"
Expand Down Expand Up @@ -430,14 +430,16 @@ func GetTemplateFiles() (*template.Template, error) {
return nil
}

var parseError error
tmpl, parseError = tmpl.ParseGlob(filepath.Join(path, "*.tmpl"))
if parseError != nil {
if strings.Contains(parseError.Error(), "pattern matches no files") {
var tmplExt *template.Template
tmplExt, err = tmpl.ParseGlob(filepath.Join(path, "*.tmpl"))
if err != nil {
fmt.Println(err)
if strings.Contains(err.Error(), "pattern matches no files") {
return nil
}
return parseError
return err
}
tmpl = tmplExt
return filepath.SkipDir
}
return nil
Expand Down
92 changes: 92 additions & 0 deletions cmd/documentation/exchanges_templates/alert.tmpl
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
{{define "exchanges alert" -}}
{{template "header" .}}
## Alert

+ This package allows for multiple routines to wait for a state change on any required data.

### Examples:

+ Implementation:

```go
// SomeChangingType defines an example struct with an embedded alert.Notice
// type for easy access to the notice methods.
type SomeChangingType struct {
ValueThatChanges int64
alert.Notice
mu sync.Mutex // Protection for routine shenanigans
}

// Update will update in a separate routine
func (s *SomeChangingType) Update(newValue int64) {
// This simulates a changing variable or state
s.mu.Lock()
s.ValueThatChanges = newValue
// This will alert any routines that are currently waiting for a change
s.Alert()
s.mu.Unlock()
}

// WhatsTheValue will retrieve the value that was changed and should be
// different from the past value. Efficiency++
func (s *SomeChangingType) WhatsTheValue() int64 {
s.mu.Lock()
value := s.ValueThatChanges
s.mu.Unlock()
return value
}
```

+ Routine waiting for change:

```go
// ExampleRoutineThatWaits defines an exchange potential routine that will wait
// for an impending change.
func ExampleRoutineThatWaits(potentialChange *SomeChangingType) {
// Every iteration requires a Wait() call.
for range potentialChange.Wait(nil) {
val := potentialChange.WhatsTheValue()
fmt.Println("Value:", val)
}
}

// AnotherExampleRoutineThatWaits defines an exchange potential routine that
// will wait for an impending change.
func AnotherExampleRoutineThatWaits(potentialChange *SomeChangingType) {
// Every iteration requires a Wait() call.
for {
select {
case <-potentialChange.Wait(nil):
val := potentialChange.WhatsTheValue()
fmt.Println("Value:", val)
case <-shutdownChannel:
fmt.Println("Good-Bye!")
return
}
}
}


// WARNING: PLEASE DON'T DO THIS.
// This will stop alerting for this specific data type due to the shared nature
// of the underlying channels using a sync.Pool.
func ABadExampleRoutineThatWaits(potentialChange *SomeChangingType) {
capturedChannel := potentialChange.Wait(nil)
for {
select {
case <-capturedChannel:
// This will produce incorrect results or no change.
val := potentialChange.WhatsTheValue()
fmt.Println("Value:", val)
case <-shutdownChannel:
fmt.Println("Good-Bye!")
return
}
}
}
```

### Please click GoDocs chevron above to view current GoDoc information for this package
{{template "contributions"}}
{{template "donations" .}}
{{end}}
2 changes: 1 addition & 1 deletion common/math/math_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ func TestCalculatePercentageGainOrLoss(t *testing.T) {
actualResult := CalculatePercentageGainOrLoss(originalInput, secondInput)
if expectedOutput != actualResult {
t.Errorf(
"Expected '%f'. Actual '%f'.", expectedOutput, actualResult)
"Expected '%v'. Actual '%v'.", expectedOutput, actualResult)
}
}

Expand Down
11 changes: 11 additions & 0 deletions engine/engine.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import (
"github.com/thrasher-corp/gocryptotrader/currency"
"github.com/thrasher-corp/gocryptotrader/dispatch"
exchange "github.com/thrasher-corp/gocryptotrader/exchanges"
"github.com/thrasher-corp/gocryptotrader/exchanges/alert"
"github.com/thrasher-corp/gocryptotrader/exchanges/asset"
"github.com/thrasher-corp/gocryptotrader/exchanges/request"
"github.com/thrasher-corp/gocryptotrader/exchanges/trade"
Expand Down Expand Up @@ -250,6 +251,15 @@ func validateSettings(b *Engine, s *Settings, flagSet FlagSet) {
err)
}
}

if b.Settings.AlertSystemPreAllocationCommsBuffer != alert.PreAllocCommsDefaultBuffer {
err = alert.SetPreAllocationCommsBuffer(b.Settings.AlertSystemPreAllocationCommsBuffer)
if err != nil {
gctlog.Errorf(gctlog.Global, "Could not set alert pre-allocation comms buffer to %v: %v",
b.Settings.AlertSystemPreAllocationCommsBuffer,
err)
}
}
}

// PrintSettings returns the engine settings
Expand Down Expand Up @@ -309,6 +319,7 @@ func PrintSettings(s *Settings) {
gctlog.Debugf(gctlog.Global, "\t Max HTTP request jobs: %v", s.MaxHTTPRequestJobsLimit)
gctlog.Debugf(gctlog.Global, "\t HTTP request max retry attempts: %v", s.RequestMaxRetryAttempts)
gctlog.Debugf(gctlog.Global, "\t Trade buffer processing interval: %v", s.TradeBufferProcessingInterval)
gctlog.Debugf(gctlog.Global, "\t Alert communications channel pre-allocation buffer size: %v", s.AlertSystemPreAllocationCommsBuffer)
gctlog.Debugf(gctlog.Global, "\t HTTP timeout: %v", s.HTTPTimeout)
gctlog.Debugf(gctlog.Global, "\t HTTP user agent: %v", s.HTTPUserAgent)
gctlog.Debugf(gctlog.Global, "- GCTSCRIPT SETTINGS: ")
Expand Down
23 changes: 12 additions & 11 deletions engine/engine_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -60,17 +60,18 @@ type Settings struct {
EnableExchangeRateHost bool

// Exchange tuning settings
EnableExchangeHTTPRateLimiter bool
EnableExchangeHTTPDebugging bool
EnableExchangeVerbose bool
ExchangePurgeCredentials bool
EnableExchangeAutoPairUpdates bool
DisableExchangeAutoPairUpdates bool
EnableExchangeRESTSupport bool
EnableExchangeWebsocketSupport bool
MaxHTTPRequestJobsLimit int
TradeBufferProcessingInterval time.Duration
RequestMaxRetryAttempts int
EnableExchangeHTTPRateLimiter bool
EnableExchangeHTTPDebugging bool
EnableExchangeVerbose bool
ExchangePurgeCredentials bool
EnableExchangeAutoPairUpdates bool
DisableExchangeAutoPairUpdates bool
EnableExchangeRESTSupport bool
EnableExchangeWebsocketSupport bool
MaxHTTPRequestJobsLimit int
TradeBufferProcessingInterval time.Duration
RequestMaxRetryAttempts int
AlertSystemPreAllocationCommsBuffer int // See exchanges/alert.go

// Global HTTP related settings
GlobalHTTPTimeout time.Duration
Expand Down
126 changes: 126 additions & 0 deletions exchanges/alert/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,126 @@
# GoCryptoTrader package Alert

<img src="/common/gctlogo.png?raw=true" width="350px" height="350px" hspace="70">


[![Build Status](https://github.com/thrasher-corp/gocryptotrader/actions/workflows/tests.yml/badge.svg?branch=master)](https://github.com/thrasher-corp/gocryptotrader/actions/workflows/tests.yml)
[![Software License](https://img.shields.io/badge/License-MIT-orange.svg?style=flat-square)](https://github.com/thrasher-corp/gocryptotrader/blob/master/LICENSE)
[![GoDoc](https://godoc.org/github.com/thrasher-corp/gocryptotrader?status.svg)](https://godoc.org/github.com/thrasher-corp/gocryptotrader/exchanges/alert)
[![Coverage Status](http://codecov.io/github/thrasher-corp/gocryptotrader/coverage.svg?branch=master)](http://codecov.io/github/thrasher-corp/gocryptotrader?branch=master)
[![Go Report Card](https://goreportcard.com/badge/github.com/thrasher-corp/gocryptotrader)](https://goreportcard.com/report/github.com/thrasher-corp/gocryptotrader)


This alert package is part of the GoCryptoTrader codebase.

## This is still in active development

You can track ideas, planned features and what's in progress on this Trello board: [https://trello.com/b/ZAhMhpOy/gocryptotrader](https://trello.com/b/ZAhMhpOy/gocryptotrader).

Join our slack to discuss all things related to GoCryptoTrader! [GoCryptoTrader Slack](https://join.slack.com/t/gocryptotrader/shared_invite/enQtNTQ5NDAxMjA2Mjc5LTc5ZDE1ZTNiOGM3ZGMyMmY1NTAxYWZhODE0MWM5N2JlZDk1NDU0YTViYzk4NTk3OTRiMDQzNGQ1YTc4YmRlMTk)

## Alert

+ This package allows for multiple routines to wait for a state change on any required data.

### Examples:

+ Implementation:

```go
// SomeChangingType defines an example struct with an embedded alert.Notice
// type for easy access to the notice methods.
type SomeChangingType struct {
ValueThatChanges int64
alert.Notice
mu sync.Mutex // Protection for routine shenanigans
}

// Update will update in a separate routine
func (s *SomeChangingType) Update(newValue int64) {
// This simulates a changing variable or state
s.mu.Lock()
s.ValueThatChanges = newValue
// This will alert any routines that are currently waiting for a change
s.Alert()
s.mu.Unlock()
}

// WhatsTheValue will retrieve the value that was changed and should be
// different from the past value. Efficiency++
func (s *SomeChangingType) WhatsTheValue() int64 {
s.mu.Lock()
value := s.ValueThatChanges
s.mu.Unlock()
return value
}
```

+ Routine waiting for change:

```go
// ExampleRoutineThatWaits defines an exchange potential routine that will wait
// for an impending change.
func ExampleRoutineThatWaits(potentialChange *SomeChangingType) {
// Every iteration requires a Wait() call.
for range potentialChange.Wait(nil) {
val := potentialChange.WhatsTheValue()
fmt.Println("Value:", val)
}
}

// AnotherExampleRoutineThatWaits defines an exchange potential routine that
// will wait for an impending change.
func AnotherExampleRoutineThatWaits(potentialChange *SomeChangingType) {
// Every iteration requires a Wait() call.
for {
select {
case <-potentialChange.Wait(nil):
val := potentialChange.WhatsTheValue()
fmt.Println("Value:", val)
case <-shutdownChannel:
fmt.Println("Good-Bye!")
return
}
}
}


// WARNING: PLEASE DON'T DO THIS.
// This will stop alerting for this specific data type due to the shared nature
// of the underlying channels using a sync.Pool.
func ABadExampleRoutineThatWaits(potentialChange *SomeChangingType) {
capturedChannel := potentialChange.Wait(nil)
for {
select {
case <-capturedChannel:
// This will produce incorrect results or no change.
val := potentialChange.WhatsTheValue()
fmt.Println("Value:", val)
case <-shutdownChannel:
fmt.Println("Good-Bye!")
return
}
}
}
```

### Please click GoDocs chevron above to view current GoDoc information for this package

## Contribution

Please feel free to submit any pull requests or suggest any desired features to be added.

When submitting a PR, please abide by our coding guidelines:

+ Code must adhere to the official Go [formatting](https://golang.org/doc/effective_go.html#formatting) guidelines (i.e. uses [gofmt](https://golang.org/cmd/gofmt/)).
+ Code must be documented adhering to the official Go [commentary](https://golang.org/doc/effective_go.html#commentary) guidelines.
+ Code must adhere to our [coding style](https://github.com/thrasher-corp/gocryptotrader/blob/master/doc/coding_style.md).
+ Pull requests need to be based on and opened against the `master` branch.

## Donations

<img src="https://github.com/thrasher-corp/gocryptotrader/blob/master/web/src/assets/donate.png?raw=true" hspace="70">

If this framework helped you in any way, or you would like to support the developers working on it, please donate Bitcoin to:

***bc1qk0jareu4jytc0cfrhr5wgshsq8282awpavfahc***
Loading

0 comments on commit 68db415

Please sign in to comment.