Skip to content

[23325] Add generic interfaces for RPC servers #241

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 17, 2025
Merged

[23325] Add generic interfaces for RPC servers #241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
664b7f9
Refs #23325. Update swig file for RPC interfaces.
MiguelCompany Jun 13, 2025
5a59e8b
Refs #23325. Update generated code.
MiguelCompany Jun 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions fastdds_python/src/swig/fastdds/dds/rpc/interfaces.i
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,11 @@
#include "fastdds/dds/rpc/interfaces.hpp"
%}

%include "std_shared_ptr.i"

%shared_ptr(eprosima::fastdds::dds::rpc::RpcServer);
%ignore eprosima::fastdds::dds::rpc::RpcServer::execute_request;

%include "fastdds/dds/rpc/interfaces/RpcRequest.hpp"
%include "fastdds/dds/rpc/interfaces/RpcServer.hpp"
%include "fastdds/dds/rpc/interfaces/RpcStatusCode.hpp"
30 changes: 8 additions & 22 deletions fastdds_python_examples/RPCExample/generated_code/calculator.i
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,13 @@

// If using windows in debug, it would try to use python_d, which would not be found.
%begin %{
/*
* From: https://github.com/swig/swig/issues/2638
* When a module uses a type in a module that is defined in a different module,
* a false positive memory leak is detected.
* The following line silences this warning.
*/
#define SWIG_PYTHON_SILENT_MEMLEAK
#ifdef _MSC_VER
#define SWIG_PYTHON_INTERPRETER_NO_DEBUG
#endif
Expand Down Expand Up @@ -74,6 +81,7 @@

%import(module="fastdds") "fastdds/dds/rpc/exceptions/RpcException.hpp"
%import(module="fastdds") "fastdds/dds/rpc/exceptions/RpcOperationError.hpp"
%import(module="fastdds") "fastdds/dds/rpc/interfaces/RpcServer.hpp"

%exception {
try
Expand Down Expand Up @@ -228,35 +236,13 @@ namespace swig {


%shared_ptr(calculator_base::BasicCalculator);
%shared_ptr(calculator_base::BasicCalculatorServer);
%extend calculator_base::BasicCalculatorServer
{
void run()
{
Py_BEGIN_ALLOW_THREADS
self->run();
Py_END_ALLOW_THREADS
}
}

%shared_ptr(calculator_base::BasicCalculatorServer_IServerImplementation);
%shared_ptr(calculator_base::BasicCalculatorServerImplementation);
%feature("director") calculator_base::BasicCalculatorServerImplementation;



%shared_ptr(Calculator);
%shared_ptr(CalculatorServer);
%extend CalculatorServer
{
void run()
{
Py_BEGIN_ALLOW_THREADS
self->run();
Py_END_ALLOW_THREADS
}
}

%shared_ptr(CalculatorServer_IServerImplementation);
%shared_ptr(CalculatorServerImplementation);
%feature("director") CalculatorServerImplementation;
Expand Down
4 changes: 4 additions & 0 deletions fastdds_python_examples/RPCExample/generated_code/calculatorClient.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,7 @@ class BasicCalculatorClient : public BasicCalculator
std::shared_ptr<T> result,
std::promise<TResult>& promise)
{
result->info.related_sample_identity.writer_guid(requester_->get_requester_reader()->guid());
if (fdds::RETCODE_OK == requester_->send_request((void*)&request, result->info))
{
std::lock_guard<std::mutex> _ (mtx_);
Expand All @@ -224,6 +225,7 @@ class BasicCalculatorClient : public BasicCalculator
const RequestType& request,
std::shared_ptr<T> result)
{
result->info.related_sample_identity.writer_guid(requester_->get_requester_reader()->guid());
if (fdds::RETCODE_OK == requester_->send_request((void*)&request, result->info))
{
std::lock_guard<std::mutex> _ (mtx_);
Expand Down Expand Up @@ -719,6 +721,7 @@ class CalculatorClient : public Calculator
std::shared_ptr<T> result,
std::promise<TResult>& promise)
{
result->info.related_sample_identity.writer_guid(requester_->get_requester_reader()->guid());
if (fdds::RETCODE_OK == requester_->send_request((void*)&request, result->info))
{
std::lock_guard<std::mutex> _ (mtx_);
Expand All @@ -738,6 +741,7 @@ class CalculatorClient : public Calculator
const RequestType& request,
std::shared_ptr<T> result)
{
result->info.related_sample_identity.writer_guid(requester_->get_requester_reader()->guid());
if (fdds::RETCODE_OK == requester_->send_request((void*)&request, result->info))
{
std::lock_guard<std::mutex> _ (mtx_);
Expand Down
Loading
Loading