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

[20679] Run Github Ubuntu CI on PRs (backport #4598) #4601

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
3 changes: 3 additions & 0 deletions .github/workflows/address-sanitizers.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,11 @@ on:
default: '2.10.x'

pull_request:
<<<<<<< HEAD
branches:
- '2.10.x'
=======
>>>>>>> 7154a57a0 (Run Github Ubuntu CI on PRs (#4598))
paths-ignore:
- '**.md'
- '**.txt'
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/documentation-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,11 @@ on:
default: '2.10.x'

pull_request:
<<<<<<< HEAD
branches:
- '2.10.x'
=======
>>>>>>> 7154a57a0 (Run Github Ubuntu CI on PRs (#4598))
paths-ignore:
- '**.md'
- '**.txt'
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/mac-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,11 @@ on:
required: true

pull_request:
<<<<<<< HEAD
branches:
- '2.10.x'
=======
>>>>>>> 7154a57a0 (Run Github Ubuntu CI on PRs (#4598))
paths-ignore:
- '**.md'
- '**.txt'
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/thread-sanitizer.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,11 @@ on:
type: string

pull_request:
<<<<<<< HEAD
branches:
- '2.10.x'
=======
>>>>>>> 7154a57a0 (Run Github Ubuntu CI on PRs (#4598))
paths-ignore:
- '**.md'
- '**.txt'
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/ubuntu-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,12 @@ on:
type: string
required: true

pull_request:
paths-ignore:
- '**.md'
- '**.txt'
- '!**/CMakeLists.txt'

concurrency:
group: ${{ github.workflow }}
cancel-in-progress: true
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/windows-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,11 @@ on:
required: true

pull_request:
<<<<<<< HEAD
branches:
- '2.10.x'
=======
>>>>>>> 7154a57a0 (Run Github Ubuntu CI on PRs (#4598))
paths-ignore:
- '**.md'
- '**.txt'
Expand Down
4 changes: 4 additions & 0 deletions include/fastrtps/subscriber/SubscriberHistory.h
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,10 @@ class SubscriberHistory : public rtps::ReaderHistory

private:

using rtps::ReaderHistory::completed_change;
using rtps::ReaderHistory::received_change;
using rtps::ReaderHistory::remove_change_nts;

using t_m_Inst_Caches = std::map<rtps::InstanceHandle_t, KeyedChanges>;

//!Map where keys are instance handles and values vectors of cache changes
Expand Down
4 changes: 4 additions & 0 deletions src/cpp/fastdds/domain/DomainParticipantImpl.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -663,6 +663,10 @@ class DomainParticipantImpl
bool on_guard_;
};

using fastrtps::rtps::RTPSParticipantListener::onParticipantDiscovery;
using fastrtps::rtps::RTPSParticipantListener::onReaderDiscovery;
using fastrtps::rtps::RTPSParticipantListener::onWriterDiscovery;

public:

MyRTPSParticipantListener(
Expand Down
4 changes: 4 additions & 0 deletions src/cpp/fastdds/publisher/DataWriterImpl.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -454,6 +454,10 @@ class DataWriterImpl : protected rtps::IReaderDataFilter
const fastrtps::rtps::ReaderProxyData* reader_info) override;

DataWriterImpl* data_writer_;

private:

using fastrtps::rtps::WriterListener::onWriterMatched;
}
writer_listener_;

Expand Down
4 changes: 4 additions & 0 deletions src/cpp/fastdds/subscriber/DataReaderImpl.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -446,6 +446,10 @@ class DataReaderImpl
const fastrtps::rtps::CacheChange_t* const change) override;

DataReaderImpl* data_reader_;

private:

using fastrtps::rtps::ReaderListener::onReaderMatched;
}
reader_listener_;

Expand Down
6 changes: 6 additions & 0 deletions src/cpp/fastrtps_deprecated/participant/ParticipantImpl.h
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,12 @@ class ParticipantImpl

ParticipantImpl* mp_participantimpl;

private:

using rtps::RTPSParticipantListener::onParticipantDiscovery;
using rtps::RTPSParticipantListener::onReaderDiscovery;
using rtps::RTPSParticipantListener::onWriterDiscovery;

}
m_rtps_listener;

Expand Down
4 changes: 4 additions & 0 deletions src/cpp/fastrtps_deprecated/publisher/PublisherImpl.h
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,10 @@ class PublisherImpl
const LivelinessLostStatus& status) override;

PublisherImpl* mp_publisherImpl;

private:

using rtps::WriterListener::onWriterMatched;
}
m_writerListener;

Expand Down
4 changes: 4 additions & 0 deletions src/cpp/fastrtps_deprecated/subscriber/SubscriberImpl.h
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,10 @@ class SubscriberImpl
rtps::RTPSReader* reader,
const LivelinessChangedStatus& status) override;
SubscriberImpl* mp_subscriberImpl;

private:

using rtps::ReaderListener::onReaderMatched;
}
m_readerListener;

Expand Down
2 changes: 2 additions & 0 deletions src/cpp/rtps/DataSharing/ReaderPool.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,8 @@ class ReaderPool : public DataSharingPayloadPool

private:

using DataSharingPayloadPool::init_shared_memory;

bool is_volatile_; //< Whether the reader is volatile or not
uint64_t next_payload_; //< Index of the next history position to read
SequenceNumber_t last_sn_; //< Sequence number of the last read payload
Expand Down
2 changes: 2 additions & 0 deletions src/cpp/rtps/DataSharing/WriterPool.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -353,6 +353,8 @@ class WriterPool : public DataSharingPayloadPool

private:

using DataSharingPayloadPool::init_shared_memory;

octet* payloads_pool_; //< Shared pool of payloads

uint32_t max_data_size_; //< Maximum size of the serialized payload data
Expand Down
2 changes: 2 additions & 0 deletions src/cpp/rtps/builtin/discovery/participant/PDPClient.h
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,8 @@ class PDPClient : public PDP

private:

using PDP::announceParticipantState;

/**
* Manually match the local PDP reader with the PDP writer of a given server. The function is
* not thread safe (nts) in the sense that it does not take the PDP mutex. It does however take
Expand Down
2 changes: 2 additions & 0 deletions src/cpp/rtps/builtin/discovery/participant/PDPServer.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,8 @@ class PDPServer : public fastrtps::rtps::PDP

private:

using fastrtps::rtps::PDP::announceParticipantState;

#if HAVE_SECURITY
/**
* Returns whether discovery should be secured
Expand Down
2 changes: 2 additions & 0 deletions src/cpp/rtps/history/BasicPayloadPool_impl/Base.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@

class BaseImpl : public IPayloadPool
{
public:

bool get_payload(
uint32_t size,
CacheChange_t& cache_change) override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,7 @@ class Impl<PREALLOCATED_WITH_REALLOC_MEMORY_MODE> : public BaseImpl

private:

using BaseImpl::get_payload;

uint32_t min_payload_size_;
};
4 changes: 4 additions & 0 deletions src/cpp/rtps/history/TopicPayloadPool_impl/Dynamic.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,10 @@ class DynamicTopicPayloadPool : public TopicPayloadPool
return DYNAMIC_RESERVE_MEMORY_MODE;
}

private:

using TopicPayloadPool::get_payload;

};

} // namespace rtps
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,10 @@ class DynamicReusableTopicPayloadPool : public TopicPayloadPool
return DYNAMIC_REUSABLE_MEMORY_MODE;
}

private:

using TopicPayloadPool::get_payload;

};

} // namespace rtps
Expand Down
2 changes: 2 additions & 0 deletions src/cpp/rtps/history/TopicPayloadPool_impl/Preallocated.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@ class PreallocatedTopicPayloadPool : public TopicPayloadPool

private:

using TopicPayloadPool::get_payload;

uint32_t payload_size_;
uint32_t minimum_pool_size_; //< Minimum initial pool size (sum of all histories)
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@ class PreallocatedReallocTopicPayloadPool : public TopicPayloadPool

private:

using TopicPayloadPool::get_payload;

uint32_t min_payload_size_;
uint32_t minimum_pool_size_; //< Minimum initial pool size (sum of all histories)
};
Expand Down
2 changes: 2 additions & 0 deletions src/cpp/rtps/transport/TCPTransportInterface.h
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,8 @@ class TCPTransportInterface : public TransportInterface

std::atomic<bool> alive_;

using TransportInterface::transform_remote_locator;

protected:

std::vector<fastrtps::rtps::IPFinder::info_IP> current_interfaces_;
Expand Down
2 changes: 2 additions & 0 deletions src/cpp/rtps/transport/UDPTransportInterface.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ class UDPTransportInterface : public TransportInterface
{
friend class UDPSenderResource;

using TransportInterface::transform_remote_locator;

public:

~UDPTransportInterface() override;
Expand Down
2 changes: 2 additions & 0 deletions src/cpp/rtps/transport/shared_mem/SharedMemTransport.h
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,8 @@ class SharedMemTransport : public TransportInterface

private:

using TransportInterface::transform_remote_locator;

//! Constructor with no descriptor is necessary for implementations derived from this class.
SharedMemTransport();

Expand Down
83 changes: 83 additions & 0 deletions src/cpp/statistics/rtps/monitor-service/MonitorServiceListener.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
// Copyright 2023 Proyectos y Sistemas de Mantenimiento SL (eProsima).
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

/**
* @file MonitorServiceListener.hpp
*/

#ifndef _STATISTICS_RTPS_MONITOR_SERVICE_MONITORSERVICELISTENER_HPP_
#define _STATISTICS_RTPS_MONITOR_SERVICE_MONITORSERVICELISTENER_HPP_


#include <fastdds/rtps/writer/WriterListener.h>
#include <fastdds/statistics/rtps/monitor_service/Interfaces.hpp>

namespace eprosima {
namespace fastdds {
namespace statistics {
namespace rtps {

class MonitorService;

#ifdef FASTDDS_STATISTICS

class MonitorServiceListener :
public fastrtps::rtps::WriterListener,
public IStatusObserver,
public IConnectionsObserver,
public IProxyObserver
{

public:

MonitorServiceListener(
MonitorService* ms);

bool on_local_entity_status_change(
const fastrtps::rtps::GUID_t& guid,
const uint32_t& id) const override;

bool on_local_entity_change(
const fastrtps::rtps::GUID_t& guid,
bool is_alive) const override;

bool on_local_entity_connections_change(
const fastrtps::rtps::GUID_t& guid) const override;

void onWriterMatched(
fastrtps::rtps::RTPSWriter* writer,
fastrtps::rtps::MatchingInfo& info) override;

void onWriterChangeReceivedByAll(
fastrtps::rtps::RTPSWriter* writer,
fastrtps::rtps::CacheChange_t* change) override;

protected:

MonitorService* monitor_srv_;

private:

using fastrtps::rtps::WriterListener::onWriterMatched;

};

#endif // FASTDDS_STATISTICS

} // namespace rtps
} // namespace statistics
} // namespace fastdds
} // namespace eprosima

#endif // _STATISTICS_RTPS_MONITOR_SERVICE_MONITORSERVICELISTENER_HPP_
Loading
Loading