mirror of
https://github.com/stryan/mumble-discord-bridge.git
synced 2024-11-16 20:15:40 -05:00
tickerct
This commit is contained in:
parent
b4a1a793a7
commit
bad460e57c
4
.gitignore
vendored
4
.gitignore
vendored
@ -3,5 +3,7 @@ main
|
||||
mumble-discord-bridge
|
||||
dist
|
||||
bridge
|
||||
.prof
|
||||
*.prof
|
||||
*.out
|
||||
*.test
|
||||
cert.pem
|
4
Makefile
4
Makefile
@ -1,4 +1,4 @@
|
||||
GOFILES=main.go mumble.go discord.go bridge.go config.go mumble-handlers.go discord-handlers.go
|
||||
GOFILES=main.go mumble.go discord.go bridge.go config.go mumble-handlers.go discord-handlers.go tickerct.go
|
||||
|
||||
mumble-discord-bridge: $(GOFILES)
|
||||
goreleaser build --skip-validate --rm-dist
|
||||
@ -7,7 +7,7 @@ dev: $(GOFILES)
|
||||
goreleaser build --skip-validate --rm-dist && sudo ./dist/mumble-discord-bridge_linux_amd64/mumble-discord-bridge
|
||||
|
||||
dev-race: $(GOFILES)
|
||||
go run -race *.go
|
||||
go run -race $(GOFILES)
|
||||
|
||||
dev-profile: $(GOFILES)
|
||||
goreleaser build --skip-validate --rm-dist && sudo ./dist/mumble-discord-bridge_linux_amd64/mumble-discord-bridge -cpuprofile cpu.prof
|
||||
|
@ -61,7 +61,7 @@ func (dd *DiscordDuplex) discordSendPCM(ctx context.Context, wg *sync.WaitGroup,
|
||||
opusSilence = append(opusSilence, 0x00)
|
||||
}
|
||||
|
||||
ticker := time.NewTicker(20 * time.Millisecond)
|
||||
ticker := NewTickerCT(20 * time.Millisecond)
|
||||
|
||||
lastReady := true
|
||||
var readyTimeout *time.Timer
|
||||
@ -235,7 +235,7 @@ func (dd *DiscordDuplex) discordReceivePCM(ctx context.Context, wg *sync.WaitGro
|
||||
}
|
||||
|
||||
func (dd *DiscordDuplex) fromDiscordMixer(ctx context.Context, wg *sync.WaitGroup, toMumble chan<- gumble.AudioBuffer) {
|
||||
ticker := time.NewTicker(10 * time.Millisecond)
|
||||
ticker := NewTickerCT(10 * time.Millisecond)
|
||||
sendAudio := false
|
||||
wg.Add(1)
|
||||
|
||||
|
16
mumble.go
16
mumble.go
@ -44,8 +44,10 @@ func (m MumbleDuplex) OnAudioStream(e *gumble.AudioStreamEvent) {
|
||||
}
|
||||
|
||||
func (m MumbleDuplex) fromMumbleMixer(ctx context.Context, wg *sync.WaitGroup, toDiscord chan []int16) {
|
||||
ticker := time.NewTicker(10 * time.Millisecond)
|
||||
ticker := NewTickerCT(10 * time.Millisecond)
|
||||
sendAudio := false
|
||||
bufferWarning := false
|
||||
|
||||
wg.Add(1)
|
||||
|
||||
for {
|
||||
@ -93,14 +95,22 @@ func (m MumbleDuplex) fromMumbleMixer(ctx context.Context, wg *sync.WaitGroup, t
|
||||
}
|
||||
|
||||
if len(toDiscord) > 20 {
|
||||
log.Println("Debug: Warning Discord buffer size")
|
||||
if !bufferWarning {
|
||||
log.Println("Warning: toDiscord buffer size")
|
||||
bufferWarning = true
|
||||
}
|
||||
} else {
|
||||
if bufferWarning {
|
||||
log.Println("Resolved: toDiscord buffer size")
|
||||
bufferWarning = false
|
||||
}
|
||||
}
|
||||
|
||||
if sendAudio {
|
||||
select {
|
||||
case toDiscord <- outBuf:
|
||||
default:
|
||||
log.Println("toDiscord buffer full. Dropping packet")
|
||||
log.Println("Error: toDiscord buffer full. Dropping packet")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
81
tickerct.go
Normal file
81
tickerct.go
Normal file
@ -0,0 +1,81 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"sync"
|
||||
"time"
|
||||
)
|
||||
|
||||
// A Ticker holds a channel that delivers ``ticks'' of a clock
|
||||
// at intervals.
|
||||
type TickerCT struct {
|
||||
sync.Mutex
|
||||
C <-chan time.Time // The channel on which the ticks are delivered.
|
||||
c chan<- time.Time // internal use
|
||||
r *time.Timer // internal timer
|
||||
d time.Duration // the set duration
|
||||
last time.Time // the last time the ticker ticked
|
||||
stop bool // mark the ticker as stopped
|
||||
}
|
||||
|
||||
// NewTickerCT returns a new Ticker containing a channel that will send
|
||||
// the time on the channel after each tick. The period of the ticks is
|
||||
// specified by the duration argument. The ticker queue ticks.
|
||||
// The duration d must be greater than zero; if not, NewTickerCT will
|
||||
// panic. Stop the ticker to release associated resources.
|
||||
func NewTickerCT(d time.Duration) *TickerCT {
|
||||
if d <= 0 {
|
||||
panic(errors.New("non-positive interval for NewTickerCT"))
|
||||
}
|
||||
|
||||
// Give the channel a large buffer to allow clients to catchup
|
||||
c := make(chan time.Time, 100)
|
||||
|
||||
t := &TickerCT{
|
||||
C: c,
|
||||
c: c,
|
||||
d: d,
|
||||
last: time.Now(),
|
||||
stop: false,
|
||||
}
|
||||
|
||||
t.Lock()
|
||||
t.r = time.AfterFunc(d, func() { t.tick() })
|
||||
t.Unlock()
|
||||
|
||||
return t
|
||||
}
|
||||
|
||||
func (t *TickerCT) tick() {
|
||||
t.Lock()
|
||||
if t.stop {
|
||||
fmt.Println("stopped")
|
||||
return
|
||||
}
|
||||
|
||||
now := time.Now()
|
||||
t.c <- now
|
||||
|
||||
current := t.last.Add(t.d)
|
||||
target := current.Add(t.d)
|
||||
|
||||
d := target.Sub(now)
|
||||
|
||||
// if d.Microseconds() < 1 {
|
||||
// d = time.Duration(time.Microsecond)
|
||||
// }
|
||||
// delta := now.Sub(current)
|
||||
// fmt.Println("delta", delta, d)
|
||||
|
||||
t.r.Reset(d)
|
||||
t.last = current
|
||||
t.Unlock()
|
||||
}
|
||||
|
||||
func (t *TickerCT) Stop() {
|
||||
t.stop = true
|
||||
if t.r != nil {
|
||||
t.r.Stop()
|
||||
}
|
||||
}
|
72
tickerct_test.go
Normal file
72
tickerct_test.go
Normal file
@ -0,0 +1,72 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"math/rand"
|
||||
"sync"
|
||||
"testing"
|
||||
"time"
|
||||
)
|
||||
|
||||
const testCount int64 = 10000
|
||||
const maxSleepInterval time.Duration = 15 * time.Millisecond
|
||||
const tickerInterval time.Duration = 10 * time.Millisecond
|
||||
const testDuration time.Duration = time.Duration(testCount * 10 * int64(time.Millisecond))
|
||||
|
||||
func Testticker(wg *sync.WaitGroup) {
|
||||
wg.Add(1)
|
||||
go func(interval time.Duration) {
|
||||
now := time.Now()
|
||||
start := now
|
||||
// start the ticker
|
||||
t := time.NewTicker(interval)
|
||||
var i int64
|
||||
for i = 0; i < testCount; i++ {
|
||||
if i+1 < testCount {
|
||||
time.Sleep(time.Duration(float64(maxSleepInterval) * rand.Float64()))
|
||||
}
|
||||
now = <-t.C
|
||||
// fmt.Println(now)
|
||||
}
|
||||
t.Stop()
|
||||
fmt.Println("Ticker after", testDuration, "drifts", time.Since(start)-testDuration)
|
||||
wg.Done()
|
||||
}(tickerInterval)
|
||||
}
|
||||
|
||||
func TestTicker(t *testing.T) {
|
||||
wg := sync.WaitGroup{}
|
||||
|
||||
Testticker(&wg)
|
||||
|
||||
wg.Wait()
|
||||
}
|
||||
|
||||
func TesttickerCT(wg *sync.WaitGroup) {
|
||||
wg.Add(1)
|
||||
go func(interval time.Duration) {
|
||||
now := time.Now()
|
||||
start := now
|
||||
// start the ticker
|
||||
t := NewTickerCT(interval)
|
||||
var i int64
|
||||
for i = 0; i < testCount; i++ {
|
||||
if i+1 < testCount {
|
||||
time.Sleep(time.Duration(float64(maxSleepInterval) * rand.Float64()))
|
||||
}
|
||||
now = <-t.C
|
||||
// fmt.Println(now)
|
||||
}
|
||||
t.Stop()
|
||||
fmt.Println("TickerCT after", testDuration, "drifts", time.Since(start)-testDuration)
|
||||
wg.Done()
|
||||
}(tickerInterval)
|
||||
}
|
||||
|
||||
func TestTickerCT(t *testing.T) {
|
||||
wg := sync.WaitGroup{}
|
||||
|
||||
TesttickerCT(&wg)
|
||||
|
||||
wg.Wait()
|
||||
}
|
Loading…
Reference in New Issue
Block a user