Merge pull request #3837 from vigo2/vigo/simple-perf-measures

Simple-perf-measures
wowsims · Oct 9, 2023 · 1b855ff · 1b855ff
2 parents 8954ff0 + 5d8277e
commit 1b855ff
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 32 deletions.
diff --git a/sim/core/aura.go b/sim/core/aura.go
@@ -162,7 +162,9 @@ func (aura *Aura) Refresh(sim *Simulation) {
 		aura.expires = NeverExpires
 	} else {
 		aura.expires = sim.CurrentTime + aura.Duration
-		aura.Unit.minExpires = 0
+		if aura.expires < aura.Unit.minExpires {
+			aura.Unit.minExpires = aura.expires
+		}
 	}
 }
 
@@ -285,7 +287,7 @@ type auraTracker struct {
 	// IDs of Auras that may expire and are currently active, in no particular order.
 	activeAuras []*Aura
 
-	// caches the minimum expires time of all active auras; reset to 0 on Activate(), Deactivate(), and Refresh()
+	// caches the minimum expires time of all active auras; might be stale (too low) after Deactivate().
 	minExpires time.Duration
 
 	// Auras that have a non-nil XXX function set and are currently active.
@@ -302,20 +304,9 @@ type auraTracker struct {
 
 func newAuraTracker() auraTracker {
 	return auraTracker{
-		resetEffects:               []ResetEffect{},
-		ExclusiveEffectManager:     &ExclusiveEffectManager{},
-		activeAuras:                make([]*Aura, 0, 16),
-		onCastCompleteAuras:        make([]*Aura, 0, 16),
-		onSpellHitDealtAuras:       make([]*Aura, 0, 16),
-		onSpellHitTakenAuras:       make([]*Aura, 0, 16),
-		onPeriodicDamageDealtAuras: make([]*Aura, 0, 16),
-		onPeriodicDamageTakenAuras: make([]*Aura, 0, 16),
-		onHealDealtAuras:           make([]*Aura, 0, 16),
-		onHealTakenAuras:           make([]*Aura, 0, 16),
-		onPeriodicHealDealtAuras:   make([]*Aura, 0, 16),
-		onPeriodicHealTakenAuras:   make([]*Aura, 0, 16),
-		auras:                      make([]*Aura, 0, 16),
-		aurasByTag:                 make(map[string][]*Aura),
+		resetEffects:           []ResetEffect{},
+		ExclusiveEffectManager: &ExclusiveEffectManager{},
+		aurasByTag:             make(map[string][]*Aura),
 	}
 }
 
@@ -664,8 +655,6 @@ func (aura *Aura) Deactivate(sim *Simulation) {
 			aura.Unit.activeAuras[removeActiveIndex].activeIndex = removeActiveIndex
 		}
 		aura.activeIndex = Inactive
-
-		aura.Unit.minExpires = 0
 	}
 
 	if aura.onCastCompleteIndex != Inactive {

diff --git a/sim/core/character.go b/sim/core/character.go
@@ -345,18 +345,6 @@ func (character *Character) AddPet(pet PetAgent) {
 	character.Pets = append(character.Pets, pet.GetPet())
 }
 
-func (character *Character) MultiplyMeleeSpeed(sim *Simulation, amount float64) {
-	character.Unit.MultiplyMeleeSpeed(sim, amount)
-}
-
-func (character *Character) MultiplyRangedSpeed(sim *Simulation, amount float64) {
-	character.Unit.MultiplyRangedSpeed(sim, amount)
-}
-
-func (character *Character) MultiplyAttackSpeed(sim *Simulation, amount float64) {
-	character.Unit.MultiplyAttackSpeed(sim, amount)
-}
-
 func (character *Character) GetBaseStats() stats.Stats {
 	return character.baseStats
 }
@@ -523,7 +511,7 @@ func (character *Character) advance(sim *Simulation) {
 
 	for _, pet := range character.Pets {
 		if pet.enabled {
-			pet.advance(sim)
+			pet.Unit.advance(sim)
 		}
 	}
 }

diff --git a/sim/core/sim.go b/sim/core/sim.go
@@ -329,7 +329,7 @@ func (sim *Simulation) reset() {
 		sim.Duration += time.Duration(sim.RandomFloat("sim duration")*float64(variation)) - sim.DurationVariation
 	}
 
-	sim.pendingActions = make([]*PendingAction, 0, 64)
+	sim.pendingActions = sim.pendingActions[:0]
 
 	sim.executePhase = 0
 	sim.nextExecutePhase()