Changeset 741 in code

Timestamp:

Dec 2, 2021, 10:52:29 PM (4 years ago)

Author:

contact

Message:

Use golang.org/x/time/rate

Instead of hand-rolling our own rate-limiter based on goroutines,
use golang.org/x/time/rate.

Location:

trunk

Files:

• conn.go (modified) (3 diffs)
• go.mod (modified) (1 diff)
• go.sum (modified) (1 diff)

trunk/conn.go

@@ -11 +11 @@
         "unicode"
 
+        "golang.org/x/time/rate"
         "gopkg.in/irc.v3"
         "nhooyr.io/websocket"
@@ -119 +120 @@
 }
 
-type rateLimiter struct {
-        C       <-chan struct{}
-        ticker  *time.Ticker
-        stopped chan struct{}
-}
-
-func newRateLimiter(delay time.Duration, burst int) *rateLimiter {
-        ch := make(chan struct{}, burst)
-        for i := 0; i < burst; i++ {
-                ch <- struct{}{}
-        }
-        ticker := time.NewTicker(delay)
-        stopped := make(chan struct{})
-        go func() {
-                for {
-                        select {
-                        case <-ticker.C:
-                                select {
-                                case ch <- struct{}{}:
-                                        // This space is intentionally left blank
-                                case <-stopped:
-                                        return
-                                }
-                        case <-stopped:
-                                return
-                        }
-                }
-        }()
-        return &rateLimiter{
-                C:       ch,
-                ticker:  ticker,
-                stopped: stopped,
-        }
-}
-
-func (rl *rateLimiter) Stop() {
-        rl.ticker.Stop()
-        close(rl.stopped)
-}
-
 type connOptions struct {
         Logger         Logger
@@ -187 +148 @@
 
         go func() {
-                var rl *rateLimiter
-                if options.RateLimitDelay > 0 && options.RateLimitBurst > 0 {
-                        rl = newRateLimiter(options.RateLimitDelay, options.RateLimitBurst)
-                        defer rl.Stop()
-                }
-
+                ctx, cancel := c.NewContext(context.Background())
+                defer cancel()
+
+                rl := rate.NewLimiter(rate.Every(options.RateLimitDelay), options.RateLimitBurst)
                 for msg := range outgoing {
-                        if rl != nil {
-                                <-rl.C
+                        if err := rl.Wait(ctx); err != nil {
+                                break
                         }
 

trunk/go.mod

@@ -19 +19 @@
         golang.org/x/sys v0.0.0-20211116061358-0a5406a5449c // indirect
         golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
+        golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11
         google.golang.org/protobuf v1.27.1 // indirect
         gopkg.in/irc.v3 v3.1.4

trunk/go.sum

@@ -380 +380 @@
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11 h1:GZokNIeuVkl3aZHJchRrr13WCsols02MLUcz1U9is6M=
+golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=