diff options
Diffstat (limited to 'adapter/statsclient/statsclient.go')
| -rw-r--r-- | adapter/statsclient/statsclient.go | 231 |
1 files changed, 44 insertions, 187 deletions
diff --git a/adapter/statsclient/statsclient.go b/adapter/statsclient/statsclient.go index 07fcc49..4022740 100644 --- a/adapter/statsclient/statsclient.go +++ b/adapter/statsclient/statsclient.go @@ -12,20 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. +// Package statsclient is pure Go implementation of VPP stats API client. package statsclient import ( "bytes" "fmt" - "net" "os" "regexp" - "sync/atomic" - "syscall" - "time" "unsafe" - "github.com/ftrvxmtrx/fd" logger "github.com/sirupsen/logrus" "git.fd.io/govpp.git/adapter" @@ -52,130 +48,59 @@ func init() { type StatsClient struct { sockAddr string - currentEpoch int64 - sharedHeader []byte - directoryVector uintptr - memorySize int + currentEpoch int64 + statSegment } // NewStatsClient returns new VPP stats API client. -func NewStatsClient(socketName string) *StatsClient { - return &StatsClient{ - sockAddr: socketName, - } -} - -func (c *StatsClient) Connect() error { - var sockName string - if c.sockAddr == "" { - sockName = adapter.DefaultStatsSocket - } else { - sockName = c.sockAddr +func NewStatsClient(sockAddr string) *StatsClient { + if sockAddr == "" { + sockAddr = adapter.DefaultStatsSocket } - - if _, err := os.Stat(sockName); err != nil { - if os.IsNotExist(err) { - return fmt.Errorf("stats socket file %q does not exists, ensure that VPP is running with `statseg { ... }` section in config", sockName) - } - return fmt.Errorf("stats socket file error: %v", err) - } - - if err := c.statSegmentConnect(sockName); err != nil { - return err + return &StatsClient{ + sockAddr: sockAddr, } - - return nil } -const statshmFilename = "statshm" +const sockNotFoundWarn = `VPP stats socket not found at: %s! + Check if VPP is running with stats segment enabled. + To enable it include following section in VPP config: + statseg { + default + } +` -func (c *StatsClient) statSegmentConnect(sockName string) error { - addr := &net.UnixAddr{ - Net: "unixpacket", - Name: sockName, +func (c *StatsClient) Connect() error { + // check if socket exists + if _, err := os.Stat(c.sockAddr); os.IsNotExist(err) { + Log.Warnf(sockNotFoundWarn, c.sockAddr) + return fmt.Errorf("stats socket file %s does not exist", c.sockAddr) + } else if err != nil { + return fmt.Errorf("stats socket error: %v", err) } - Log.Debugf("connecting to: %v", addr) - - conn, err := net.DialUnix(addr.Net, nil, addr) - if err != nil { - Log.Warnf("connecting to socket %s failed: %s", addr, err) + if err := c.statSegment.connect(c.sockAddr); err != nil { return err } - defer func() { - if err := conn.Close(); err != nil { - Log.Warnf("closing socket failed: %v", err) - } - }() - - Log.Debugf("connected to socket: %v", addr) - - files, err := fd.Get(conn, 1, []string{statshmFilename}) - if err != nil { - return fmt.Errorf("getting file descriptor over socket failed: %v", err) - } else if len(files) == 0 { - return fmt.Errorf("no files received over socket") - } - defer func() { - for _, f := range files { - if err := f.Close(); err != nil { - Log.Warnf("closing file %s failed: %v", f.Name(), err) - } - } - }() - - Log.Debugf("received %d files over socket", len(files)) - f := files[0] + ver := c.readVersion() + Log.Debugf("stat segment version: %v", ver) - info, err := f.Stat() - if err != nil { + if err := checkVersion(ver); err != nil { return err } - size := int(info.Size()) - - Log.Debugf("fd: name=%v size=%v", info.Name(), size) - - data, err := syscall.Mmap(int(f.Fd()), 0, size, syscall.PROT_READ, syscall.MAP_SHARED) - if err != nil { - Log.Warnf("mapping shared memory failed: %v", err) - return fmt.Errorf("mapping shared memory failed: %v", err) - } - - Log.Debugf("successfuly mapped shared memory") - - c.sharedHeader = data - c.memorySize = size - return nil } func (c *StatsClient) Disconnect() error { - err := syscall.Munmap(c.sharedHeader) - if err != nil { - Log.Warnf("unmapping shared memory failed: %v", err) - return fmt.Errorf("unmapping shared memory failed: %v", err) + if err := c.statSegment.disconnect(); err != nil { + return err } - Log.Debugf("successfuly unmapped shared memory") - return nil } -func nameMatches(name string, patterns []string) bool { - if len(patterns) == 0 { - return true - } - for _, pattern := range patterns { - matched, err := regexp.MatchString(pattern, name) - if err == nil && matched { - return true - } - } - return false -} - func (c *StatsClient) ListStats(patterns ...string) (statNames []string, err error) { sa := c.accessStart() if sa == nil { @@ -344,11 +269,17 @@ func (c *StatsClient) copyData(dirEntry *statSegDirectoryEntry) (statEntry adapt nameVector := unsafe.Pointer(&c.sharedHeader[dirEntry.unionData]) // offset vecLen := vectorLen(nameVector) offsetVector := add(unsafe.Pointer(&c.sharedHeader[0]), uintptr(dirEntry.offsetVector)) + fmt.Printf("vecLen: %v\n", vecLen) data := make([]adapter.Name, vecLen) for i := uint64(0); i < vecLen; i++ { cb := *(*uint64)(add(offsetVector, uintptr(i)*unsafe.Sizeof(uint64(0)))) - nameVec := unsafe.Pointer(&c.sharedHeader[uintptr(cb)]) + if cb == 0 { + Log.Debugf("\tname vector cb out of range") + continue + } + nameVec := unsafe.Pointer(&c.sharedHeader[cb]) + fmt.Printf("offsetVector: %v, cb: %v\n", offsetVector, cb) vecLen2 := vectorLen(nameVec) var nameStr []byte @@ -372,89 +303,15 @@ func (c *StatsClient) copyData(dirEntry *statSegDirectoryEntry) (statEntry adapt return statEntry } -type statDirectoryType int32 - -func (t statDirectoryType) String() string { - return adapter.StatType(t).String() -} - -type statSegDirectoryEntry struct { - directoryType statDirectoryType - // unionData can represent: offset, index or value - unionData uint64 - offsetVector uint64 - name [128]byte -} - -type statSegSharedHeader struct { - version uint64 - epoch int64 - inProgress int64 - directoryOffset int64 - errorOffset int64 - statsOffset int64 -} - -func (c *StatsClient) readVersion() uint64 { - header := *(*statSegSharedHeader)(unsafe.Pointer(&c.sharedHeader[0])) - version := atomic.LoadUint64(&header.version) - return version -} - -func (c *StatsClient) readEpoch() (int64, bool) { - header := *(*statSegSharedHeader)(unsafe.Pointer(&c.sharedHeader[0])) - epoch := atomic.LoadInt64(&header.epoch) - inprog := atomic.LoadInt64(&header.inProgress) - return epoch, inprog != 0 -} - -func (c *StatsClient) readOffsets() (dir, err, stat int64) { - header := *(*statSegSharedHeader)(unsafe.Pointer(&c.sharedHeader[0])) - dirOffset := atomic.LoadInt64(&header.directoryOffset) - errOffset := atomic.LoadInt64(&header.errorOffset) - statOffset := atomic.LoadInt64(&header.statsOffset) - return dirOffset, errOffset, statOffset -} - -type statSegAccess struct { - epoch int64 -} - -var maxWaitInProgress = 1 * time.Second - -func (c *StatsClient) accessStart() *statSegAccess { - epoch, inprog := c.readEpoch() - t := time.Now() - for inprog { - if time.Since(t) > maxWaitInProgress { - return nil - } - epoch, inprog = c.readEpoch() - } - return &statSegAccess{ - epoch: epoch, +func nameMatches(name string, patterns []string) bool { + if len(patterns) == 0 { + return true } -} - -func (c *StatsClient) accessEnd(acc *statSegAccess) bool { - epoch, inprog := c.readEpoch() - if acc.epoch != epoch || inprog { - return false + for _, pattern := range patterns { + matched, err := regexp.MatchString(pattern, name) + if err == nil && matched { + return true + } } - return true -} - -type vecHeader struct { - length uint64 - vectorData [0]uint8 -} - -func vectorLen(v unsafe.Pointer) uint64 { - vec := *(*vecHeader)(unsafe.Pointer(uintptr(v) - unsafe.Sizeof(uintptr(0)))) - return vec.length -} - -//go:nosplit -func add(p unsafe.Pointer, x uintptr) unsafe.Pointer { - return unsafe.Pointer(uintptr(p) + x) + return false } |