Change-Id: If77b7b37ae736fdf21f4c337350905480e6fb011
Signed-off-by: Vladimir Lavor <vlavor@cisco.com>
// statSegment represents common API for every stats API version
type statSegment interface {
// GetDirectoryVector returns pointer to memory where the beginning
// statSegment represents common API for every stats API version
type statSegment interface {
// GetDirectoryVector returns pointer to memory where the beginning
- // of the data directory is located
- GetDirectoryVector() (unsafe.Pointer, error)
+ // of the data directory is located.
+ GetDirectoryVector() unsafe.Pointer
// GetStatDirOnIndex accepts directory vector and particular index.
// Returns pointer to the beginning of the segment. Also the directory
// GetStatDirOnIndex accepts directory vector and particular index.
// Returns pointer to the beginning of the segment. Also the directory
- dirVector, err := sc.GetDirectoryVector()
- if err != nil {
+ dirVector := sc.GetDirectoryVector()
+ if dirVector == nil {
return nil, fmt.Errorf("failed to list stats: %v", err)
}
vecLen := *(*uint32)(vectorLen(dirVector))
return nil, fmt.Errorf("failed to list stats: %v", err)
}
vecLen := *(*uint32)(vectorLen(dirVector))
- dirVector, err := sc.GetDirectoryVector()
- if err != nil {
+ dirVector := sc.GetDirectoryVector()
+ if dirVector == nil {
return nil, err
}
dirLen := *(*uint32)(vectorLen(dirVector))
return nil, err
}
dirLen := *(*uint32)(vectorLen(dirVector))
- dirVector, err := sc.GetDirectoryVector()
- if err != nil {
+ dirVector := sc.GetDirectoryVector()
+ if dirVector == nil {
return nil, err
}
dirLen := *(*uint32)(vectorLen(dirVector))
return nil, err
}
dirLen := *(*uint32)(vectorLen(dirVector))
return adapter.ErrStatsAccessFailed
}
return adapter.ErrStatsAccessFailed
}
- dirVector, err := sc.GetDirectoryVector()
- if err != nil {
+ dirVector := sc.GetDirectoryVector()
+ if dirVector == nil {
return err
}
for i, index := range dir.Indexes {
return err
}
for i, index := range dir.Indexes {
indexes = make([]uint32, 0, 3200)
}
indexes = make([]uint32, 0, 3200)
}
- dirVector, err := sc.GetDirectoryVector()
- if err != nil {
+ dirVector := sc.GetDirectoryVector()
+ if dirVector == nil {
return nil, err
}
vecLen := *(*uint32)(vectorLen(dirVector))
return nil, err
}
vecLen := *(*uint32)(vectorLen(dirVector))
-func (ss *statSegmentV1) GetDirectoryVector() (unsafe.Pointer, error) {
+func (ss *statSegmentV1) GetDirectoryVector() unsafe.Pointer {
dirOffset, _, _ := ss.getOffsets()
dirOffset, _, _ := ss.getOffsets()
- return unsafe.Pointer(&ss.sharedHeader[dirOffset]), nil
+ return unsafe.Pointer(&ss.sharedHeader[dirOffset])
}
func (ss *statSegmentV1) GetErrorVector() (unsafe.Pointer, error) {
}
func (ss *statSegmentV1) GetErrorVector() (unsafe.Pointer, error) {
package statsclient
import (
package statsclient
import (
-func (ss *statSegmentV2) GetDirectoryVector() (unsafe.Pointer, error) {
+func (ss *statSegmentV2) GetDirectoryVector() unsafe.Pointer {
header := ss.loadSharedHeader(ss.sharedHeader)
return ss.adjust(unsafe.Pointer(&header.dirVector))
}
header := ss.loadSharedHeader(ss.sharedHeader)
return ss.adjust(unsafe.Pointer(&header.dirVector))
}
return adapter.ScalarStat(dirEntry.unionData)
case statDirErrorIndex:
return adapter.ScalarStat(dirEntry.unionData)
case statDirErrorIndex:
- dirVector, err := ss.getErrorVector()
- if err != nil {
+ dirVector := ss.getErrorVector()
+ if dirVector == nil {
debugf("error vector pointer is out of range for %s", dirEntry.name)
return nil
}
debugf("error vector pointer is out of range for %s", dirEntry.name)
return nil
}
var errData adapter.Counter
for i := uint32(0); i < vecLen; i++ {
cb := statSegPointer(dirVector, uintptr(i+1)*unsafe.Sizeof(uint64(0)))
var errData adapter.Counter
for i := uint32(0); i < vecLen; i++ {
cb := statSegPointer(dirVector, uintptr(i+1)*unsafe.Sizeof(uint64(0)))
- cbVal, err := ss.adjust(vectorLen(cb))
- if err != nil {
+ cbVal := ss.adjust(vectorLen(cb))
+ if cbVal == nil {
debugf("error counter pointer out of range")
continue
}
debugf("error counter pointer out of range")
continue
}
return adapter.ErrorStat(errData)
case statDirCounterVectorSimple:
return adapter.ErrorStat(errData)
case statDirCounterVectorSimple:
- dirVector, err := ss.adjust(unsafe.Pointer(&dirEntry.unionData))
- if err != nil {
+ dirVector := ss.adjust(unsafe.Pointer(&dirEntry.unionData))
+ if dirVector == nil {
debugf("data vector pointer is out of range for %s", dirEntry.name)
return nil
}
debugf("data vector pointer is out of range for %s", dirEntry.name)
return nil
}
data := make([][]adapter.Counter, vecLen)
for i := uint32(0); i < vecLen; i++ {
counterVectorOffset := statSegPointer(dirVector, uintptr(i+1)*unsafe.Sizeof(uint64(0)))
data := make([][]adapter.Counter, vecLen)
for i := uint32(0); i < vecLen; i++ {
counterVectorOffset := statSegPointer(dirVector, uintptr(i+1)*unsafe.Sizeof(uint64(0)))
- counterVector, err := ss.adjust(vectorLen(counterVectorOffset))
- if err != nil {
+ counterVector := ss.adjust(vectorLen(counterVectorOffset))
+ if counterVector == nil {
debugf("counter (vector simple) pointer out of range")
continue
}
debugf("counter (vector simple) pointer out of range")
continue
}
return adapter.SimpleCounterStat(data)
case statDirCounterVectorCombined:
return adapter.SimpleCounterStat(data)
case statDirCounterVectorCombined:
- dirVector, err := ss.adjust(unsafe.Pointer(&dirEntry.unionData))
- if err != nil {
+ dirVector := ss.adjust(unsafe.Pointer(&dirEntry.unionData))
+ if dirVector == nil {
debugf("data vector pointer is out of range for %s", dirEntry.name)
return nil
}
debugf("data vector pointer is out of range for %s", dirEntry.name)
return nil
}
data := make([][]adapter.CombinedCounter, vecLen)
for i := uint32(0); i < vecLen; i++ {
counterVectorOffset := statSegPointer(dirVector, uintptr(i+1)*unsafe.Sizeof(uint64(0)))
data := make([][]adapter.CombinedCounter, vecLen)
for i := uint32(0); i < vecLen; i++ {
counterVectorOffset := statSegPointer(dirVector, uintptr(i+1)*unsafe.Sizeof(uint64(0)))
- counterVector, err := ss.adjust(vectorLen(counterVectorOffset))
- if err != nil {
+ counterVector := ss.adjust(vectorLen(counterVectorOffset))
+ if counterVector == nil {
debugf("counter (vector combined) pointer out of range")
continue
}
debugf("counter (vector combined) pointer out of range")
continue
}
return adapter.CombinedCounterStat(data)
case statDirNameVector:
return adapter.CombinedCounterStat(data)
case statDirNameVector:
- dirVector, err := ss.adjust(unsafe.Pointer(&dirEntry.unionData))
- if err != nil {
+ dirVector := ss.adjust(unsafe.Pointer(&dirEntry.unionData))
+ if dirVector == nil {
debugf("data vector pointer is out of range for %s", dirEntry.name)
return nil
}
debugf("data vector pointer is out of range for %s", dirEntry.name)
return nil
}
debugf("name vector out of range for %s (%v)", dirEntry.name, i)
continue
}
debugf("name vector out of range for %s (%v)", dirEntry.name, i)
continue
}
- nameVector, err := ss.adjust(vectorLen(nameVectorOffset))
- if err != nil {
+ nameVector := ss.adjust(vectorLen(nameVectorOffset))
+ if nameVector == nil {
debugf("name data pointer out of range")
continue
}
debugf("name data pointer out of range")
continue
}
*stat = adapter.ScalarStat(dirEntry.unionData)
case adapter.ErrorStat:
*stat = adapter.ScalarStat(dirEntry.unionData)
case adapter.ErrorStat:
- dirVector, err := ss.getErrorVector()
- if err != nil {
+ dirVector := ss.getErrorVector()
+ if dirVector == nil {
debugf("error vector pointer is out of range for %s", dirEntry.name)
return nil
}
debugf("error vector pointer is out of range for %s", dirEntry.name)
return nil
}
var errData adapter.Counter
for i := uint32(0); i < vecLen; i++ {
cb := statSegPointer(dirVector, uintptr(i+1)*unsafe.Sizeof(uint64(0)))
var errData adapter.Counter
for i := uint32(0); i < vecLen; i++ {
cb := statSegPointer(dirVector, uintptr(i+1)*unsafe.Sizeof(uint64(0)))
- cbVal, err := ss.adjust(vectorLen(cb))
- if err != nil {
+ cbVal := ss.adjust(vectorLen(cb))
+ if cbVal == nil {
debugf("error counter pointer out of range")
continue
}
debugf("error counter pointer out of range")
continue
}
*stat = adapter.ErrorStat(errData)
case adapter.SimpleCounterStat:
*stat = adapter.ErrorStat(errData)
case adapter.SimpleCounterStat:
- dirVector, err := ss.adjust(unsafe.Pointer(&dirEntry.unionData))
- if err != nil {
+ dirVector := ss.adjust(unsafe.Pointer(&dirEntry.unionData))
+ if dirVector == nil {
debugf("data vector pointer is out of range for %s", dirEntry.name)
return nil
}
debugf("data vector pointer is out of range for %s", dirEntry.name)
return nil
}
}
for i := uint32(0); i < vecLen; i++ {
counterVectorOffset := statSegPointer(dirVector, uintptr(i+1)*unsafe.Sizeof(uint64(0)))
}
for i := uint32(0); i < vecLen; i++ {
counterVectorOffset := statSegPointer(dirVector, uintptr(i+1)*unsafe.Sizeof(uint64(0)))
- counterVector, err := ss.adjust(vectorLen(counterVectorOffset))
- if err != nil {
+ counterVector := ss.adjust(vectorLen(counterVectorOffset))
+ if counterVector == nil {
debugf("counter (vector simple) pointer out of range")
continue
}
debugf("counter (vector simple) pointer out of range")
continue
}
}
case adapter.CombinedCounterStat:
}
case adapter.CombinedCounterStat:
- dirVector, err := ss.adjust(unsafe.Pointer(&dirEntry.unionData))
- if err != nil {
+ dirVector := ss.adjust(unsafe.Pointer(&dirEntry.unionData))
+ if dirVector == nil {
debugf("data vector pointer is out of range for %s", dirEntry.name)
return nil
}
debugf("data vector pointer is out of range for %s", dirEntry.name)
return nil
}
data := (*stat).(adapter.CombinedCounterStat)
for i := uint32(0); i < vecLen; i++ {
counterVectorOffset := statSegPointer(dirVector, uintptr(i+1)*unsafe.Sizeof(uint64(0)))
data := (*stat).(adapter.CombinedCounterStat)
for i := uint32(0); i < vecLen; i++ {
counterVectorOffset := statSegPointer(dirVector, uintptr(i+1)*unsafe.Sizeof(uint64(0)))
- counterVector, err := ss.adjust(vectorLen(counterVectorOffset))
- if err != nil {
+ counterVector := ss.adjust(vectorLen(counterVectorOffset))
+ if counterVector == nil {
debugf("counter (vector combined) pointer out of range")
continue
}
debugf("counter (vector combined) pointer out of range")
continue
}
- dirVector, err := ss.adjust(unsafe.Pointer(&dirEntry.unionData))
- if err != nil {
+ dirVector := ss.adjust(unsafe.Pointer(&dirEntry.unionData))
+ if dirVector == nil {
debugf("data vector pointer is out of range for %s", dirEntry.name)
return nil
}
debugf("data vector pointer is out of range for %s", dirEntry.name)
return nil
}
debugf("name vector out of range for %s (%v)", dirEntry.name, i)
continue
}
debugf("name vector out of range for %s (%v)", dirEntry.name, i)
continue
}
- nameVector, err := ss.adjust(vectorLen(nameVectorOffset))
- if err != nil {
+ nameVector := ss.adjust(vectorLen(nameVectorOffset))
+ if nameVector == nil {
debugf("name data pointer out of range")
continue
}
debugf("name data pointer out of range")
continue
}
// Adjust data pointer using shared header and base and return
// the pointer to a data segment
// Adjust data pointer using shared header and base and return
// the pointer to a data segment
-func (ss *statSegmentV2) adjust(data unsafe.Pointer) (unsafe.Pointer, error) {
+func (ss *statSegmentV2) adjust(data unsafe.Pointer) unsafe.Pointer {
header := ss.loadSharedHeader(ss.sharedHeader)
adjusted := unsafe.Pointer(uintptr(unsafe.Pointer(&ss.sharedHeader[0])) +
uintptr(*(*uint64)(data)) - uintptr(*(*uint64)(unsafe.Pointer(&header.base))))
if uintptr(unsafe.Pointer(&ss.sharedHeader[len(ss.sharedHeader)-1])) <= uintptr(adjusted) ||
uintptr(unsafe.Pointer(&ss.sharedHeader[0])) >= uintptr(adjusted) {
header := ss.loadSharedHeader(ss.sharedHeader)
adjusted := unsafe.Pointer(uintptr(unsafe.Pointer(&ss.sharedHeader[0])) +
uintptr(*(*uint64)(data)) - uintptr(*(*uint64)(unsafe.Pointer(&header.base))))
if uintptr(unsafe.Pointer(&ss.sharedHeader[len(ss.sharedHeader)-1])) <= uintptr(adjusted) ||
uintptr(unsafe.Pointer(&ss.sharedHeader[0])) >= uintptr(adjusted) {
- return nil, fmt.Errorf("adjusted data out of range for %v", data)
-func (ss *statSegmentV2) getErrorVector() (unsafe.Pointer, error) {
+func (ss *statSegmentV2) getErrorVector() unsafe.Pointer {
header := ss.loadSharedHeader(ss.sharedHeader)
return ss.adjust(unsafe.Pointer(&header.errorVector))
}
header := ss.loadSharedHeader(ss.sharedHeader)
return ss.adjust(unsafe.Pointer(&header.errorVector))
}