dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

cdev: delete the prev_pollset in unlocked state 

Because it uses a semaphore.
This commit is contained in:
Beat Küng 2018-07-31 11:49:45 +02:00
parent 1fe526b8eb
commit 2c148f07bd
No known key found for this signature in database
GPG Key ID: 866DB5F0E24821BB
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/lib/drivers/device/CDev.cpp
View File

@ -286,7 +286,7 @@ CDev::poll(file_t *filep, px4_pollfd_struct_t *fds, bool setup)
DEVICE_POLL_DEBUG("CDev::poll: fds->priv = %p", filep);
/*
* Lock against poll_notify() and possibly other callers.
* Lock against poll_notify() and possibly other callers (protect _pollset).
*/
ATOMIC_ENTER;
@ -325,13 +325,25 @@ CDev::poll(file_t *filep, px4_pollfd_struct_t *fds, bool setup)
if (_max_pollwaiters > 0) {
memset(new_pollset + _max_pollwaiters, 0, sizeof(px4_pollfd_struct_t *) * (new_count - _max_pollwaiters));
memcpy(new_pollset, _pollset, sizeof(px4_pollfd_struct_t *) * _max_pollwaiters);
delete[](_pollset);
}
_pollset = new_pollset;
_pollset[_max_pollwaiters] = fds;
_max_pollwaiters = new_count;
// free the previous _pollset (we need to unlock here which is fine because we don't access _pollset anymore)
#ifdef __PX4_NUTTX
px4_leave_critical_section(flags);
#endif
if (prev_pollset) {
delete[](prev_pollset);
}
#ifdef __PX4_NUTTX
flags = px4_enter_critical_section();
#endif
// Success
ret = PX4_OK;
break;