X-Git-Url: http://git.scottworley.com/reliable-chat/blobdiff_plain/c282d87802c8a36e1ef5e4b367e7e753c2ba05f5..7f54ca0afcd01093cafcee969b6272ec5c05f542:/server/server.go diff --git a/server/server.go b/server/server.go index 7572447..1bb7c9a 100644 --- a/server/server.go +++ b/server/server.go @@ -1,13 +1,42 @@ +/* reliable-chat - multipath chat + * Copyright (C) 2012 Scott Worley + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + package main import "container/list" import "encoding/json" +import "expvar" +import "flag" import "log" import "net/http" +import "strconv" import "time" +var port = flag.Int("port", 21059, "Port to listen on") + +var frame_count = expvar.NewInt("frame_count") +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 } @@ -35,12 +64,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 { @@ -50,8 +81,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 @@ -80,6 +113,49 @@ 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 @@ -103,17 +179,27 @@ func start_server(store Store) { return } w.Header().Add("Content-Type", "application/json") + w.Header().Add("Access-Control-Allow-Origin", "*") w.Write(json_encoded) }) 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) { + frame_count.Add(1) + w.Write([]byte(frame_html)); }) - log.Fatal(http.ListenAndServe(":8080", nil)) + log.Fatal(http.ListenAndServe(":"+strconv.Itoa(*port), nil)) } func main() { + flag.Parse() store := start_store() start_server(store) }