X-Git-Url: http://git.scottworley.com/reliable-chat/blobdiff_plain/67dc084dd8db67bda9551dc9856638353b4ed692..7310ffeebfda8540d2113fc8c846971a0f913d57:/server/server.go?ds=sidebyside

diff --git a/server/server.go b/server/server.go
index 0c40784..963931f 100644
--- a/server/server.go
+++ b/server/server.go
@@ -30,6 +30,7 @@ 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 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")
@@ -52,7 +53,39 @@ 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()
@@ -148,9 +181,10 @@ 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")}
+		w.Header().Add("Access-Control-Allow-Origin", "*")
 	})
 
 	http.HandleFunc("/robots.txt", func(w http.ResponseWriter, r *http.Request) {
@@ -162,6 +196,8 @@ func start_server(store Store) {
 
 func main() {
 	flag.Parse()
+	start_clock()
+	start_time.Set(now().UnixNano())
 	store := start_store()
 	start_server(store)
 }