X-Git-Url: http://git.scottworley.com/reliable-chat/blobdiff_plain/270d2ae5829e1d66dcc1a0fb78ba3c2e3c3c22de..refs/heads/master:/server/server.go diff --git a/server/server.go b/server/server.go index adbbf84..bdfbf87 100644 --- a/server/server.go +++ b/server/server.go @@ -3,8 +3,7 @@ * * 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. + * published by the Free Software Foundation, version 3. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -28,12 +27,14 @@ import "time" var port = flag.Int("port", 21059, "Port to listen on") var localaddress = flag.String("localaddress", "", "Local address to bind to") +var max_messages = flag.Int("maxmessages", 1000, "Maximum number of messages to retain") -var frame_count = expvar.NewInt("frame_count") +var start_time = expvar.NewInt("start_time") 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") +var drop_due_to_limit_count = expvar.NewInt("drop_due_to_limit_count") type Message struct { Time time.Time @@ -51,12 +52,43 @@ type Store struct { Get chan *StoreRequest } -// TODO: Monotonic clock +var monotonic_clock chan chan time.Time + +const minimum_clock_increment = time.Millisecond + +func start_clock() { + internal_monotonic_clock := make(chan chan time.Time, 1) + go func() { + last_time := time.Now() + main: + for { + select { + case request, ok := <-internal_monotonic_clock: + if !ok { + break main + } + earliest_acceptable_time := last_time.Add(minimum_clock_increment) + current_time := time.Now() + if current_time.Before(earliest_acceptable_time) { + current_time = earliest_acceptable_time + } + request <- current_time + last_time = current_time + } + } + }() + monotonic_clock = internal_monotonic_clock +} + +func now() time.Time { + c := make(chan time.Time, 0) + monotonic_clock <- c + return <-c +} func manage_store(store Store) { messages := list.New() message_count := 0 - max_messages := 1000 waiting := list.New() main: for { @@ -73,10 +105,11 @@ main: } waiting.Init() messages.PushBack(new_message) - if message_count < max_messages { + if message_count < *max_messages { message_count++ } else { messages.Remove(messages.Front()) + drop_due_to_limit_count.Add(1) } case request, ok := <-store.Get: if !ok { @@ -114,49 +147,6 @@ func start_store() Store { return store } -const frame_html = ` - - - - - - - - -` - const robots_txt = `User-agent: * Disallow: / ` @@ -190,18 +180,14 @@ func start_server(store Store) { http.HandleFunc("/speak", func(w http.ResponseWriter, r *http.Request) { store.Add <- &Message{ - time.Now(), + 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)); + w.Header().Add("Access-Control-Allow-Origin", "*") }) http.HandleFunc("/robots.txt", func(w http.ResponseWriter, r *http.Request) { - w.Write([]byte(robots_txt)); + w.Write([]byte(robots_txt)) }) log.Fatal(http.ListenAndServe(*localaddress+":"+strconv.Itoa(*port), nil)) @@ -209,6 +195,8 @@ func start_server(store Store) { func main() { flag.Parse() + start_clock() + start_time.Set(now().UnixNano()) store := start_store() start_server(store) }