Skip to content

callback - Fixed missing workaround for IAR issue with type information #3004

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

Merged
merged 1 commit into from
Oct 13, 2016
Merged

callback - Fixed missing workaround for IAR issue with type information #3004

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
90 changes: 12 additions & 78 deletions events/Event.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,26 +212,15 @@ class Event<void()> {
new (p) C(*(F*)(e + 1));
equeue_event_delay(p, e->delay);
equeue_event_period(p, e->period);
equeue_event_dtor(p, &Event::function_dtor<C>);
return equeue_post(e->equeue, &Event::function_call<C>, p);
equeue_event_dtor(p, &EventQueue::function_dtor<C>);
return equeue_post(e->equeue, &EventQueue::function_call<C>, p);
}

template <typename F>
static void event_dtor(struct event *e) {
((F*)(e + 1))->~F();
}

// Function attributes
template <typename F>
static void function_call(void *p) {
(*(F*)p)();
}

template <typename F>
static void function_dtor(void *p) {
((F*)p)->~F();
}

public:
/** Create an event
* @see Event::Event
Expand Down Expand Up @@ -616,26 +605,15 @@ class Event<void(A0)> {
new (p) C(*(F*)(e + 1), a0);
equeue_event_delay(p, e->delay);
equeue_event_period(p, e->period);
equeue_event_dtor(p, &Event::function_dtor<C>);
return equeue_post(e->equeue, &Event::function_call<C>, p);
equeue_event_dtor(p, &EventQueue::function_dtor<C>);
return equeue_post(e->equeue, &EventQueue::function_call<C>, p);
}

template <typename F>
static void event_dtor(struct event *e) {
((F*)(e + 1))->~F();
}

// Function attributes
template <typename F>
static void function_call(void *p) {
(*(F*)p)();
}

template <typename F>
static void function_dtor(void *p) {
((F*)p)->~F();
}

public:
/** Create an event
* @see Event::Event
Expand Down Expand Up @@ -1020,26 +998,15 @@ class Event<void(A0, A1)> {
new (p) C(*(F*)(e + 1), a0, a1);
equeue_event_delay(p, e->delay);
equeue_event_period(p, e->period);
equeue_event_dtor(p, &Event::function_dtor<C>);
return equeue_post(e->equeue, &Event::function_call<C>, p);
equeue_event_dtor(p, &EventQueue::function_dtor<C>);
return equeue_post(e->equeue, &EventQueue::function_call<C>, p);
}

template <typename F>
static void event_dtor(struct event *e) {
((F*)(e + 1))->~F();
}

// Function attributes
template <typename F>
static void function_call(void *p) {
(*(F*)p)();
}

template <typename F>
static void function_dtor(void *p) {
((F*)p)->~F();
}

public:
/** Create an event
* @see Event::Event
Expand Down Expand Up @@ -1424,26 +1391,15 @@ class Event<void(A0, A1, A2)> {
new (p) C(*(F*)(e + 1), a0, a1, a2);
equeue_event_delay(p, e->delay);
equeue_event_period(p, e->period);
equeue_event_dtor(p, &Event::function_dtor<C>);
return equeue_post(e->equeue, &Event::function_call<C>, p);
equeue_event_dtor(p, &EventQueue::function_dtor<C>);
return equeue_post(e->equeue, &EventQueue::function_call<C>, p);
}

template <typename F>
static void event_dtor(struct event *e) {
((F*)(e + 1))->~F();
}

// Function attributes
template <typename F>
static void function_call(void *p) {
(*(F*)p)();
}

template <typename F>
static void function_dtor(void *p) {
((F*)p)->~F();
}

public:
/** Create an event
* @see Event::Event
Expand Down Expand Up @@ -1828,26 +1784,15 @@ class Event<void(A0, A1, A2, A3)> {
new (p) C(*(F*)(e + 1), a0, a1, a2, a3);
equeue_event_delay(p, e->delay);
equeue_event_period(p, e->period);
equeue_event_dtor(p, &Event::function_dtor<C>);
return equeue_post(e->equeue, &Event::function_call<C>, p);
equeue_event_dtor(p, &EventQueue::function_dtor<C>);
return equeue_post(e->equeue, &EventQueue::function_call<C>, p);
}

template <typename F>
static void event_dtor(struct event *e) {
((F*)(e + 1))->~F();
}

// Function attributes
template <typename F>
static void function_call(void *p) {
(*(F*)p)();
}

template <typename F>
static void function_dtor(void *p) {
((F*)p)->~F();
}

public:
/** Create an event
* @see Event::Event
Expand Down Expand Up @@ -2232,26 +2177,15 @@ class Event<void(A0, A1, A2, A3, A4)> {
new (p) C(*(F*)(e + 1), a0, a1, a2, a3, a4);
equeue_event_delay(p, e->delay);
equeue_event_period(p, e->period);
equeue_event_dtor(p, &Event::function_dtor<C>);
return equeue_post(e->equeue, &Event::function_call<C>, p);
equeue_event_dtor(p, &EventQueue::function_dtor<C>);
return equeue_post(e->equeue, &EventQueue::function_call<C>, p);
}

template <typename F>
static void event_dtor(struct event *e) {
((F*)(e + 1))->~F();
}

// Function attributes
template <typename F>
static void function_call(void *p) {
(*(F*)p)();
}

template <typename F>
static void function_dtor(void *p) {
((F*)p)->~F();
}

public:
/** Create an event
* @see Event::Event
Expand Down
40 changes: 19 additions & 21 deletions events/EventQueue.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/

#ifndef EVENT_QUEUE_H
#define EVENT_QUEUE_H

Expand Down Expand Up @@ -173,19 +174,14 @@ class EventQueue {
*/
template <typename F>
int call(F f) {
struct local {
static void call(void *p) { (*static_cast<F*>(p))(); }
static void dtor(void *p) { static_cast<F*>(p)->~F(); }
};

void *p = equeue_alloc(&_equeue, sizeof(F));
if (!p) {
return 0;
}

F *e = new (p) F(f);
equeue_event_dtor(e, &local::dtor);
return equeue_post(&_equeue, &local::call, e);
equeue_event_dtor(e, &EventQueue::function_dtor<F>);
return equeue_post(&_equeue, &EventQueue::function_call<F>, e);
}

