Obbart/universal_robots_ros_driver
1
0
Fork 0
mirror of https://gitlab.com/obbart/universal_robots_ros_driver.git synced 2026-04-10 18:10:47 +02:00
Code Releases Activity

reworked pipeline to allow for use without consumer

Browse Source
This commit is contained in:
Tristan Schnell
2019-04-10 13:25:48 +02:00
parent 75d73c1c28
commit 89ee72ac2d
1 changed files with 30 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
include/ur_rtde_driver/comm/pipeline.h
View File

@@ -20,13 +20,13 @@
#pragma once #pragma once
#include "ur_rtde_driver/comm/package.h"
#include "ur_rtde_driver/log.h"
#include "ur_rtde_driver/queue/readerwriterqueue.h"
#include <atomic> #include <atomic>
#include <chrono> #include <chrono>
#include <thread> #include <thread>
#include <vector> #include <vector>
#include "ur_rtde_driver/log.h"
#include "ur_rtde_driver/queue/readerwriterqueue.h"
#include "ur_rtde_driver/comm/package.h"
namespace ur_driver namespace ur_driver
{ {
@@ -139,9 +139,15 @@ template <typename HeaderT>
class Pipeline class Pipeline
{ {
public: public:
typedef std::chrono::high_resolution_clock Clock;
typedef Clock::time_point Time;
using _package_type = URPackage<HeaderT>; using _package_type = URPackage<HeaderT>;
Pipeline(IProducer<HeaderT>& producer, IConsumer<_package_type>& consumer, std::string name, INotifier& notifier) Pipeline(IProducer<HeaderT>& producer, IConsumer<_package_type>& consumer, std::string name, INotifier& notifier)
: producer_(producer), consumer_(consumer), name_(name), notifier_(notifier), queue_{ 32 }, running_{ false } : producer_(producer), consumer_(&consumer), name_(name), notifier_(notifier), queue_{ 32 }, running_{ false }
{
}
Pipeline(IProducer<HeaderT>& producer, std::string name, INotifier& notifier)
: producer_(producer), consumer_(nullptr), name_(name), notifier_(notifier), queue_{ 32 }, running_{ false }
{ {
} }
@@ -151,8 +157,9 @@ public:
return; return;
running_ = true; running_ = true;
pThread_ = std::thread(&Pipeline::run_producer, this); pThread_ = std::thread(&Pipeline::runProducer, this);
cThread_ = std::thread(&Pipeline::run_consumer, this); if (consumer_ != nullptr)
cThread_ = std::thread(&Pipeline::runConsumer, this);
notifier_.started(name_); notifier_.started(name_);
} }
@@ -161,9 +168,10 @@ public:
if (!running_) if (!running_)
return; return;
LOG_INFO("Stopping pipeline! <%s>", name_.c_str()); LOG_DEBUG("Stopping pipeline! <%s>", name_.c_str());
consumer_.stopConsumer(); if (consumer_ != nullptr)
consumer_->stopConsumer();
producer_.stopProducer(); producer_.stopProducer();
running_ = false; running_ = false;
@@ -173,18 +181,21 @@ public:
notifier_.stopped(name_); notifier_.stopped(name_);
} }
bool getLatestProduct(std::unique_ptr<URPackage<HeaderT>> product, std::chrono::milliseconds timeout)
{
return !queue_.wait_dequeue_timed(product, timeout);
}
private: private:
typedef std::chrono::high_resolution_clock Clock;
typedef Clock::time_point Time;
IProducer<HeaderT>& producer_; IProducer<HeaderT>& producer_;
IConsumer<_package_type>& consumer_; IConsumer<_package_type>* consumer_;
std::string name_; std::string name_;
INotifier& notifier_; INotifier& notifier_;
BlockingReaderWriterQueue<std::unique_ptr<_package_type>> queue_; BlockingReaderWriterQueue<std::unique_ptr<_package_type>> queue_;
std::atomic<bool> running_; std::atomic<bool> running_;
std::thread pThread_, cThread_; std::thread pThread_, cThread_;
void run_producer() void runProducer()
{ {
producer_.setupProducer(); producer_.setupProducer();
std::vector<std::unique_ptr<_package_type>> products; std::vector<std::unique_ptr<_package_type>> products;
@@ -207,14 +218,15 @@ private:
} }
producer_.teardownProducer(); producer_.teardownProducer();
LOG_DEBUG("Pipeline producer ended! <%s>", name_.c_str()); LOG_DEBUG("Pipeline producer ended! <%s>", name_.c_str());
consumer_.stopConsumer(); if (consumer_ != nullptr)
consumer_->stopConsumer();
running_ = false; running_ = false;
notifier_.stopped(name_); notifier_.stopped(name_);
} }
void run_consumer() void runConsumer()
{ {
consumer_.setupConsumer(); consumer_->setupConsumer();
std::unique_ptr<_package_type> product; std::unique_ptr<_package_type> product;
while (running_) while (running_)
{ {
@@ -224,14 +236,14 @@ private:
// So we update the consumer more frequently via onTimeout // So we update the consumer more frequently via onTimeout
if (!queue_.wait_dequeue_timed(product, std::chrono::milliseconds(8))) if (!queue_.wait_dequeue_timed(product, std::chrono::milliseconds(8)))
{ {
consumer_.onTimeout(); consumer_->onTimeout();
continue; continue;
} }
if (!consumer_.consume(std::move(product))) if (!consumer_->consume(std::move(product)))
break; break;
} }
consumer_.teardownConsumer(); consumer_->teardownConsumer();
LOG_DEBUG("Pipeline consumer ended! <%s>", name_.c_str()); LOG_DEBUG("Pipeline consumer ended! <%s>", name_.c_str());
producer_.stopProducer(); producer_.stopProducer();
running_ = false; running_ = false;