Different colors for different message types

[reliable-chat] / server / server.go

diff --git a/server/server.go b/server/server.go
index 695ec10ecfccb578c702618dc807ff9f2666efd3..963931f696d759459f6cb90512cd796100f88fcb 100644 (file)
--- a/server/server.go
+++ b/server/server.go
@@ -28,11 +28,14 @@ import "time"
 
 var port = flag.Int("port", 21059, "Port to listen on")
 var localaddress = flag.String("localaddress", "", "Local address to bind to")
 
 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")
 var fetch_wake_count = expvar.NewInt("fetch_wake_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")

+var drop_due_to_limit_count = expvar.NewInt("drop_due_to_limit_count")

 
 type Message struct {
        Time time.Time
 
 type Message struct {
        Time time.Time


@@ -50,12 +53,43 @@ type Store struct {
        Get chan *StoreRequest
 }
 
        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
 
 func manage_store(store Store) {
        messages := list.New()
        message_count := 0

-       max_messages := 1000

        waiting := list.New()
 main:
        for {
        waiting := list.New()
 main:
        for {


@@ -72,10 +106,11 @@ main:
                        }
                        waiting.Init()
                        messages.PushBack(new_message)
                        }
                        waiting.Init()
                        messages.PushBack(new_message)

-                       if message_count < max_messages {
+                       if message_count < *max_messages {

                                message_count++
                        } else {
                                messages.Remove(messages.Front())
                                message_count++
                        } else {
                                messages.Remove(messages.Front())

+                               drop_due_to_limit_count.Add(1)

                        }
                case request, ok := <-store.Get:
                        if !ok {
                        }
                case request, ok := <-store.Get:
                        if !ok {


@@ -146,13 +181,14 @@ func start_server(store Store) {
 
        http.HandleFunc("/speak", func(w http.ResponseWriter, r *http.Request) {
                store.Add <- &Message{
 
        http.HandleFunc("/speak", func(w http.ResponseWriter, r *http.Request) {
                store.Add <- &Message{

-                       time.Now(),
+                       now(),

                        r.FormValue("id"),
                        r.FormValue("text")}
                        r.FormValue("id"),
                        r.FormValue("text")}

+               w.Header().Add("Access-Control-Allow-Origin", "*")

        })
 
        http.HandleFunc("/robots.txt", func(w http.ResponseWriter, r *http.Request) {
        })
 
        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))
        })
 
        log.Fatal(http.ListenAndServe(*localaddress+":"+strconv.Itoa(*port), nil))


@@ -160,6 +196,8 @@ func start_server(store Store) {
 
 func main() {
        flag.Parse()
 
 func main() {
        flag.Parse()

+       start_clock()
+       start_time.Set(now().UnixNano())

        store := start_store()
        start_server(store)
 }
        store := start_store()
        start_server(store)
 }