X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=adapter%2Fstatsclient%2Fstatseg_v2.go;h=f8081124184516d167a8e01ed9a0f2642fb6ec52;hb=67cea0df30f7ef348e265c9326f7a9f15ba26240;hp=1f8aaeb89c8c6ef1938f6fac2ccf4a5d41f3b34f;hpb=874266e00029174d6ad512eeac678b0c99512cd7;p=govpp.git diff --git a/adapter/statsclient/statseg_v2.go b/adapter/statsclient/statseg_v2.go index 1f8aaeb..f808112 100644 --- a/adapter/statsclient/statseg_v2.go +++ b/adapter/statsclient/statseg_v2.go @@ -20,7 +20,7 @@ import ( "sync/atomic" "unsafe" - "git.fd.io/govpp.git/adapter" + "go.fd.io/govpp/adapter" ) type statSegmentV2 struct { @@ -72,7 +72,7 @@ func (ss *statSegmentV2) GetDirectoryVector() dirVector { return ss.adjust(dirVector(&header.dirVector)) } -func (ss *statSegmentV2) GetStatDirOnIndex(v dirVector, index uint32) (dirSegment, dirName, dirType) { +func (ss *statSegmentV2) GetStatDirOnIndex(v dirVector, index uint32) (dirSegment, dirName, adapter.StatType) { statSegDir := dirSegment(uintptr(v) + uintptr(index)*unsafe.Sizeof(statSegDirectoryEntryV2{})) dir := (*statSegDirectoryEntryV2)(statSegDir) var name []byte @@ -82,7 +82,7 @@ func (ss *statSegmentV2) GetStatDirOnIndex(v dirVector, index uint32) (dirSegmen break } } - return statSegDir, name, dir.directoryType + return statSegDir, name, getStatType(dir.directoryType, ss.getErrorVector() != nil) } func (ss *statSegmentV2) GetEpoch() (int64, bool) { @@ -94,7 +94,7 @@ func (ss *statSegmentV2) CopyEntryData(segment dirSegment, index uint32) adapter dirEntry := (*statSegDirectoryEntryV2)(segment) typ := getStatType(dirEntry.directoryType, ss.getErrorVector() != nil) // skip zero pointer value - if typ != adapter.ScalarIndex && typ != adapter.Empty && dirEntry.unionData == 0 { + if typ != adapter.ScalarIndex && typ != adapter.Empty && typ != adapter.ErrorIndex && dirEntry.unionData == 0 { debugf("data pointer not defined for %s", dirEntry.name) return nil }