Merge pull request #2847 from hustcat/cache_id

Add cache id for cache info.
google · Apr 21, 2021 · 73fc5bc · 73fc5bc
2 parents ef7e64f + 7dc0126
commit 73fc5bc
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 5 deletions.
diff --git a/info/v1/machine.go b/info/v1/machine.go
@@ -54,6 +54,8 @@ type Core struct {
 }
 
 type Cache struct {
+	// Id of memory cache
+	Id int `json:"id"`
 	// Size of memory cache in bytes.
 	Size uint64 `json:"size"`
 	// Type of memory cache: data, instruction, or unified.

diff --git a/machine/topology_test.go b/machine/topology_test.go
@@ -248,6 +248,7 @@ func TestTopologyWithoutNodes(t *testing.T) {
 	sysFs := &fakesysfs.FakeSysFs{}
 
 	c := sysfs.CacheInfo{
+		Id:    0,
 		Size:  32 * 1024,
 		Type:  "unified",
 		Level: 0,
@@ -297,7 +298,7 @@ func TestTopologyWithoutNodes(t *testing.T) {
 	topologyJSON2, err := json.Marshal(topology[1])
 	assert.Nil(t, err)
 
-	expectedTopology1 := `{"node_id":0,"memory":0,"hugepages":null,"cores":[{"core_id":0,"thread_ids":[0,2],"caches":[{"size":32768,"type":"unified","level":0}], "socket_id": 0}],"caches":null}`
+	expectedTopology1 := `{"node_id":0,"memory":0,"hugepages":null,"cores":[{"core_id":0,"thread_ids":[0,2],"caches":[{"id":0, "size":32768,"type":"unified","level":0}], "socket_id": 0}],"caches":null}`
 	expectedTopology2 := `
 		{
 			"node_id":1,
@@ -312,6 +313,7 @@ func TestTopologyWithoutNodes(t *testing.T) {
 					],
 					"caches":[
 					{
+						"id": 0,
 						"size":32768,
 						"type":"unified",
 						"level":0

diff --git a/utils/sysfs/sysfs.go b/utils/sysfs/sysfs.go
@@ -64,6 +64,8 @@ var (
 )
 
 type CacheInfo struct {
+	// cache id
+	Id int
 	// size in bytes
 	Size uint64
 	// cache type - instruction, data, unified
@@ -292,14 +294,24 @@ func getCPUCount(cache string) (count int, err error) {
 	return
 }
 
-func (fs *realSysFs) GetCacheInfo(id int, name string) (CacheInfo, error) {
-	cachePath := fmt.Sprintf("%s%d/cache/%s", cacheDir, id, name)
-	out, err := ioutil.ReadFile(path.Join(cachePath, "/size"))
+func (fs *realSysFs) GetCacheInfo(cpu int, name string) (CacheInfo, error) {
+	cachePath := fmt.Sprintf("%s%d/cache/%s", cacheDir, cpu, name)
+	out, err := ioutil.ReadFile(path.Join(cachePath, "/id"))
+	if err != nil {
+		return CacheInfo{}, err
+	}
+	var id int
+	n, err := fmt.Sscanf(string(out), "%d", &id)
+	if err != nil || n != 1 {
+		return CacheInfo{}, err
+	}
+
+	out, err = ioutil.ReadFile(path.Join(cachePath, "/size"))
 	if err != nil {
 		return CacheInfo{}, err
 	}
 	var size uint64
-	n, err := fmt.Sscanf(string(out), "%dK", &size)
+	n, err = fmt.Sscanf(string(out), "%dK", &size)
 	if err != nil || n != 1 {
 		return CacheInfo{}, err
 	}
@@ -325,6 +337,7 @@ func (fs *realSysFs) GetCacheInfo(id int, name string) (CacheInfo, error) {
 		return CacheInfo{}, err
 	}
 	return CacheInfo{
+		Id:    id,
 		Size:  size,
 		Level: level,
 		Type:  cacheType,

diff --git a/utils/sysinfo/sysinfo.go b/utils/sysinfo/sysinfo.go
@@ -332,6 +332,7 @@ func addCacheInfo(sysFs sysfs.SysFs, node *info.Node) error {
 
 		for _, cache := range caches {
 			c := info.Cache{
+				Id:    cache.Id,
 				Size:  cache.Size,
 				Level: cache.Level,
 				Type:  cache.Type,

diff --git a/utils/sysinfo/sysinfo_test.go b/utils/sysinfo/sysinfo_test.go
@@ -119,6 +119,7 @@ func TestGetNodesInfo(t *testing.T) {
 	}{
 		{
 			sysfs.CacheInfo{
+				Id:    0,
 				Size:  32 * 1024,
 				Type:  "unified",
 				Level: 3,
@@ -183,6 +184,7 @@ func TestGetNodesInfo(t *testing.T) {
         ],
         "caches": [
           {
+            "id": 0,
             "size": 32768,
             "type": "unified",
             "level": 3
@@ -211,6 +213,7 @@ func TestGetNodesInfo(t *testing.T) {
         ],
         "caches": [
           {
+            "id": 0,
             "size": 32768,
             "type": "unified",
             "level": 3
@@ -222,6 +225,7 @@ func TestGetNodesInfo(t *testing.T) {
 		},
 		{
 			sysfs.CacheInfo{
+				Id:    0,
 				Size:  32 * 1024,
 				Type:  "unified",
 				Level: 3,
@@ -306,6 +310,7 @@ func TestGetNodesInfo(t *testing.T) {
         ],
         "caches": [
           {
+            "id": 0,
             "size": 32768,
             "type": "unified",
             "level": 3
@@ -341,6 +346,7 @@ func TestGetNodesInfo(t *testing.T) {
 func TestGetNodesInfoWithOfflineCPUs(t *testing.T) {
 	fakeSys := &fakesysfs.FakeSysFs{}
 	c := sysfs.CacheInfo{
+		Id:    0,
 		Size:  32 * 1024,
 		Type:  "unified",
 		Level: 3,
@@ -430,6 +436,7 @@ func TestGetNodesInfoWithOfflineCPUs(t *testing.T) {
         ],
         "caches": [
           {
+            "id": 0,
             "size": 32768,
             "type": "unified",
             "level": 3
@@ -457,6 +464,7 @@ func TestGetNodesInfoWithOfflineCPUs(t *testing.T) {
         ],
         "caches": [
           {
+            "id": 0,
             "size": 32768,
             "type": "unified",
             "level": 3
@@ -632,6 +640,7 @@ func TestGetNodesInfoWithoutCacheInfo(t *testing.T) {
 func TestGetNodesInfoWithoutHugePagesInfo(t *testing.T) {
 	fakeSys := &fakesysfs.FakeSysFs{}
 	c := sysfs.CacheInfo{
+		Id:    0,
 		Size:  32 * 1024,
 		Type:  "unified",
 		Level: 2,
@@ -698,6 +707,7 @@ func TestGetNodesInfoWithoutHugePagesInfo(t *testing.T) {
             ],
             "caches": [
               {
+                "id": 0,
                 "size": 32768,
                 "type": "unified",
                 "level": 2
@@ -721,6 +731,7 @@ func TestGetNodesInfoWithoutHugePagesInfo(t *testing.T) {
             ],
             "caches": [
               {
+                "id": 0,
                 "size": 32768,
                 "type": "unified",
                 "level": 2
@@ -739,6 +750,7 @@ func TestGetNodesInfoWithoutNodes(t *testing.T) {
 	fakeSys := &fakesysfs.FakeSysFs{}
 
 	c := sysfs.CacheInfo{
+		Id:    0,
 		Size:  32 * 1024,
 		Type:  "unified",
 		Level: 1,
@@ -801,6 +813,7 @@ func TestGetNodesInfoWithoutNodes(t *testing.T) {
 				  ],
 				  "caches":[
 					 {
+						"id": 0,
 						"size":32768,
 						"type":"unified",
 						"level":1
@@ -824,6 +837,7 @@ func TestGetNodesInfoWithoutNodes(t *testing.T) {
 				  ],
 				  "caches":[
 					 {
+						"id": 0,
 						"size":32768,
 						"type":"unified",
 						"level":1
@@ -1303,6 +1317,7 @@ func TestIgnoredNetworkDevices(t *testing.T) {
 func TestGetCacheInfo(t *testing.T) {
 	fakeSys := &fakesysfs.FakeSysFs{}
 	cacheInfo := sysfs.CacheInfo{
+		Id:    0,
 		Size:  1024,
 		Type:  "Data",
 		Level: 3,