From c3cea30cb7952c44c3452d9e7926fe50397d43ae Mon Sep 17 00:00:00 2001 From: Felipe Oliveira Carvalho Date: Sun, 6 Apr 2014 00:48:21 -0300 Subject: [PATCH] Turn Event into a tagged union If we ever need arbitrary data or more than very few bytes on `Events` we just have to add a `void *` field in the `data` union. --- src/os/event.c | 2 +- src/os/event.h | 4 +++- src/os/signal.c | 9 ++++----- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/os/event.c b/src/os/event.c index dd8d6d9bdd..a4ebdb15ff 100644 --- a/src/os/event.c +++ b/src/os/event.c @@ -12,7 +12,7 @@ #include "memory.h" #include "misc2.h" -// event.data will be cleaned up after the event is processed +// event will be cleaned up after it gets processed #define _destroy_event(x) // do nothing KLIST_INIT(Event, Event, _destroy_event) diff --git a/src/os/event.h b/src/os/event.h index 2470add1cf..ba84d8ffae 100644 --- a/src/os/event.h +++ b/src/os/event.h @@ -10,7 +10,9 @@ typedef enum { typedef struct { EventType type; - void *data; + union { + int signum; + } data; } Event; void event_init(void); diff --git a/src/os/signal.c b/src/os/signal.c index 503269208d..dc404a6e99 100644 --- a/src/os/signal.c +++ b/src/os/signal.c @@ -69,9 +69,7 @@ void signal_accept_deadly() void signal_handle(Event event) { - int signum = *(int *)event.data; - - free(event.data); + int signum = event.data.signum; switch (signum) { case SIGINT: @@ -157,8 +155,9 @@ static void signal_cb(uv_signal_t *handle, int signum) Event event = { .type = kEventSignal, - .data = xmalloc(sizeof(int)) + .data = { + .signum = signum + } }; - *(int *)event.data = signum; event_push(event); }