Recognize stat_dir_type_empty

[govpp.git] / proxy / server.go

diff --git a/proxy/server.go b/proxy/server.go
index 472ad16..e395468 100644 (file)
--- a/proxy/server.go
+++ b/proxy/server.go
@@ -55,6 +55,7 @@ type StatsResponse struct {
        IfaceStats *api.InterfaceStats
        ErrStats   *api.ErrorStats
        BufStats   *api.BufferStats
+       MemStats   *api.MemoryStats
 }
 
 // StatsRPC is a RPC server for proxying client request to api.StatsProvider.
@@ -75,7 +76,7 @@ type StatsRPC struct {
 // proxying request to given api.StatsProvider.
 func NewStatsRPC(stats adapter.StatsAPI) (*StatsRPC, error) {
        rpc := new(StatsRPC)
-       if err := rpc.Connect(stats); err != nil {
+       if err := rpc.connect(stats); err != nil {
                return nil, err
        }
        return rpc, nil
@@ -84,7 +85,7 @@ func NewStatsRPC(stats adapter.StatsAPI) (*StatsRPC, error) {
 func (s *StatsRPC) watchConnection() {
        heartbeatTicker := time.NewTicker(10 * time.Second).C
        atomic.StoreUint32(&s.available, 1)
-       log.Println("enabling statsRPC service")
+       log.Debugln("enabling statsRPC service")
 
        count := 0
        prev := new(api.SystemStats)
@@ -127,7 +128,7 @@ func (s *StatsRPC) watchConnection() {
                                                s.statsConn, err = core.ConnectStats(s.stats)
                                                if err == nil {
                                                        atomic.StoreUint32(&s.available, 1)
-                                                       log.Println("enabling statsRPC service")
+                                                       log.Debugln("enabling statsRPC service")
                                                        break
                                                }
                                                time.Sleep(5 * time.Second)
@@ -144,7 +145,7 @@ func (s *StatsRPC) watchConnection() {
        }
 }
 
-func (s *StatsRPC) Connect(stats adapter.StatsAPI) error {
+func (s *StatsRPC) connect(stats adapter.StatsAPI) error {
        if atomic.LoadUint32(&s.isConnected) == 1 {
                return errors.New("connection already exists")
        }
@@ -161,7 +162,7 @@ func (s *StatsRPC) Connect(stats adapter.StatsAPI) error {
        return nil
 }
 
-func (s *StatsRPC) Disconnect() {
+func (s *StatsRPC) disconnect() {
        if atomic.LoadUint32(&s.isConnected) == 1 {
                atomic.StoreUint32(&s.isConnected, 0)
                close(s.done)
@@ -200,6 +201,9 @@ func (s *StatsRPC) GetStats(req StatsRequest, resp *StatsResponse) error {
        case "buffer":
                resp.BufStats = new(api.BufferStats)
                return s.statsConn.GetBufferStats(resp.BufStats)
+       case "memory":
+               resp.MemStats = new(api.MemoryStats)
+               return s.statsConn.GetMemoryStats(resp.MemStats)
        default:
                return fmt.Errorf("unknown stats type: %s", req.StatsType)
        }
@@ -222,8 +226,8 @@ type BinapiCompatibilityRequest struct {
 }
 
 type BinapiCompatibilityResponse struct {
-       CompatibleMsgs   []string
-       IncompatibleMsgs []string
+       CompatibleMsgs   map[string][]string
+       IncompatibleMsgs map[string][]string
 }
 
 // BinapiRPC is a RPC server for proxying client request to api.Channel.
@@ -243,7 +247,7 @@ type BinapiRPC struct {
 // proxying request to given api.Channel.
 func NewBinapiRPC(binapi adapter.VppAPI) (*BinapiRPC, error) {
        rpc := new(BinapiRPC)
-       if err := rpc.Connect(binapi); err != nil {
+       if err := rpc.connect(binapi); err != nil {
                return nil, err
        }
        return rpc, nil
@@ -263,7 +267,7 @@ func (s *BinapiRPC) watchConnection() {
                        case core.Connected:
                                if !s.serviceAvailable() {
                                        atomic.StoreUint32(&s.available, 1)
-                                       log.Println("enabling binapiRPC service")
+                                       log.Debugln("enabling binapiRPC service")
                                }
                        case core.Disconnected:
                                if s.serviceAvailable() {
@@ -290,7 +294,7 @@ func (s *BinapiRPC) watchConnection() {
        }
 }
 
-func (s *BinapiRPC) Connect(binapi adapter.VppAPI) error {
+func (s *BinapiRPC) connect(binapi adapter.VppAPI) error {
        if atomic.LoadUint32(&s.isConnected) == 1 {
                return errors.New("connection already exists")
        }
@@ -307,7 +311,7 @@ func (s *BinapiRPC) Connect(binapi adapter.VppAPI) error {
        return nil
 }
 
-func (s *BinapiRPC) Disconnect() {
+func (s *BinapiRPC) disconnect() {
        if atomic.LoadUint32(&s.isConnected) == 1 {
                atomic.StoreUint32(&s.isConnected, 0)
                close(s.done)
@@ -375,25 +379,33 @@ func (s *BinapiRPC) Compatibility(req BinapiCompatibilityRequest, resp *BinapiCo
        }
        defer ch.Close()
 
-       resp.CompatibleMsgs = make([]string, 0, len(req.MsgNameCrcs))
-       resp.IncompatibleMsgs = make([]string, 0, len(req.MsgNameCrcs))
+       resp.CompatibleMsgs = make(map[string][]string)
+       resp.IncompatibleMsgs = make(map[string][]string)
 
-       for _, msg := range req.MsgNameCrcs {
-               val, ok := api.GetRegisteredMessages()[msg]
-               if !ok {
-                       resp.IncompatibleMsgs = append(resp.IncompatibleMsgs, msg)
-                       continue
+       for path, messages := range api.GetRegisteredMessages() {
+               if resp.IncompatibleMsgs[path] == nil {
+                       resp.IncompatibleMsgs[path] = make([]string, 0, len(req.MsgNameCrcs))
                }
-
-               if err = ch.CheckCompatiblity(val); err != nil {
-                       resp.IncompatibleMsgs = append(resp.IncompatibleMsgs, msg)
-               } else {
-                       resp.CompatibleMsgs = append(resp.CompatibleMsgs, msg)
+               if resp.CompatibleMsgs[path] == nil {
+                       resp.CompatibleMsgs[path] = make([]string, 0, len(req.MsgNameCrcs))
+               }
+               for _, msg := range req.MsgNameCrcs {
+                       val, ok := messages[msg]
+                       if !ok {
+                               resp.IncompatibleMsgs[path] = append(resp.IncompatibleMsgs[path], msg)
+                               continue
+                       }
+                       if err = ch.CheckCompatiblity(val); err != nil {
+                               resp.IncompatibleMsgs[path] = append(resp.IncompatibleMsgs[path], msg)
+                       } else {
+                               resp.CompatibleMsgs[path] = append(resp.CompatibleMsgs[path], msg)
+                       }
                }
        }
-
-       if len(resp.IncompatibleMsgs) > 0 {
-               return fmt.Errorf("compatibility check failed for messages: %v", resp.IncompatibleMsgs)
+       for _, messages := range resp.IncompatibleMsgs {
+               if len(messages) > 0 {
+                       return fmt.Errorf("compatibility check failed for messages: %v", resp.IncompatibleMsgs)
+               }
        }
 
        return nil