Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch to using msgpack binary format instead of json #97

Merged
merged 1 commit into from
Aug 14, 2019
Merged

Switch to using msgpack binary format instead of json #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 1 addition & 14 deletions cse/observers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import "C"
import (
"cse-server-go/structs"
"errors"
"math"
)

func createObserver() (observer *C.cse_observer) {
Expand Down Expand Up @@ -40,18 +39,6 @@ func observerDestroy(observer *C.cse_observer) {
C.cse_observer_destroy(observer)
}

func uglyNanFix(value C.double) interface{} {
floatValue := float64(value)
if math.IsNaN(floatValue) {
return "NaN"
} else if math.IsInf(floatValue, 1) {
return "+Inf"
} else if math.IsInf(floatValue, -1) {
return "-Inf"
}
return floatValue
}

func observerGetReals(observer *C.cse_observer, variables []structs.Variable, slaveIndex int) (realSignals []structs.Signal) {
var realValueRefs []C.cse_variable_index
var realVariables []structs.Variable
Expand All @@ -75,7 +62,7 @@ func observerGetReals(observer *C.cse_observer, variables []structs.Variable, sl
Name: realVariables[k].Name,
Causality: realVariables[k].Causality,
Type: realVariables[k].Type,
Value: uglyNanFix(realOutVal[k]),
Value: realOutVal[k],
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ require (
github.com/gobuffalo/packr v1.22.0
github.com/gorilla/mux v1.7.0
github.com/gorilla/websocket v1.4.0
golang.org/x/net v0.0.0-20190213061140-3a22650c66bd
github.com/ugorji/go/codec v1.1.7
)
6 changes: 4 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,11 @@ github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo=
github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs=
github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
github.com/unrolled/secure v0.0.0-20180918153822-f340ee86eb8b/go.mod h1:mnPT77IAdsi/kV7+Es7y+pXALeV3h7G6dQF6mNYjcLA=
github.com/unrolled/secure v0.0.0-20181005190816-ff9db2ff917f/go.mod h1:mnPT77IAdsi/kV7+Es7y+pXALeV3h7G6dQF6mNYjcLA=
github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
Expand Down Expand Up @@ -348,8 +352,6 @@ golang.org/x/net v0.0.0-20181106065722-10aee1819953/go.mod h1:mL1N/T3taQHkDXs73r
golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20181207154023-610586996380/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20190213061140-3a22650c66bd h1:HuTn7WObtcDo9uEEU7rEqL0jYthdXAmZ6PP+meazmaU=
golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4 h1:YUO/7uOKsKeq9UokNS62b8FYywz3ker1l1vDZRCRefw=
Expand Down
29 changes: 22 additions & 7 deletions server/websockets.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,38 @@ package server

import (
"cse-server-go/structs"
"encoding/json"
"github.com/gorilla/websocket"
"github.com/ugorji/go/codec"
"io"
"log"
"net/http"
"reflect"
)

type JsonRequest struct {
Command []string `json:"command,omitempty"`
Module string `json:"module,omitempty"`
Modules bool `json:"modules,omitempty"`
Connections bool `json:"connections,omitempty"`
}

var upgrader = websocket.Upgrader{CheckOrigin: func(r *http.Request) bool { return true },}

func commandLoop(command chan []string, conn *websocket.Conn) {
var (
mh codec.MsgpackHandle
)
mh.MapType = reflect.TypeOf(map[string]interface{}(nil))
decoder := codec.NewDecoder(nil, &mh)

for {
data := JsonRequest{}
_, r, err := conn.NextReader()
if err != nil {
log.Println("read error:", err)
break
}
err = json.NewDecoder(r).Decode(&data)

decoder.Reset(r)
err = decoder.Decode(&data)

if err == io.EOF {
// One value is expected in the message.
log.Println("Message was EOF:", err, data)
Expand All @@ -40,11 +47,19 @@ func commandLoop(command chan []string, conn *websocket.Conn) {
}

func stateLoop(state chan structs.JsonResponse, conn *websocket.Conn) {
var (
mh codec.MsgpackHandle
)
mh.MapType = reflect.TypeOf(map[string]interface{}(nil))
encoder := codec.NewEncoder(nil, &mh)
for {
latestState := <-state
err := conn.WriteJSON(latestState)

w, err := conn.NextWriter(2)
encoder.Reset(w)
err = encoder.Encode(latestState)
if err != nil {
log.Println("write:", err)
log.Println("write error:", err)
log.Println("latestState:", latestState)
break
}
Expand Down