mirror of
				https://github.com/ClusterCockpit/cc-metric-collector.git
				synced 2025-10-30 16:45:07 +01:00 
			
		
		
		
	Lookup core ID from /sys/devices/system/cpu, /proc/cpuinfo is not portable
This commit is contained in:
		| @@ -71,13 +71,6 @@ func init() { | ||||
| 					return | ||||
| 				} | ||||
| 				cache.HwthreadList = append(cache.HwthreadList, id) | ||||
| 			case "core id": | ||||
| 				id, err := strconv.Atoi(value) | ||||
| 				if err != nil { | ||||
| 					log.Print(err) | ||||
| 					return | ||||
| 				} | ||||
| 				cache.CoreList = append(cache.CoreList, id) | ||||
| 			} | ||||
| 		} | ||||
| 	} | ||||
| @@ -134,6 +127,7 @@ func init() { | ||||
| 			return id | ||||
| 		} | ||||
|  | ||||
| 	cache.CoreList = make([]int, len(cache.HwthreadList)) | ||||
| 	cache.DieList = make([]int, len(cache.HwthreadList)) | ||||
| 	cache.SMTList = make([]int, len(cache.HwthreadList)) | ||||
| 	cache.NumaDomainList = make([]int, len(cache.HwthreadList)) | ||||
| @@ -146,6 +140,9 @@ func init() { | ||||
| 			) | ||||
| 		topoBase := filepath.Join(base, "topology") | ||||
|  | ||||
| 		// Lookup Core ID | ||||
| 		cache.CoreList[i] = fileToInt(filepath.Join(topoBase, "core_id")) | ||||
|  | ||||
| 		// Lookup CPU die id | ||||
| 		cache.DieList[i] = fileToInt(filepath.Join(topoBase, "die_id")) | ||||
| 		if cache.DieList[i] < 0 { | ||||
|   | ||||
		Reference in New Issue
	
	Block a user