Changeset 50 in code for trunk

Timestamp:

Feb 7, 2020, 3:43:54 PM (5 years ago)

Author:

contact

Message:

Add an in-memory ring buffer

References: ​https://todo.sr.ht/~emersion/jounce/2

Location:

trunk

Files:

• downstream.go (modified) (1 diff)
• ring.go (added)
• server.go (modified) (2 diffs)
• upstream.go (modified) (3 diffs)

trunk/downstream.go

@@ -232 +232 @@
                         }
                 }
+
+                consumer := uc.ring.Consumer()
+                for {
+                        msg := consumer.Consume()
+                        if msg == nil {
+                                break
+                        }
+                        c.messages <- msg
+                }
         })
+
         return nil
 }

trunk/server.go

@@ -95 +95 @@
         Hostname  string
         Logger    Logger
+        RingCap   int
         Upstreams []Upstream // TODO: per-user
 
@@ -104 +105 @@
 func NewServer() *Server {
         return &Server{
-                Logger: log.New(log.Writer(), "", log.LstdFlags),
-                users:  make(map[string]*user),
+                Logger:  log.New(log.Writer(), "", log.LstdFlags),
+                RingCap: 4096,
+                users:   make(map[string]*user),
         }
 }

trunk/upstream.go

@@ -33 +33 @@
         user     *user
         messages chan<- *irc.Message
+        ring     *Ring
 
         serverName            string
@@ -64 +65 @@
                 user:     u,
                 messages: msgs,
+                ring:     NewRing(u.srv.RingCap),
                 channels: make(map[string]*upstreamChannel),
         }
@@ -303 +305 @@
                 })
         case "PRIVMSG":
+                c.ring.Produce(msg)
                 c.user.forEachDownstream(func(dc *downstreamConn) {
                         dc.messages <- msg