This 'form' is never submitted.

[reliable-chat] / server / server.go

diff --git a/server/server.go b/server/server.go
index bfe10669e7f0bd34368984dffbde1c7fe8adcd55..8ce96787ac89658490ab943dc2b7710db4a38a14 100644 (file)
--- a/server/server.go
+++ b/server/server.go
@@ -2,12 +2,23 @@ package main
 
 import "container/list"
 import "encoding/json"
 
 import "container/list"
 import "encoding/json"

+import "expvar"
+import "flag"

 import "log"
 import "net/http"
 import "log"
 import "net/http"

+import "strconv"

 import "time"
 
 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
 type Message struct {
        Time time.Time

+       ID   string

        Text string
 }
 
        Text string
 }
 


@@ -28,23 +39,34 @@ func manage_store(store Store) {
        message_count := 0
        max_messages := 1000
        waiting := list.New()
        message_count := 0
        max_messages := 1000
        waiting := list.New()

+main:

        for {
                select {
        for {
                select {

-               case new_message := <-store.Add:
-                       messages.PushBack(new_message)
+               case new_message, ok := <-store.Add:
+                       if !ok {
+                               break main
+                       }
+                       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)
                        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()
                        }
                        waiting.Init()

+                       messages.PushBack(new_message)

                        if message_count < max_messages {
                                message_count++
                        } else {
                                messages.Remove(messages.Front())
                        }
                        if message_count < max_messages {
                                message_count++
                        } else {
                                messages.Remove(messages.Front())
                        }

-               case request := <-store.Get:
+               case request, ok := <-store.Get:
+                       if !ok {
+                               break main
+                       }
+                       fetch_count.Add(1)

                        if messages.Back() == nil || !request.StartTime.Before(messages.Back().Value.(*Message).Time) {
                                waiting.PushBack(request)
                        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
                        } else {
                                start := messages.Back()
                                response_size := 1


@@ -100,10 +122,13 @@ func start_server(store Store) {
        })
 
        http.HandleFunc("/speak", func(w http.ResponseWriter, r *http.Request) {
        })
 
        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")}

        })
 
        })
 

-       log.Fatal(http.ListenAndServe(":8080", nil))
+       log.Fatal(http.ListenAndServe(":"+strconv.Itoa(*port), nil))

 }
 
 func main() {
 }
 
 func main() {