X-Git-Url: http://git.scottworley.com/reliable-chat/blobdiff_plain/24a546cf6313bc29de260a356d9e5bdffa67627e..d925d235c289dd7abd89fe618199a27255ad6d07:/server/server.go?ds=inline diff --git a/server/server.go b/server/server.go index c47bfaa..5c5ef50 100644 --- 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,8 +11,14 @@ 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 + ID string Text string } @@ -39,12 +46,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 +63,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 @@ -84,6 +95,48 @@ func start_store() Store { return store } +const frame_html = ` + + + + + + + + +` + func start_server(store Store) { http.HandleFunc("/fetch", func(w http.ResponseWriter, r *http.Request) { var since time.Time @@ -111,10 +164,17 @@ func start_server(store Store) { }) http.HandleFunc("/speak", func(w http.ResponseWriter, r *http.Request) { - store.Add <- &Message{time.Now(), r.FormValue("text")} + store.Add <- &Message{ + time.Now(), + r.FormValue("id"), + r.FormValue("text")} + }) + + http.HandleFunc("/frame", func(w http.ResponseWriter, r *http.Request) { + w.Write([]byte(frame_html)); }) - log.Fatal(http.ListenAndServe(":" + strconv.Itoa(*port), nil)) + log.Fatal(http.ListenAndServe(":"+strconv.Itoa(*port), nil)) } func main() {