use new way

Author: 1daidai1

internal/ccontrol/ccontrol.go

@@ -406,10 +406,7 @@ func ShowJobs(jobIds string, queryAll bool) util.CraneCmdError {
 			return util.ErrorGeneric
 		}
 
-		allocDeviceTotal := "None"
-		if len(taskInfo.AllocatedResView.DeviceMap) != 0 {
-			allocDeviceTotal = taskInfo.AllocatedResView.DeviceMap
-		}
+		allocDeviceTotal := util.GetDeviceMapStr(taskInfo.AllocatedResView)
 
 		printed[taskInfo.TaskId] = true
 

internal/util/string.go

@@ -736,6 +736,42 @@ func ParseGres(gres string) *protos.DeviceMap {
 	return result
 }
 
+func GetDeviceMapStr(resourceView *protos.ResourceView) string {
+	if resourceView.DeviceMap == nil ||
+	resourceView.DeviceMap.NameTypeMap == nil ||
+	len(resourceView.DeviceMap.NameTypeMap) == 0 {
+		return "None"
+	}
+
+	var result strings.Builder
+	isFirstDevice := true      
+
+	for deviceName, typeCountMap := range resourceView.DeviceMap.NameTypeMap {
+		if !isFirstDevice {
+			result.WriteString("; ")
+		} else {
+			isFirstDevice = false
+		}
+		result.WriteString(fmt.Sprintf("%s:", deviceName))
+		if typeCountMap.Total > 0 {
+			result.WriteString(fmt.Sprintf("untyped:%d", typeCountMap.Total))
+		}
+
+		isFirstType := typeCountMap.Total == 0
+		for typeName, count := range typeCountMap.TypeCountMap {
+			if !isFirstType {
+				result.WriteString(",")
+			} else {
+				isFirstType = false
+			}
+
+			result.WriteString(fmt.Sprintf("%s:%d", typeName, count))
+		}
+	}
+
+	return result.String()
+}
+
 func ParseTaskStatusName(state string) (protos.TaskStatus, error) {
 	state = strings.ToLower(state)
 	switch state {

protos/PublicDefs.proto

@@ -68,10 +68,6 @@ message ResourceV2 {
   map<string /*craned id*/, ResourceInNode> each_node_res = 1;
 }
 
-message ResourceViewStr {
-  AllocatableResource allocatable_res = 1;
-  string device_map = 2;
-}
 
 message ResourceView {
   AllocatableResource allocatable_res = 1;
@@ -295,7 +291,7 @@ message TaskInfo {
   google.protobuf.Duration elapsed_time = 37;
   repeated string execution_node = 38;
   bool exclusive = 39;
-  ResourceViewStr allocated_res_view = 40;
+  ResourceView allocated_res_view = 40;
 }
 
 message PartitionInfo {