Skip to content

Commit

Permalink
chore: Replace sync.Mutex with sync.Map (#1197)
Browse files Browse the repository at this point in the history
* Replace sync.Mutex with sync.Map

* Benchmark AddTransformation

* update benchmark parallelism

---------

Co-authored-by: Juan Pablo Tosso <jptosso@gmail.com>
Co-authored-by: Felipe Zipitría <3012076+fzipi@users.noreply.github.com>
  • Loading branch information
3 people authored Dec 30, 2024
1 parent 842b8f6 commit d5a0d6d
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 8 deletions.
12 changes: 4 additions & 8 deletions internal/corazawaf/rule.go
Original file line number Diff line number Diff line change
Expand Up @@ -586,22 +586,18 @@ func (r *Rule) AddVariableNegation(v variables.RuleVariable, key string) error {
}

var transformationIDToName = []string{""}
var transformationNameToID = map[string]int{"": 0}
var transformationIDsLock = sync.Mutex{}
var transformationNameToID = sync.Map{} // map[string]int

func transformationID(currentID int, transformationName string) int {
transformationIDsLock.Lock()
defer transformationIDsLock.Unlock()

currName := transformationIDToName[currentID]
nextName := fmt.Sprintf("%s+%s", currName, transformationName)
if id, ok := transformationNameToID[nextName]; ok {
return id
if id, ok := transformationNameToID.Load(nextName); ok {
return id.(int)
}

id := len(transformationIDToName)
transformationIDToName = append(transformationIDToName, nextName)
transformationNameToID[nextName] = id
transformationNameToID.Store(nextName, id)
return id
}

Expand Down
34 changes: 34 additions & 0 deletions internal/corazawaf/rule_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -384,6 +384,40 @@ func TestAddTransformation(t *testing.T) {
}
}

func BenchmarkAddTransformationUnique(b *testing.B) {
transformation := func(input string) (string, bool, error) {
return "Test", true, nil
}
b.ResetTimer()
b.RunParallel(func(p *testing.PB) {
rule := NewRule()
for p.Next() {
transformationName := "transformation" + b.Name()
err := rule.AddTransformation(transformationName, transformation)
if err != nil {
b.Fatalf("Failed to add a transformation: %s", err.Error())
}
}
})
}

func BenchmarkAddTransformationSame(b *testing.B) {
transformation := func(input string) (string, bool, error) {
return "Test", true, nil
}
b.ResetTimer()
b.RunParallel(func(p *testing.PB) {
for p.Next() {
rule := NewRule()
transformationName := "transformation"
err := rule.AddTransformation(transformationName, transformation)
if err != nil {
b.Fatalf("Failed to add a transformation: %s", err.Error())
}
}
})
}

func TestAddTransformationEmpty(t *testing.T) {
rule := NewRule()
transformationName := ""
Expand Down

0 comments on commit d5a0d6d

Please sign in to comment.