Implement the gRPC APIs for the job stats
Add the job stats APIs in the rdc_api_service at the server side rdcd Add the job stats APIs for the RdcStandaloneHandler at the client side Make the load librdc.so and librdc_client.so thread safe. Impelement async update all fields in RdcEmbeddedHandler. Change-Id: I659d91efb32d1094d3b7f0f2cec39518cd7336ce
This commit is contained in:
committed by
Chris Freehill
parent
a547dc7efd
commit
fe3e75edfa
+4
-4
@@ -290,7 +290,7 @@ rdc_status_t rdc_shutdown();
|
||||
* @details The RDC is loaded as library so that it does not require rdcd
|
||||
* daemon. In this mode, the user has to periodically call
|
||||
* rdc_field_update_all() when op_mode is RDC_OPERATION_MODE_MANUAL, which
|
||||
* tells RDC to collect the stats. This function is not thread safe.
|
||||
* tells RDC to collect the stats.
|
||||
*
|
||||
* @param[in] op_mode Operation modes. When RDC_OPERATION_MODE_AUTO, RDC schedules
|
||||
* background task to collect the stats. When RDC_OPERATION_MODE_MANUAL, the user
|
||||
@@ -308,7 +308,7 @@ rdc_status_t rdc_start_embedded(rdc_operation_mode_t op_mode,
|
||||
* @brief Stop embedded RDC agent.
|
||||
*
|
||||
* @details Stop the embedded RDC agent, and p_rdc_handle becomes
|
||||
* invalid after this call. This function is not thread safe.
|
||||
* invalid after this call.
|
||||
*
|
||||
* @param[in] p_rdc_handle The RDC handler that come from
|
||||
* rdc_start_embedded().
|
||||
@@ -320,7 +320,7 @@ rdc_status_t rdc_stop_embedded(rdc_handle_t p_rdc_handle);
|
||||
* @brief Connect to rdcd daemon
|
||||
*
|
||||
* @details This method is used to connect to a remote stand-alone
|
||||
* rdcd daemon. This function is not thread safe.
|
||||
* rdcd daemon.
|
||||
*
|
||||
* @param[in] ipAndPort The IP and port of the remote rdcd. The ipAndPort
|
||||
* can be specified in this x.x.x.x:yyyy format, where x.x.x.x is the
|
||||
@@ -348,7 +348,7 @@ rdc_status_t rdc_connect(const char *ipAndPort, rdc_handle_t* p_rdc_handle,
|
||||
* @brief Disconnect from rdcd daemon.
|
||||
*
|
||||
* @details Disconnect from rdcd daemon, and p_rdc_handle becomes invalid
|
||||
* after this call. This function is not thread safe.
|
||||
* after this call.
|
||||
*
|
||||
* @param[in] p_rdc_handle The RDC handler that come from rdc_connect().
|
||||
*
|
||||
|
||||
@@ -0,0 +1,86 @@
|
||||
/*
|
||||
Copyright (c) 2020 - present Advanced Micro Devices, Inc. All rights reserved.
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in
|
||||
all copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
THE SOFTWARE.
|
||||
*/
|
||||
#ifndef RDC_LIB_RDCLIBRARYLOADER_H_
|
||||
#define RDC_LIB_RDCLIBRARYLOADER_H_
|
||||
#include <dlfcn.h>
|
||||
#include <string.h>
|
||||
#include <map>
|
||||
#include <mutex> // NOLINT(build/c++11)
|
||||
#include "rdc/rdc.h"
|
||||
#include "rdc_lib/RdcLogger.h"
|
||||
#include "rdc_lib/rdc_common.h"
|
||||
|
||||
|
||||
namespace amd {
|
||||
namespace rdc {
|
||||
class RdcLibraryLoader {
|
||||
public:
|
||||
RdcLibraryLoader();
|
||||
|
||||
template<typename T> rdc_status_t load(const char* filename,
|
||||
T* func_make_handler);
|
||||
|
||||
rdc_status_t unload();
|
||||
|
||||
~RdcLibraryLoader();
|
||||
|
||||
private:
|
||||
void* libHandler_;
|
||||
std::mutex library_mutex_;
|
||||
};
|
||||
|
||||
template<typename T> rdc_status_t RdcLibraryLoader::load(const char* filename,
|
||||
T* func_make_handler) {
|
||||
if (filename == nullptr || func_make_handler == nullptr) {
|
||||
return RDC_ST_FAIL_LOAD_MODULE;
|
||||
}
|
||||
|
||||
if (libHandler_) {
|
||||
unload();
|
||||
}
|
||||
|
||||
std::lock_guard<std::mutex> guard(library_mutex_);
|
||||
libHandler_ = dlopen(filename, RTLD_LAZY);
|
||||
if (!libHandler_) {
|
||||
char* error = dlerror();
|
||||
RDC_LOG(RDC_ERROR, "Fail to open " << filename <<": " << error);
|
||||
return RDC_ST_FAIL_LOAD_MODULE;
|
||||
}
|
||||
|
||||
*reinterpret_cast<void**>(func_make_handler) =
|
||||
dlsym(libHandler_, "make_handler");
|
||||
if (*func_make_handler == nullptr) {
|
||||
char* error = dlerror();
|
||||
RDC_LOG(RDC_ERROR,
|
||||
"Fail to find function make_handler from file "
|
||||
<< filename <<": " << error);
|
||||
return RDC_ST_FAIL_LOAD_MODULE;
|
||||
}
|
||||
|
||||
return RDC_ST_OK;
|
||||
}
|
||||
|
||||
} // namespace rdc
|
||||
} // namespace amd
|
||||
|
||||
|
||||
#endif // RDC_LIB_RDCLIBRARYLOADER_H_
|
||||
@@ -22,6 +22,7 @@ THE SOFTWARE.
|
||||
#ifndef RDC_LIB_IMPL_RDCEMBEDDEDHANDLER_H_
|
||||
#define RDC_LIB_IMPL_RDCEMBEDDEDHANDLER_H_
|
||||
|
||||
#include <future> // NOLINT(build/c++11)
|
||||
#include "rdc_lib/RdcHandler.h"
|
||||
#include "rdc_lib/RdcGroupSettings.h"
|
||||
#include "rdc_lib/RdcMetricFetcher.h"
|
||||
@@ -96,6 +97,7 @@ class RdcEmbeddedHandler: public RdcHandler {
|
||||
RdcMetricFetcherPtr metric_fetcher_;
|
||||
RdcWatchTablePtr watch_table_;
|
||||
RdcMetricsUpdaterPtr metrics_updater_;
|
||||
std::future<void> updater_;
|
||||
};
|
||||
|
||||
} // namespace rdc
|
||||
|
||||
@@ -90,6 +90,11 @@ class RdcStandaloneHandler: public RdcHandler {
|
||||
private:
|
||||
// Helper function to handle the error
|
||||
rdc_status_t error_handle(::grpc::Status status, uint32_t rdc_status);
|
||||
|
||||
bool copy_gpu_usage_info(
|
||||
const ::rdc::GpuUsageInfo& src,
|
||||
rdc_gpu_usage_info_t* target);
|
||||
|
||||
std::unique_ptr<::rdc::RdcAPI::Stub> stub_;
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user