fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-07-14 22:30:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

uORB::DeviceNode replace SubscriptionData with uORB::SubscriptionInterval

Browse Source
This commit is contained in:
Daniel Agar
2020-01-28 21:31:32 -05:00
parent e325ca25bb
commit 372866a22b
5 changed files with 58 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/uORB/uORBDeviceNode.cpp
+49 -145
View File
@@ -42,6 +42,8 @@
#include "uORBCommunicator.hpp"
#endif /* ORB_COMMUNICATOR */
static uORB::SubscriptionInterval *filp_to_subscription(cdev::file_t *filp) { return static_cast<uORB::SubscriptionInterval *>(filp->f_priv); }
uORB::DeviceNode::DeviceNode(const struct orb_metadata *meta, const uint8_t instance, const char *path,
ORB_PRIO priority, uint8_t queue_size) :
CDev(path),
@@ -77,22 +79,16 @@ uORB::DeviceNode::open(cdev::file_t *filp)
if (filp->f_oflags == PX4_F_RDONLY) {
/* allocate subscriber data */
SubscriberData *sd = new SubscriberData{};
SubscriptionInterval *sd = new SubscriptionInterval(_meta, 0, _instance);
if (nullptr == sd) {
return -ENOMEM;
}
/* If there were any previous publications, allow the subscriber to read them */
const unsigned gen = published_message_count();
sd->generation = gen - (_queue_size < gen ? _queue_size : gen);
filp->f_priv = (void *)sd;
int ret = CDev::open(filp);
add_internal_subscriber();
if (ret != PX4_OK) {
PX4_ERR("CDev::open failed");
delete sd;
@@ -113,93 +109,63 @@ int
uORB::DeviceNode::close(cdev::file_t *filp)
{
if (filp->f_oflags == PX4_F_RDONLY) { /* subscriber */
SubscriberData *sd = static_cast<SubscriberData *>(filp->f_priv);
if (sd != nullptr) {
remove_internal_subscriber();
delete sd;
sd = nullptr;
}
SubscriptionInterval *sd = filp_to_subscription(filp);
delete sd;
}
return CDev::close(filp);
}
bool
uORB::DeviceNode::copy_locked(void *dst, unsigned &generation) const
{
bool updated = false;
if ((dst != nullptr) && (_data != nullptr)) {
const unsigned current_generation = _generation.load();
if (current_generation > generation + _queue_size) {
// Reader is too far behind: some messages are lost
generation = current_generation - _queue_size;
}
if ((current_generation == generation) && (generation > 0)) {
/* The subscriber already read the latest message, but nothing new was published yet.
* Return the previous message
*/
--generation;
}
memcpy(dst, _data + (_meta->o_size * (generation % _queue_size)), _meta->o_size);
if (generation < current_generation) {
++generation;
}
updated = true;
}
return updated;
}
bool
uORB::DeviceNode::copy(void *dst, unsigned &generation)
{
ATOMIC_ENTER;
if ((dst != nullptr) && (_data != nullptr)) {
if (_queue_size == 1) {
ATOMIC_ENTER;
memcpy(dst, _data, _meta->o_size);
generation = _generation.load();
ATOMIC_LEAVE;
return true;
bool updated = copy_locked(dst, generation);
} else {
ATOMIC_ENTER;
const unsigned current_generation = _generation.load();
ATOMIC_LEAVE;
if (current_generation > generation + _queue_size) {
// Reader is too far behind: some messages are lost
generation = current_generation - _queue_size;
}
return updated;
if ((current_generation == generation) && (generation > 0)) {
/* The subscriber already read the latest message, but nothing new was published yet.
* Return the previous message
*/
--generation;
}
memcpy(dst, _data + (_meta->o_size * (generation % _queue_size)), _meta->o_size);
ATOMIC_LEAVE;
if (generation < current_generation) {
++generation;
}
return true;
}
}
return false;
}
ssize_t
uORB::DeviceNode::read(cdev::file_t *filp, char *buffer, size_t buflen)
{
/* if the object has not been written yet, return zero */
if (_data == nullptr) {
return 0;
}
/* if the caller's buffer is the wrong size, that's an error */
if (buflen != _meta->o_size) {
return -EIO;
}
SubscriberData *sd = static_cast<SubscriberData *>(filp->f_priv);
/*
* Perform an atomic copy & state update
*/
ATOMIC_ENTER;
// if subscriber has an interval track the last update time
if (sd->update_interval) {
sd->update_interval->last_update = hrt_absolute_time();
}
copy_locked(buffer, sd->generation);
ATOMIC_LEAVE;
return _meta->o_size;
return filp_to_subscription(filp)->copy(buffer) ? _meta->o_size : 0;
}
ssize_t
@@ -272,42 +238,14 @@ uORB::DeviceNode::ioctl(cdev::file_t *filp, int cmd, unsigned long arg)
switch (cmd) {
case ORBIOCUPDATED: {
ATOMIC_ENTER;
*(bool *)arg = appears_updated(filp);
*(bool *)arg = filp_to_subscription(filp)->updated();
ATOMIC_LEAVE;
return PX4_OK;
}
case ORBIOCSETINTERVAL: {
int ret = PX4_OK;
lock();
SubscriberData *sd = static_cast<SubscriberData *>(filp->f_priv);
if (arg == 0) {
if (sd->update_interval) {
delete (sd->update_interval);
sd->update_interval = nullptr;
}
} else {
if (sd->update_interval) {
sd->update_interval->interval = arg;
} else {
sd->update_interval = new UpdateIntervalData();
if (sd->update_interval) {
sd->update_interval->interval = arg;
} else {
ret = -ENOMEM;
}
}
}
unlock();
return ret;
}
case ORBIOCSETINTERVAL:
filp_to_subscription(filp)->set_interval_us(arg);
return PX4_OK;
case ORBIOCGADVERTISER:
*(uintptr_t *)arg = (uintptr_t)this;
@@ -324,23 +262,14 @@ uORB::DeviceNode::ioctl(cdev::file_t *filp, int cmd, unsigned long arg)
return ret;
}
case ORBIOCGETINTERVAL: {
SubscriberData *sd = static_cast<SubscriberData *>(filp->f_priv);
if (sd->update_interval) {
*(unsigned *)arg = sd->update_interval->interval;
} else {
*(unsigned *)arg = 0;
}
}
return OK;
case ORBIOCGETINTERVAL:
*(unsigned *)arg = filp_to_subscription(filp)->get_interval_us();
return PX4_OK;
case ORBIOCISADVERTISED:
*(unsigned long *)arg = _advertised;
return OK;
return PX4_OK;
default:
/* give it to the superclass */
@@ -450,43 +379,18 @@ px4_pollevent_t
uORB::DeviceNode::poll_state(cdev::file_t *filp)
{
// If the topic appears updated to the subscriber, say so.
if (appears_updated(filp)) {
return POLLIN;
}
return 0;
return filp_to_subscription(filp)->updated() ? POLLIN : 0;
}
void
uORB::DeviceNode::poll_notify_one(px4_pollfd_struct_t *fds, px4_pollevent_t events)
{
// If the topic looks updated to the subscriber, go ahead and notify them.
if (appears_updated((cdev::file_t *)fds->priv)) {
if (filp_to_subscription((cdev::file_t *)fds->priv)->updated()) {
CDev::poll_notify_one(fds, events);
}
}
bool
uORB::DeviceNode::appears_updated(cdev::file_t *filp)
{
// check if this topic has been published yet, if not bail out
if (_data == nullptr) {
return false;
}
SubscriberData *sd = static_cast<SubscriberData *>(filp->f_priv);
// if subscriber has interval check time since last update
if (sd->update_interval != nullptr) {
if (hrt_elapsed_time(&sd->update_interval->last_update) < sd->update_interval->interval) {
return false;
}
}
// finally, compare the generation
return (sd->generation != published_message_count());
}
bool
uORB::DeviceNode::print_statistics(int max_topic_length)
{