/** Calls an event on the queue
Expand Down Expand Up @@ -437,20 +433,15 @@ class EventQueue {
*/
template <typename F>
int call_in(int ms, F f) {
struct local {
static void call(void *p) { (*static_cast<F*>(p))(); }
static void dtor(void *p) { static_cast<F*>(p)->~F(); }
};

void *p = equeue_alloc(&_equeue, sizeof(F));
if (!p) {
return 0;
}

F *e = new (p) F(f);
equeue_event_delay(e, ms);
equeue_event_dtor(e, &local::dtor);
return equeue_post(&_equeue, &local::call, e);
equeue_event_dtor(e, &EventQueue::function_dtor<F>);
return equeue_post(&_equeue, &EventQueue::function_call<F>, e);
}

/** Calls an event on the queue after a specified delay
Expand Down Expand Up @@ -702,11 +693,6 @@ class EventQueue {
*/
template <typename F>
int call_every(int ms, F f) {
struct local {
static void call(void *p) { (*static_cast<F*>(p))(); }
static void dtor(void *p) { static_cast<F*>(p)->~F(); }
};

void *p = equeue_alloc(&_equeue, sizeof(F));
if (!p) {
return 0;
Expand All @@ -715,8 +701,8 @@ class EventQueue {
F *e = new (p) F(f);
equeue_event_delay(e, ms);
equeue_event_period(e, ms);
equeue_event_dtor(e, &local::dtor);
return equeue_post(&_equeue, &local::call, e);
equeue_event_dtor(e, &EventQueue::function_dtor<F>);
return equeue_post(&_equeue, &EventQueue::function_call<F>, e);
}

/** Calls an event on the queue periodically
Expand Down Expand Up @@ -2044,6 +2030,18 @@ class EventQueue {
struct equeue _equeue;
mbed::Callback<void(int)> _update;

// Function attributes
template <typename F>
static void function_call(void *p) {
(*(F*)p)();
}

template <typename F>
static void function_dtor(void *p) {
((F*)p)->~F();
}

// Context structures
template <typename F>
struct context00 {
F f;
Expand Down