app/testpmd: remove useless casts on statistics

[dpdk.git] / examples / vm_power_manager / channel_monitor.c

diff --git a/examples/vm_power_manager/channel_monitor.c b/examples/vm_power_manager/channel_monitor.c
index 4189bbf..7892d75 100644 (file)
--- a/examples/vm_power_manager/channel_monitor.c
+++ b/examples/vm_power_manager/channel_monitor.c
@@ -356,7 +356,6 @@ get_pcpu_to_control(struct policy *pol)
        /* Convert vcpu to pcpu. */
        struct vm_info info;
        int pcpu, count;
-       uint64_t mask_u64b;
        struct core_info *ci;
 
        ci = get_core_info();
@@ -377,13 +376,8 @@ get_pcpu_to_control(struct policy *pol)
                 */
                get_info_vm(pol->pkt.vm_name, &info);
                for (count = 0; count < pol->pkt.num_vcpu; count++) {
-                       mask_u64b =
-                               info.pcpu_mask[pol->pkt.vcpu_to_control[count]];
-                       for (pcpu = 0; mask_u64b;
-                                       mask_u64b &= ~(1ULL << pcpu++)) {
-                               if ((mask_u64b >> pcpu) & 1)
-                                       pcpu_monitor(pol, ci, pcpu, count);
-                       }
+                       pcpu = info.pcpu_map[pol->pkt.vcpu_to_control[count]];
+                       pcpu_monitor(pol, ci, pcpu, count);
                }
        } else {
                /*
@@ -441,7 +435,7 @@ update_policy(struct channel_packet *pkt)
                        /* Copy the contents of *pkt into the policy.pkt */
                        policies[i].pkt = *pkt;
                        get_pcpu_to_control(&policies[i]);
-                       if (get_pfid(&policies[i]) == -1) {
+                       if (get_pfid(&policies[i]) < 0) {
                                updated = 1;
                                break;
                        }
@@ -455,7 +449,7 @@ update_policy(struct channel_packet *pkt)
                        if (policies[i].enabled == 0) {
                                policies[i].pkt = *pkt;
                                get_pcpu_to_control(&policies[i]);
-                               if (get_pfid(&policies[i]) == -1)
+                               if (get_pfid(&policies[i]) < 0)
                                        break;
                                core_share_status(i);
                                policies[i].enabled = 1;
@@ -636,7 +630,7 @@ apply_policy(struct policy *pol)
 static int
 process_request(struct channel_packet *pkt, struct channel_info *chan_info)
 {
-       uint64_t core_mask;
+       int ret;
 
        if (chan_info == NULL)
                return -1;
@@ -646,41 +640,37 @@ process_request(struct channel_packet *pkt, struct channel_info *chan_info)
                return -1;
 
        if (pkt->command == CPU_POWER) {
-               core_mask = get_pcpus_mask(chan_info, pkt->resource_id);
-               if (core_mask == 0) {
-                       /*
-                        * Core mask will be 0 in the case where
-                        * hypervisor is not available so we're working in
-                        * the host, so use the core as the mask.
-                        */
-                       core_mask = 1ULL << pkt->resource_id;
-               }
-               if (__builtin_popcountll(core_mask) == 1) {
+               unsigned int core_num;
+
+               if (pkt->core_type == CORE_TYPE_VIRTUAL)
+                       core_num = get_pcpu(chan_info, pkt->resource_id);
+               else
+                       core_num = pkt->resource_id;
 
-                       unsigned core_num = __builtin_ffsll(core_mask) - 1;
+               RTE_LOG(DEBUG, CHANNEL_MONITOR, "Processing requested cmd for cpu:%d\n",
+                       core_num);
 
-                       switch (pkt->unit) {
-                       case(CPU_POWER_SCALE_MIN):
-                                       power_manager_scale_core_min(core_num);
+               switch (pkt->unit) {
+               case(CPU_POWER_SCALE_MIN):
+                       power_manager_scale_core_min(core_num);
                        break;
-                       case(CPU_POWER_SCALE_MAX):
-                                       power_manager_scale_core_max(core_num);
+               case(CPU_POWER_SCALE_MAX):
+                       power_manager_scale_core_max(core_num);
                        break;
-                       case(CPU_POWER_SCALE_DOWN):
-                                       power_manager_scale_core_down(core_num);
+               case(CPU_POWER_SCALE_DOWN):
+                       power_manager_scale_core_down(core_num);
                        break;
-                       case(CPU_POWER_SCALE_UP):
-                                       power_manager_scale_core_up(core_num);
+               case(CPU_POWER_SCALE_UP):
+                       power_manager_scale_core_up(core_num);
                        break;
-                       case(CPU_POWER_ENABLE_TURBO):
-                               power_manager_enable_turbo_core(core_num);
+               case(CPU_POWER_ENABLE_TURBO):
+                       power_manager_enable_turbo_core(core_num);
                        break;
-                       case(CPU_POWER_DISABLE_TURBO):
-                               power_manager_disable_turbo_core(core_num);
+               case(CPU_POWER_DISABLE_TURBO):
+                       power_manager_disable_turbo_core(core_num);
+                       break;
+               default:
                        break;
-                       default:
-                               break;
-                       }
                }
        }
 
@@ -692,9 +682,13 @@ process_request(struct channel_packet *pkt, struct channel_info *chan_info)
        }
 
        if (pkt->command == PKT_POLICY_REMOVE) {
-               RTE_LOG(INFO, CHANNEL_MONITOR,
-                                "Removing policy %s\n", pkt->vm_name);
-               remove_policy(pkt);
+               ret = remove_policy(pkt);
+               if (ret == 0)
+                       RTE_LOG(INFO, CHANNEL_MONITOR,
+                                "Removed policy %s\n", pkt->vm_name);
+               else
+                       RTE_LOG(INFO, CHANNEL_MONITOR,
+                                "Policy %s does not exist\n", pkt->vm_name);
        }
 
        /*
@@ -771,7 +765,7 @@ read_binary_packet(struct channel_info *chan_info)
                                buffer, buffer_len);
                if (n_bytes == buffer_len)
                        break;
-               if (n_bytes == -1) {
+               if (n_bytes < 0) {
                        err = errno;
                        RTE_LOG(DEBUG, CHANNEL_MONITOR,
                                "Received error on "