Counters!

diff --git a/server/server.go b/server/server.go
index c47bfaa2f63849d89376abeac8709d2648d38b83..a328785aa5375ebfd8693b7cc6e44038a8ccfa45 100644 (file)
--- a/server/server.go
+++ b/server/server.go
@@ -2,6 +2,7 @@ package main
 
 import "container/list"
 import "encoding/json"
+import "expvar"
 import "flag"
 import "log"
 import "net/http"
@@ -10,6 +11,11 @@ import "time"
 
 var port = flag.Int("port", 21059, "Port to listen on")
 
+var speak_count = expvar.NewInt("speak_count")
+var fetch_count = expvar.NewInt("fetch_count")
+var fetch_wait_count = expvar.NewInt("fetch_wait_count")
+var fetch_wake_count = expvar.NewInt("fetch_wake_count")
+
 type Message struct {
        Time time.Time
        Text string
@@ -39,12 +45,14 @@ main:
                        if !ok {
                                break main
                        }
-                       messages.PushBack(new_message)
+                       speak_count.Add(1)
                        for waiter := waiting.Front(); waiter != nil; waiter = waiter.Next() {
                                waiter.Value.(*StoreRequest).Messages <- []Message{*new_message}
                                close(waiter.Value.(*StoreRequest).Messages)
+                               fetch_wake_count.Add(1)
                        }
                        waiting.Init()
+                       messages.PushBack(new_message)
                        if message_count < max_messages {
                                message_count++
                        } else {
@@ -54,8 +62,10 @@ main:
                        if !ok {
                                break main
                        }
+                       fetch_count.Add(1)
                        if messages.Back() == nil || !request.StartTime.Before(messages.Back().Value.(*Message).Time) {
                                waiting.PushBack(request)
+                               fetch_wait_count.Add(1)
                        } else {
                                start := messages.Back()
                                response_size := 1