Change-Id: I279653deb9911862d29143269aea5dffbd564478
Signed-off-by: Vladimir Lavor <vlavor@cisco.com>
+govpp_connect (char *shm)
- return vac_connect("govpp", NULL, govpp_msg_callback, 32);
+ return vac_connect("govpp", shm, govpp_msg_callback, 32);
// watchedFolder is a folder where vpp's shared memory is supposed to be created.
// File system events are monitored in this folder.
watchedFolder = "/dev/shm/"
// watchedFolder is a folder where vpp's shared memory is supposed to be created.
// File system events are monitored in this folder.
watchedFolder = "/dev/shm/"
- // watchedFile is a name of the file in the watchedFolder. Once the file is present
+ // watchedFile is a default name of the file in the watchedFolder. Once the file is present,
// the vpp is ready to accept a new connection.
// the vpp is ready to accept a new connection.
- watchedFile = watchedFolder + "vpe-api"
+ watchedFile = "vpe-api"
)
// vppAPIClientAdapter is the opaque context of the adapter.
type vppAPIClientAdapter struct {
)
// vppAPIClientAdapter is the opaque context of the adapter.
type vppAPIClientAdapter struct {
- callback func(context uint32, msgId uint16, data []byte)
+ shmPrefix string
+ callback func(context uint32, msgId uint16, data []byte)
}
var vppClient *vppAPIClientAdapter // global vpp API client adapter context
// NewVppAdapter returns a new vpp API client adapter.
}
var vppClient *vppAPIClientAdapter // global vpp API client adapter context
// NewVppAdapter returns a new vpp API client adapter.
-func NewVppAdapter() adapter.VppAdapter {
- return &vppAPIClientAdapter{}
+func NewVppAdapter(shmPrefix string) adapter.VppAdapter {
+ return &vppAPIClientAdapter{
+ shmPrefix: shmPrefix,
+ }
}
// Connect connects the process to VPP.
func (a *vppAPIClientAdapter) Connect() error {
vppClient = a
}
// Connect connects the process to VPP.
func (a *vppAPIClientAdapter) Connect() error {
vppClient = a
- rc := C.govpp_connect()
+ var rc _Ctype_int
+ if a.shmPrefix == "" {
+ rc = C.govpp_connect(nil)
+ } else {
+ shm := C.CString(a.shmPrefix)
+ rc = C.govpp_connect(shm)
+ }
if rc != 0 {
return fmt.Errorf("unable to connect to VPP (error=%d)", rc)
}
if rc != 0 {
return fmt.Errorf("unable to connect to VPP (error=%d)", rc)
}
if err != nil {
return err
}
if err != nil {
return err
}
-
- if fileExists(watchedFile) {
+ // Path to the shared memory segment with prefix, if set
+ var path string
+ if a.shmPrefix == "" {
+ path = watchedFolder + watchedFile
+ } else {
+ path = watchedFolder + a.shmPrefix + "-" + watchedFile
+ }
+ if fileExists(path) {
return nil
}
for {
ev := <-watcher.Events
return nil
}
for {
ev := <-watcher.Events
- if ev.Name == watchedFile && (ev.Op&fsnotify.Create) == fsnotify.Create {
+ if ev.Name == path && (ev.Op&fsnotify.Create) == fsnotify.Create {
byteArr := *(*[]byte)(unsafe.Pointer(slice))
vppClient.callback(uint32(context), uint16(msgID), byteArr)
byteArr := *(*[]byte)(unsafe.Pointer(slice))
vppClient.callback(uint32(context), uint16(msgID), byteArr)
+}
\ No newline at end of file
- "github.com/sirupsen/logrus"
+ "github.com/sirupsen/logrus"
"git.fd.io/govpp.git"
"git.fd.io/govpp.git/api"
"git.fd.io/govpp.git"
"git.fd.io/govpp.git/api"
core.SetLogger(&logrus.Logger{Level: logrus.ErrorLevel})
// connect to VPP
core.SetLogger(&logrus.Logger{Level: logrus.ErrorLevel})
// connect to VPP
- conn, err := govpp.Connect()
+ conn, err := govpp.Connect("")
if err != nil {
log.Println("Error:", err)
os.Exit(1)
if err != nil {
log.Println("Error:", err)
os.Exit(1)
+}
\ No newline at end of file
fmt.Println("Starting simple VPP client...")
// connect to VPP
fmt.Println("Starting simple VPP client...")
// connect to VPP
- conn, err := govpp.Connect()
+ conn, err := govpp.Connect("")
if err != nil {
fmt.Println("Error:", err)
os.Exit(1)
if err != nil {
fmt.Println("Error:", err)
os.Exit(1)
// unsubscribe from delivery of the notifications
ch.UnsubscribeNotification(subs)
// unsubscribe from delivery of the notifications
ch.UnsubscribeNotification(subs)
+}
\ No newline at end of file
fmt.Println("Starting stats VPP client...")
// async connect to VPP
fmt.Println("Starting stats VPP client...")
// async connect to VPP
- conn, statCh, err := govpp.AsyncConnect()
+ conn, statCh, err := govpp.AsyncConnect("")
if err != nil {
fmt.Println("Error:", err)
os.Exit(1)
if err != nil {
fmt.Println("Error:", err)
os.Exit(1)
counters.FirstSwIfIndex+i, counterNames[counters.VnetCounterType], counters.Data[i].Packets,
counterNames[counters.VnetCounterType], counters.Data[i].Bytes)
}
counters.FirstSwIfIndex+i, counterNames[counters.VnetCounterType], counters.Data[i].Packets,
counterNames[counters.VnetCounterType], counters.Data[i].Bytes)
}
+}
\ No newline at end of file
// Connect connects the govpp core to VPP either using the default VPP Adapter, or using the adapter previously
// set by SetAdapter (useful mostly just for unit/integration tests with mocked VPP adapter).
// This call blocks until VPP is connected, or an error occurs. Only one connection attempt will be performed.
// Connect connects the govpp core to VPP either using the default VPP Adapter, or using the adapter previously
// set by SetAdapter (useful mostly just for unit/integration tests with mocked VPP adapter).
// This call blocks until VPP is connected, or an error occurs. Only one connection attempt will be performed.
-func Connect() (*core.Connection, error) {
+func Connect(shm string) (*core.Connection, error) {
- vppAdapter = vppapiclient.NewVppAdapter()
+ vppAdapter = vppapiclient.NewVppAdapter(shm)
}
return core.Connect(vppAdapter)
}
}
return core.Connect(vppAdapter)
}
// This call does not block until connection is established, it returns immediately. The caller is
// supposed to watch the returned ConnectionState channel for Connected/Disconnected events.
// In case of disconnect, the library will asynchronously try to reconnect.
// This call does not block until connection is established, it returns immediately. The caller is
// supposed to watch the returned ConnectionState channel for Connected/Disconnected events.
// In case of disconnect, the library will asynchronously try to reconnect.
-func AsyncConnect() (*core.Connection, chan core.ConnectionEvent, error) {
+func AsyncConnect(shm string) (*core.Connection, chan core.ConnectionEvent, error) {
- vppAdapter = vppapiclient.NewVppAdapter()
+ vppAdapter = vppapiclient.NewVppAdapter(shm)
}
return core.AsyncConnect(vppAdapter)
}
}
return core.AsyncConnect(vppAdapter)
}
// SetAdapter sets the adapter that will be used for connections to VPP in the subsequent `Connect` calls.
func SetAdapter(ad adapter.VppAdapter) {
vppAdapter = ad
// SetAdapter sets the adapter that will be used for connections to VPP in the subsequent `Connect` calls.
func SetAdapter(ad adapter.VppAdapter) {
vppAdapter = ad
+}
\ No newline at end of file