Update GOPATH in VSCode project (now in gerrit)

[src/xds/xds-gdb.git] / gdb-xds.go

diff --git a/gdb-xds.go b/gdb-xds.go
index 406e4c6..9dfb717 100644 (file)
--- a/gdb-xds.go
+++ b/gdb-xds.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 "IoT.bzh"
+ * Copyright (C) 2017-2018 "IoT.bzh"
  * Author Sebastien Douheret <sebastien@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -23,14 +23,15 @@ import (
        "fmt"
        "os"
        "regexp"
+       "runtime"
        "strconv"
        "strings"
        "syscall"
        "text/tabwriter"
 
+       "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent.git/lib/xaapiv1"
+       common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib"
        "github.com/Sirupsen/logrus"
-       "github.com/iotbzh/xds-agent/lib/xaapiv1"
-       common "github.com/iotbzh/xds-common/golib"
        sio_client "github.com/sebd71/go-socket.io-client"
 )
 
@@ -77,17 +78,21 @@ func NewGdbXds(log *logrus.Logger, args []string, env []string) *GdbXds {
 
 // SetConfig set additional config fields
 func (g *GdbXds) SetConfig(name string, value interface{}) error {
+       var val string
+       if name != "listProject" {
+               val = strings.TrimSpace(value.(string))
+       }
        switch name {
        case "agentURL":
-               g.agentURL = value.(string)
+               g.agentURL = val
        case "serverURL":
-               g.serverURL = value.(string)
+               g.serverURL = val
        case "prjID":
-               g.prjID = value.(string)
+               g.prjID = val
        case "sdkID":
-               g.sdkID = value.(string)
+               g.sdkID = val
        case "rPath":
-               g.rPath = value.(string)
+               g.rPath = val
        case "listProject":
                g.listPrj = value.(bool)
        default:
@@ -255,6 +260,25 @@ func (g *GdbXds) Init() (int, error) {
                }
        })
 
+       // Monitor XDS server configuration changes (and specifically connected status)
+       iosk.On(xaapiv1.EVTServerConfig, func(ev xaapiv1.EventMsg) {
+               svrCfg, err := ev.DecodeServerCfg()
+               if err == nil && !svrCfg.Connected {
+                       // TODO: should wait that server will be connected back
+                       if g.cbOnExit != nil {
+                               g.cbOnExit(-1, fmt.Errorf("XDS Server disconnected"))
+                       } else {
+                               fmt.Printf("XDS Server disconnected")
+                               os.Exit(-1)
+                       }
+               }
+       })
+
+       args := xaapiv1.EventRegisterArgs{Name: xaapiv1.EVTServerConfig}
+       if err := g.httpCli.Post("/events/register", args, nil); err != nil {
+               return 0, err
+       }
+
        return 0, nil
 }
 
@@ -304,6 +328,11 @@ func (g *GdbXds) Start(inferiorTTY bool) (int, error) {
        // except if XDS_GDBSERVER_OUTPUT_NOFIX is defined
        _, gdbserverNoFix := os.LookupEnv("XDS_GDBSERVER_OUTPUT_NOFIX")
 
+       // SDK ID must be set else $GDB cannot be resolved
+       if g.sdkID == "" {
+               return int(syscall.EINVAL), fmt.Errorf("sdkid must be set")
+       }
+
        args := xaapiv1.ExecArgs{
                ID:              g.prjID,
                SdkID:           g.sdkID,
@@ -411,14 +440,21 @@ func (g *GdbXds) printProjectsList() (int, error) {
        fmt.Fprintln(writer, "\nList of installed cross SDKs (use: export XDS_SDK_ID=<< ID >>):")
        fmt.Fprintln(writer, "ID \t Name")
        for _, s := range sdks {
-               fmt.Fprintf(writer, " %s \t  %s\n", s.ID, s.Name)
+               if s.Status == xaapiv1.SdkStatusInstalled {
+                       fmt.Fprintf(writer, " %s \t  %s\n", s.ID, s.Name)
+               }
        }
 
        if len(g.projects) > 0 && len(sdks) > 0 {
                fmt.Fprintln(writer, "")
                fmt.Fprintln(writer, "For example: ")
-               fmt.Fprintf(writer, "  XDS_PROJECT_ID=%s XDS_SDK_ID=%s  %s -x myGdbConf.ini\n",
-                       g.projects[0].ID[:8], sdks[0].ID[:8], AppName)
+               if runtime.GOOS == "windows" {
+                       fmt.Fprintf(writer, "  SET XDS_PROJECT_ID=%s && SET XDS_SDK_ID=%s &&  %s -x myGdbConf.ini\n",
+                               g.projects[0].ID[:8], sdks[0].ID[:8], AppName)
+               } else {
+                       fmt.Fprintf(writer, "  XDS_PROJECT_ID=%s XDS_SDK_ID=%s  %s -x myGdbConf.ini\n",
+                               g.projects[0].ID[:8], sdks[0].ID[:8], AppName)
+               }
        }
        fmt.Fprintln(writer, "")
        fmt.Fprintln(writer, "Or define settings within gdb configuration file (see help and :XDS-ENV: tag)")