Copy less: pass messages by pointer

diff --git a/server/server.go b/server/server.go
index 8d4e897c36fc4c877b00b677844b0194c1660f69..bfe10669e7f0bd34368984dffbde1c7fe8adcd55 100644 (file)
--- a/server/server.go
+++ b/server/server.go
@@ -17,8 +17,8 @@ type StoreRequest struct {
 }
 
 type Store struct {
 }
 
 type Store struct {

-       Add chan Message
-       Get chan StoreRequest
+       Add chan *Message
+       Get chan *StoreRequest

 }
 
 // TODO: Monotonic clock
 }
 
 // TODO: Monotonic clock


@@ -33,8 +33,8 @@ func manage_store(store Store) {
                case new_message := <-store.Add:
                        messages.PushBack(new_message)
                        for waiter := waiting.Front(); waiter != nil; waiter = waiter.Next() {
                case new_message := <-store.Add:
                        messages.PushBack(new_message)
                        for waiter := waiting.Front(); waiter != nil; waiter = waiter.Next() {

-                               waiter.Value.(StoreRequest).Messages <- []Message{new_message}
-                               close(waiter.Value.(StoreRequest).Messages)
+                               waiter.Value.(*StoreRequest).Messages <- []Message{*new_message}
+                               close(waiter.Value.(*StoreRequest).Messages)

                        }
                        waiting.Init()
                        if message_count < max_messages {
                        }
                        waiting.Init()
                        if message_count < max_messages {


@@ -43,23 +43,23 @@ func manage_store(store Store) {
                                messages.Remove(messages.Front())
                        }
                case request := <-store.Get:
                                messages.Remove(messages.Front())
                        }
                case request := <-store.Get:

-                       if messages.Back() == nil || !request.StartTime.Before(messages.Back().Value.(Message).Time) {
+                       if messages.Back() == nil || !request.StartTime.Before(messages.Back().Value.(*Message).Time) {

                                waiting.PushBack(request)
                        } else {
                                start := messages.Back()
                                response_size := 1
                                waiting.PushBack(request)
                        } else {
                                start := messages.Back()
                                response_size := 1

-                               if messages.Front().Value.(Message).Time.After(request.StartTime) {
+                               if messages.Front().Value.(*Message).Time.After(request.StartTime) {

                                        start = messages.Front()
                                        response_size = message_count
                                } else {
                                        start = messages.Front()
                                        response_size = message_count
                                } else {

-                                       for start.Prev().Value.(Message).Time.After(request.StartTime) {
+                                       for start.Prev().Value.(*Message).Time.After(request.StartTime) {

                                                start = start.Prev()
                                                response_size++
                                        }
                                }
                                response_messages := make([]Message, 0, response_size)
                                for m := start; m != nil; m = m.Next() {
                                                start = start.Prev()
                                                response_size++
                                        }
                                }
                                response_messages := make([]Message, 0, response_size)
                                for m := start; m != nil; m = m.Next() {

-                                       response_messages = append(response_messages, m.Value.(Message))
+                                       response_messages = append(response_messages, *m.Value.(*Message))

                                }
                                request.Messages <- response_messages
                        }
                                }
                                request.Messages <- response_messages
                        }


@@ -68,7 +68,7 @@ func manage_store(store Store) {
 }
 
 func start_store() Store {
 }
 
 func start_store() Store {

-       store := Store{make(chan Message, 20), make(chan StoreRequest, 20)}
+       store := Store{make(chan *Message, 20), make(chan *StoreRequest, 20)}

        go manage_store(store)
        return store
 }
        go manage_store(store)
        return store
 }


@@ -87,7 +87,7 @@ func start_server(store Store) {
                        }
                }
                messages_from_store := make(chan []Message, 1)
                        }
                }
                messages_from_store := make(chan []Message, 1)

-               store.Get <- StoreRequest{since, messages_from_store}
+               store.Get <- &StoreRequest{since, messages_from_store}

 
                json_encoded, err := json.Marshal(<-messages_from_store)
                if err != nil {
 
                json_encoded, err := json.Marshal(<-messages_from_store)
                if err != nil {


@@ -100,7 +100,7 @@ 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("text")}

        })
 
        log.Fatal(http.ListenAndServe(":8080", nil))
        })
 
        log.Fatal(http.ListenAndServe(":8080", nil))

diff --git a/server/server_test.go b/server/server_test.go
index 0afb3846d6c94bcdc304d959ebacc10a673c1e4b..d1bababe56686e455d876bf16985f763e0743dd4 100644 (file)
--- a/server/server_test.go
+++ b/server/server_test.go
@@ -8,9 +8,9 @@ func TestMessageInsertAndRetreive(t *testing.T) {
        at := time.Now()
        var zero_time time.Time
        store := start_store()
        at := time.Now()
        var zero_time time.Time
        store := start_store()

-       store.Add <- Message{at, say}
+       store.Add <- &Message{at, say}

        messages_from_store := make(chan []Message, 1)
        messages_from_store := make(chan []Message, 1)

-       store.Get <- StoreRequest{zero_time, messages_from_store}
+       store.Get <- &StoreRequest{zero_time, messages_from_store}

        messages := <-messages_from_store
        if len(messages) != 1 {
                t.Fail()
        messages := <-messages_from_store
        if len(messages) != 1 {
                t.Fail()