diff options
Diffstat (limited to 'grpc/src/core/ext/filters/client_channel/backend_metric.cc')
| -rw-r--r-- | grpc/src/core/ext/filters/client_channel/backend_metric.cc | 51 |
1 files changed, 24 insertions, 27 deletions
diff --git a/grpc/src/core/ext/filters/client_channel/backend_metric.cc b/grpc/src/core/ext/filters/client_channel/backend_metric.cc index 441657ef..ddc2623d 100644 --- a/grpc/src/core/ext/filters/client_channel/backend_metric.cc +++ b/grpc/src/core/ext/filters/client_channel/backend_metric.cc @@ -19,9 +19,8 @@ #include "src/core/ext/filters/client_channel/backend_metric.h" #include "absl/strings/string_view.h" - -#include "udpa/data/orca/v1/orca_load_report.upb.h" #include "upb/upb.hpp" +#include "xds/data/orca/v3/orca_load_report.upb.h" namespace grpc_core { @@ -29,17 +28,17 @@ namespace { template <typename EntryType> std::map<absl::string_view, double> ParseMap( - udpa_data_orca_v1_OrcaLoadReport* msg, - const EntryType* (*entry_func)(const udpa_data_orca_v1_OrcaLoadReport*, + xds_data_orca_v3_OrcaLoadReport* msg, + const EntryType* (*entry_func)(const xds_data_orca_v3_OrcaLoadReport*, size_t*), - upb_strview (*key_func)(const EntryType*), + upb_StringView (*key_func)(const EntryType*), double (*value_func)(const EntryType*), Arena* arena) { std::map<absl::string_view, double> result; - size_t i = UPB_MAP_BEGIN; + size_t i = kUpb_Map_Begin; while (true) { const auto* entry = entry_func(msg, &i); if (entry == nullptr) break; - upb_strview key_view = key_func(entry); + upb_StringView key_view = key_func(entry); char* key = static_cast<char*>(arena->Alloc(key_view.size)); memcpy(key, key_view.data, key_view.size); result[absl::string_view(key, key_view.size)] = value_func(entry); @@ -49,33 +48,31 @@ std::map<absl::string_view, double> ParseMap( } // namespace -const LoadBalancingPolicy::BackendMetricData* ParseBackendMetricData( - const grpc_slice& serialized_load_report, Arena* arena) { +const LoadBalancingPolicy::BackendMetricAccessor::BackendMetricData* +ParseBackendMetricData(const Slice& serialized_load_report, Arena* arena) { upb::Arena upb_arena; - udpa_data_orca_v1_OrcaLoadReport* msg = - udpa_data_orca_v1_OrcaLoadReport_parse( - reinterpret_cast<const char*>( - GRPC_SLICE_START_PTR(serialized_load_report)), - GRPC_SLICE_LENGTH(serialized_load_report), upb_arena.ptr()); + xds_data_orca_v3_OrcaLoadReport* msg = xds_data_orca_v3_OrcaLoadReport_parse( + reinterpret_cast<const char*>(serialized_load_report.begin()), + serialized_load_report.size(), upb_arena.ptr()); if (msg == nullptr) return nullptr; - LoadBalancingPolicy::BackendMetricData* backend_metric_data = - arena->New<LoadBalancingPolicy::BackendMetricData>(); + auto* backend_metric_data = arena->New< + LoadBalancingPolicy::BackendMetricAccessor::BackendMetricData>(); backend_metric_data->cpu_utilization = - udpa_data_orca_v1_OrcaLoadReport_cpu_utilization(msg); + xds_data_orca_v3_OrcaLoadReport_cpu_utilization(msg); backend_metric_data->mem_utilization = - udpa_data_orca_v1_OrcaLoadReport_mem_utilization(msg); + xds_data_orca_v3_OrcaLoadReport_mem_utilization(msg); backend_metric_data->requests_per_second = - udpa_data_orca_v1_OrcaLoadReport_rps(msg); + xds_data_orca_v3_OrcaLoadReport_rps(msg); backend_metric_data->request_cost = - ParseMap<udpa_data_orca_v1_OrcaLoadReport_RequestCostEntry>( - msg, udpa_data_orca_v1_OrcaLoadReport_request_cost_next, - udpa_data_orca_v1_OrcaLoadReport_RequestCostEntry_key, - udpa_data_orca_v1_OrcaLoadReport_RequestCostEntry_value, arena); + ParseMap<xds_data_orca_v3_OrcaLoadReport_RequestCostEntry>( + msg, xds_data_orca_v3_OrcaLoadReport_request_cost_next, + xds_data_orca_v3_OrcaLoadReport_RequestCostEntry_key, + xds_data_orca_v3_OrcaLoadReport_RequestCostEntry_value, arena); backend_metric_data->utilization = - ParseMap<udpa_data_orca_v1_OrcaLoadReport_UtilizationEntry>( - msg, udpa_data_orca_v1_OrcaLoadReport_utilization_next, - udpa_data_orca_v1_OrcaLoadReport_UtilizationEntry_key, - udpa_data_orca_v1_OrcaLoadReport_UtilizationEntry_value, arena); + ParseMap<xds_data_orca_v3_OrcaLoadReport_UtilizationEntry>( + msg, xds_data_orca_v3_OrcaLoadReport_utilization_next, + xds_data_orca_v3_OrcaLoadReport_UtilizationEntry_key, + xds_data_orca_v3_OrcaLoadReport_UtilizationEntry_value, arena); return backend_metric_data; } |