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.

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

[core] redesign publisher api #1858

Merged
merged 21 commits into from
Dec 16, 2024
Merged

[core] redesign publisher api #1858

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
291e9d6
legacy CPublisher moved to eCAL::v5::CPublisher
rex-schilasky Dec 12, 2024
586c28c
readwrite/ecal_writer.cpp/h moved and renamed to pubsub/ecal_publishe…
rex-schilasky Dec 12, 2024
3ea43f0
eCAL::CDataWriter renamed to eCAL::CPublisherImpl
rex-schilasky Dec 12, 2024
6c13283
minor renaming and default arguments
rex-schilasky Dec 12, 2024
9806e03
ecal proto and capnp publisher still base on eCAL::v5::CPublisher
rex-schilasky Dec 12, 2024
eae7a92
Merge branch 'master' into feature/redesign-publisher-api
rex-schilasky Dec 12, 2024
0a9970c
master merged in
rex-schilasky Dec 12, 2024
76494dd
shared_ptr handling, commenting
rex-schilasky Dec 12, 2024
396dd5e
check for nullptr in destructor
rex-schilasky Dec 13, 2024
6d696be
remove pointer checks
rex-schilasky Dec 13, 2024
4e37e22
return value type of CPublisher::Send changed to boolean
rex-schilasky Dec 13, 2024
b74825d
tests adapted (boolean return of CPublisher::Send()
rex-schilasky Dec 13, 2024
c912abb
Publisher::Send call for message publisher change to return boolean v…
rex-schilasky Dec 13, 2024
be1a9dc
proto pub test fixed
rex-schilasky Dec 13, 2024
dd361b4
IsSubscribed removed (GetSubscriberCount)
rex-schilasky Dec 13, 2024
cd8d045
pointer check
rex-schilasky Dec 13, 2024
1673590
Merge branch 'master' into feature/redesign-publisher-api
rex-schilasky Dec 13, 2024
443eb16
renaming, Send() return bool instead size
rex-schilasky Dec 16, 2024
4122a12
_sync -> _mutex
rex-schilasky Dec 16, 2024
c684aa1
GetId -> GetTopicId
rex-schilasky Dec 16, 2024
23e7f63
minor logging fix
rex-schilasky Dec 16, 2024
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: 2 additions & 1 deletion app/play/play_core/src/measurement_container.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
#include <memory>

#include <ecal/ecal.h>
#include <ecal/ecal_publisher_v5.h>
#include <ecalhdf5/eh5_meas.h>

#include "continuity_report.h"
Expand Down Expand Up @@ -90,7 +91,7 @@ class MeasurementContainer
private:
struct PublisherInfo
{
eCAL::CPublisher publisher_;
eCAL::v5::CPublisher publisher_;
long long message_counter_;

PublisherInfo(const std::string& topic_name, const eCAL::SDataTypeInformation& info_)
Expand Down
6 changes: 4 additions & 2 deletions ecal/core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,9 @@ endif()
if(ECAL_CORE_PUBLISHER)
set(ecal_pub_src
src/pubsub/ecal_publisher.cpp
src/pubsub/ecal_publisher_impl.cpp
src/pubsub/ecal_publisher_impl.h
src/pubsub/ecal_publisher_v5.cpp
src/pubsub/ecal_pubgate.cpp
src/pubsub/ecal_pubgate.h
)
Expand All @@ -226,8 +229,6 @@ set(ecal_readwrite_src

if(ECAL_CORE_PUBLISHER)
set(ecal_writer_src
src/readwrite/ecal_writer.cpp
src/readwrite/ecal_writer.h
src/readwrite/ecal_writer_base.h
src/readwrite/ecal_writer_buffer_payload.h
src/readwrite/ecal_writer_data.h
Expand Down Expand Up @@ -538,6 +539,7 @@ set(ecal_header_cmn
include/ecal/ecal_process_severity.h
include/ecal/ecal_registration.h
include/ecal/ecal_publisher.h
include/ecal/ecal_publisher_v5.h
include/ecal/ecal_server.h
include/ecal/ecal_server_v5.h
include/ecal/ecal_service_info.h
Expand Down
2 changes: 1 addition & 1 deletion ecal/core/include/ecal/cimpl/ecal_log_cimpl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* ========================= eCAL LICENSE =================================
*
* Copyright (C) 2016 - 2019 Continental Corporation
* Copyright (C) 2016 - 2024 Continental Corporation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion ecal/core/include/ecal/ecal_log.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* ========================= eCAL LICENSE =================================
*
* Copyright (C) 2016 - 2019 Continental Corporation
* Copyright (C) 2016 - 2024 Continental Corporation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Loading
Loading