Skip to content
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.

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

[20703] Add missing total_count_change deadline missed status to monitor service types #4641

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions include/fastdds/statistics/monitorservice_types.idl
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ module statistics {
struct DeadlineMissedStatus_s
{
unsigned long total_count;
unsigned long total_count_change;
octet last_instance_handle[16];
};

Expand Down
34 changes: 34 additions & 0 deletions src/cpp/statistics/types/monitorservice_types.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -781,13 +781,15 @@ DeadlineMissedStatus_s::DeadlineMissedStatus_s(
const DeadlineMissedStatus_s& x)
{
m_total_count = x.m_total_count;
m_total_count_change = x.m_total_count_change;
m_last_instance_handle = x.m_last_instance_handle;
}

DeadlineMissedStatus_s::DeadlineMissedStatus_s(
DeadlineMissedStatus_s&& x) noexcept
{
m_total_count = x.m_total_count;
m_total_count_change = x.m_total_count_change;
m_last_instance_handle = std::move(x.m_last_instance_handle);
}

Expand All @@ -796,6 +798,7 @@ DeadlineMissedStatus_s& DeadlineMissedStatus_s::operator =(
{

m_total_count = x.m_total_count;
m_total_count_change = x.m_total_count_change;
m_last_instance_handle = x.m_last_instance_handle;
return *this;
}
Expand All @@ -805,6 +808,7 @@ DeadlineMissedStatus_s& DeadlineMissedStatus_s::operator =(
{

m_total_count = x.m_total_count;
m_total_count_change = x.m_total_count_change;
m_last_instance_handle = std::move(x.m_last_instance_handle);
return *this;
}
Expand All @@ -813,6 +817,7 @@ bool DeadlineMissedStatus_s::operator ==(
const DeadlineMissedStatus_s& x) const
{
return (m_total_count == x.m_total_count &&
m_total_count_change == x.m_total_count_change &&
m_last_instance_handle == x.m_last_instance_handle);
}

Expand Down Expand Up @@ -851,6 +856,35 @@ uint32_t& DeadlineMissedStatus_s::total_count()
}


/*!
* @brief This function sets a value in member total_count_change
* @param _total_count_change New value for member total_count_change
*/
void DeadlineMissedStatus_s::total_count_change(
uint32_t _total_count_change)
{
m_total_count_change = _total_count_change;
}

/*!
* @brief This function returns the value of member total_count_change
* @return Value of member total_count_change
*/
uint32_t DeadlineMissedStatus_s::total_count_change() const
{
return m_total_count_change;
}

/*!
* @brief This function returns a reference to member total_count_change
* @return Reference to member total_count_change
*/
uint32_t& DeadlineMissedStatus_s::total_count_change()
{
return m_total_count_change;
}


/*!
* @brief This function copies the value in member last_instance_handle
* @param _last_instance_handle New value to be copied in member last_instance_handle
Expand Down
21 changes: 21 additions & 0 deletions src/cpp/statistics/types/monitorservice_types.h
Original file line number Diff line number Diff line change
Expand Up @@ -811,6 +811,26 @@ class DeadlineMissedStatus_s
eProsima_user_DllExport uint32_t& total_count();


/*!
* @brief This function sets a value in member total_count_change
* @param _total_count_change New value for member total_count_change
*/
eProsima_user_DllExport void total_count_change(
uint32_t _total_count_change);

/*!
* @brief This function returns the value of member total_count_change
* @return Value of member total_count_change
*/
eProsima_user_DllExport uint32_t total_count_change() const;

/*!
* @brief This function returns a reference to member total_count_change
* @return Reference to member total_count_change
*/
eProsima_user_DllExport uint32_t& total_count_change();


/*!
* @brief This function copies the value in member last_instance_handle
* @param _last_instance_handle New value to be copied in member last_instance_handle
Expand Down Expand Up @@ -840,6 +860,7 @@ class DeadlineMissedStatus_s
private:

uint32_t m_total_count{0};
uint32_t m_total_count_change{0};
std::array<uint8_t, 16> m_last_instance_handle{0};

};
Expand Down
2 changes: 1 addition & 1 deletion src/cpp/statistics/types/monitorservice_typesCdrAux.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ constexpr uint32_t eprosima_fastdds_statistics_BaseStatus_s_max_key_cdr_typesize



constexpr uint32_t eprosima_fastdds_statistics_DeadlineMissedStatus_s_max_cdr_typesize {24UL};
constexpr uint32_t eprosima_fastdds_statistics_DeadlineMissedStatus_s_max_cdr_typesize {28UL};
constexpr uint32_t eprosima_fastdds_statistics_DeadlineMissedStatus_s_max_key_cdr_typesize {0UL};


Expand Down
10 changes: 9 additions & 1 deletion src/cpp/statistics/types/monitorservice_typesCdrAux.ipp
Original file line number Diff line number Diff line change
Expand Up @@ -558,6 +558,9 @@ eProsima_user_DllExport size_t calculate_serialized_size(
data.total_count(), current_alignment);

calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(1),
data.total_count_change(), current_alignment);

calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(2),
data.last_instance_handle(), current_alignment);


Expand All @@ -581,7 +584,8 @@ eProsima_user_DllExport void serialize(

scdr
<< eprosima::fastcdr::MemberId(0) << data.total_count()
<< eprosima::fastcdr::MemberId(1) << data.last_instance_handle()
<< eprosima::fastcdr::MemberId(1) << data.total_count_change()
<< eprosima::fastcdr::MemberId(2) << data.last_instance_handle()
;
scdr.end_serialize_type(current_state);
}
Expand All @@ -606,6 +610,10 @@ eProsima_user_DllExport void deserialize(
break;

case 1:
dcdr >> data.total_count_change();
break;

case 2:
dcdr >> data.last_instance_handle();
break;

Expand Down
55 changes: 54 additions & 1 deletion src/cpp/statistics/types/monitorservice_typesv1.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ struct FindType {



#define eprosima_fastdds_statistics_DeadlineMissedStatus_s_max_cdr_typesize 24ULL;
#define eprosima_fastdds_statistics_DeadlineMissedStatus_s_max_cdr_typesize 28ULL;
#define eprosima_fastdds_statistics_detail_EntityId_s_max_cdr_typesize 8ULL;
#define eprosima_fastdds_statistics_QosPolicyCount_s_max_cdr_typesize 12ULL;
#define eprosima_fastdds_statistics_detail_SequenceNumber_s_max_cdr_typesize 12ULL;
Expand Down Expand Up @@ -1301,6 +1301,8 @@ DeadlineMissedStatus_s::DeadlineMissedStatus_s()
{
// unsigned long m_total_count
m_total_count = 0;
// unsigned long m_total_count_change
m_total_count_change = 0;
// octet m_last_instance_handle
memset(&m_last_instance_handle, 0, ((16)) * 1);

Expand All @@ -1316,6 +1318,9 @@ DeadlineMissedStatus_s::DeadlineMissedStatus_s(
m_total_count = x.m_total_count;


m_total_count_change = x.m_total_count_change;


m_last_instance_handle = x.m_last_instance_handle;

}
Expand All @@ -1326,6 +1331,9 @@ DeadlineMissedStatus_s::DeadlineMissedStatus_s(
m_total_count = x.m_total_count;


m_total_count_change = x.m_total_count_change;


m_last_instance_handle = std::move(x.m_last_instance_handle);

}
Expand All @@ -1336,6 +1344,9 @@ DeadlineMissedStatus_s& DeadlineMissedStatus_s::operator =(
m_total_count = x.m_total_count;


m_total_count_change = x.m_total_count_change;


m_last_instance_handle = x.m_last_instance_handle;

return *this;
Expand All @@ -1347,6 +1358,9 @@ DeadlineMissedStatus_s& DeadlineMissedStatus_s::operator =(
m_total_count = x.m_total_count;


m_total_count_change = x.m_total_count_change;


m_last_instance_handle = std::move(x.m_last_instance_handle);

return *this;
Expand All @@ -1356,6 +1370,7 @@ bool DeadlineMissedStatus_s::operator ==(
const DeadlineMissedStatus_s& x) const
{
return (m_total_count == x.m_total_count &&
m_total_count_change == x.m_total_count_change &&
m_last_instance_handle == x.m_last_instance_handle);
}

Expand All @@ -1382,6 +1397,9 @@ size_t DeadlineMissedStatus_s::getCdrSerializedSize(
current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4);


current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4);


current_alignment += (((16)) * 1) + eprosima::fastcdr::Cdr::alignment(current_alignment, 1);


Expand All @@ -1395,6 +1413,8 @@ void DeadlineMissedStatus_s::serialize(
{
scdr << m_total_count;

scdr << m_total_count_change;

scdr << m_last_instance_handle;


Expand All @@ -1407,6 +1427,10 @@ void DeadlineMissedStatus_s::deserialize(



dcdr >> m_total_count_change;



dcdr >> m_last_instance_handle;


Expand Down Expand Up @@ -1453,6 +1477,35 @@ uint32_t& DeadlineMissedStatus_s::total_count()
}


/*!
* @brief This function sets a value in member total_count_change
* @param _total_count_change New value for member total_count_change
*/
void DeadlineMissedStatus_s::total_count_change(
uint32_t _total_count_change)
{
m_total_count_change = _total_count_change;
}

/*!
* @brief This function returns the value of member total_count_change
* @return Value of member total_count_change
*/
uint32_t DeadlineMissedStatus_s::total_count_change() const
{
return m_total_count_change;
}

/*!
* @brief This function returns a reference to member total_count_change
* @return Reference to member total_count_change
*/
uint32_t& DeadlineMissedStatus_s::total_count_change()
{
return m_total_count_change;
}


/*!
* @brief This function copies the value in member last_instance_handle
* @param _last_instance_handle New value to be copied in member last_instance_handle
Expand Down
21 changes: 21 additions & 0 deletions src/cpp/statistics/types/monitorservice_typesv1.h
Original file line number Diff line number Diff line change
Expand Up @@ -1069,6 +1069,26 @@ namespace eprosima {
eProsima_user_DllExport uint32_t& total_count();


/*!
* @brief This function sets a value in member total_count_change
* @param _total_count_change New value for member total_count_change
*/
eProsima_user_DllExport void total_count_change(
uint32_t _total_count_change);

/*!
* @brief This function returns the value of member total_count_change
* @return Value of member total_count_change
*/
eProsima_user_DllExport uint32_t total_count_change() const;

/*!
* @brief This function returns a reference to member total_count_change
* @return Reference to member total_count_change
*/
eProsima_user_DllExport uint32_t& total_count_change();


/*!
* @brief This function copies the value in member last_instance_handle
* @param _last_instance_handle New value to be copied in member last_instance_handle
Expand Down Expand Up @@ -1150,6 +1170,7 @@ namespace eprosima {
private:

uint32_t m_total_count;
uint32_t m_total_count_change;
std::array<uint8_t, 16> m_last_instance_handle;

};
Expand Down