summaryrefslogtreecommitdiffstats
path: root/polyp/glib-mainloop.c
diff options
context:
space:
mode:
Diffstat (limited to 'polyp/glib-mainloop.c')
-rw-r--r--polyp/glib-mainloop.c126
1 files changed, 64 insertions, 62 deletions
diff --git a/polyp/glib-mainloop.c b/polyp/glib-mainloop.c
index 0f96a594..6552da15 100644
--- a/polyp/glib-mainloop.c
+++ b/polyp/glib-mainloop.c
@@ -28,62 +28,64 @@
#include "glib-mainloop.h"
#include "idxset.h"
#include "xmalloc.h"
+#include "glib.h"
+#include "util.h"
-struct pa_io_event {
- struct pa_glib_mainloop *mainloop;
+struct pa_io_event {
+ pa_glib_mainloop *mainloop;
int dead;
GIOChannel *io_channel;
GSource *source;
GIOCondition io_condition;
int fd;
- void (*callback) (struct pa_mainloop_api*m, struct pa_io_event *e, int fd, enum pa_io_event_flags f, void *userdata);
+ void (*callback) (pa_mainloop_api*m, pa_io_event *e, int fd, pa_io_event_flags f, void *userdata);
void *userdata;
- void (*destroy_callback) (struct pa_mainloop_api *m, struct pa_io_event*e, void *userdata);
- struct pa_io_event *next, *prev;
+ void (*destroy_callback) (pa_mainloop_api *m, pa_io_event*e, void *userdata);
+ pa_io_event *next, *prev;
};
struct pa_time_event {
- struct pa_glib_mainloop *mainloop;
+ pa_glib_mainloop *mainloop;
int dead;
GSource *source;
struct timeval timeval;
- void (*callback) (struct pa_mainloop_api*m, struct pa_time_event *e, const struct timeval *tv, void *userdata);
+ void (*callback) (pa_mainloop_api*m, pa_time_event *e, const struct timeval *tv, void *userdata);
void *userdata;
- void (*destroy_callback) (struct pa_mainloop_api *m, struct pa_time_event*e, void *userdata);
- struct pa_time_event *next, *prev;
+ void (*destroy_callback) (pa_mainloop_api *m, pa_time_event*e, void *userdata);
+ pa_time_event *next, *prev;
};
struct pa_defer_event {
- struct pa_glib_mainloop *mainloop;
+ pa_glib_mainloop *mainloop;
int dead;
GSource *source;
- void (*callback) (struct pa_mainloop_api*m, struct pa_defer_event *e, void *userdata);
+ void (*callback) (pa_mainloop_api*m, pa_defer_event *e, void *userdata);
void *userdata;
- void (*destroy_callback) (struct pa_mainloop_api *m, struct pa_defer_event*e, void *userdata);
- struct pa_defer_event *next, *prev;
+ void (*destroy_callback) (pa_mainloop_api *m, pa_defer_event*e, void *userdata);
+ pa_defer_event *next, *prev;
};
struct pa_glib_mainloop {
GMainContext *glib_main_context;
- struct pa_mainloop_api api;
+ pa_mainloop_api api;
GSource *cleanup_source;
- struct pa_io_event *io_events, *dead_io_events;
- struct pa_time_event *time_events, *dead_time_events;
- struct pa_defer_event *defer_events, *dead_defer_events;
+ pa_io_event *io_events, *dead_io_events;
+ pa_time_event *time_events, *dead_time_events;
+ pa_defer_event *defer_events, *dead_defer_events;
};
-static void schedule_free_dead_events(struct pa_glib_mainloop *g);
+static void schedule_free_dead_events(pa_glib_mainloop *g);
-static void glib_io_enable(struct pa_io_event*e, enum pa_io_event_flags f);
+static void glib_io_enable(pa_io_event*e, pa_io_event_flags f);
-static struct pa_io_event* glib_io_new(struct pa_mainloop_api*m, int fd, enum pa_io_event_flags f, void (*callback) (struct pa_mainloop_api*m, struct pa_io_event*e, int fd, enum pa_io_event_flags f, void *userdata), void *userdata) {
- struct pa_io_event *e;
- struct pa_glib_mainloop *g;
+static pa_io_event* glib_io_new(pa_mainloop_api*m, int fd, pa_io_event_flags f, void (*callback) (pa_mainloop_api*m, pa_io_event*e, int fd, pa_io_event_flags f, void *userdata), void *userdata) {
+ pa_io_event *e;
+ pa_glib_mainloop *g;
assert(m && m->userdata && fd >= 0 && callback);
g = m->userdata;
- e = pa_xmalloc(sizeof(struct pa_io_event));
+ e = pa_xmalloc(sizeof(pa_io_event));
e->mainloop = m->userdata;
e->dead = 0;
e->fd = fd;
@@ -108,8 +110,8 @@ static struct pa_io_event* glib_io_new(struct pa_mainloop_api*m, int fd, enum pa
/* The callback GLIB calls whenever an IO condition is met */
static gboolean io_cb(GIOChannel *source, GIOCondition condition, gpointer data) {
- struct pa_io_event *e = data;
- enum pa_io_event_flags f;
+ pa_io_event *e = data;
+ pa_io_event_flags f;
assert(source && e && e->io_channel == source);
f = (condition & G_IO_IN ? PA_IO_EVENT_INPUT : 0) |
@@ -121,7 +123,7 @@ static gboolean io_cb(GIOChannel *source, GIOCondition condition, gpointer data)
return TRUE;
}
-static void glib_io_enable(struct pa_io_event*e, enum pa_io_event_flags f) {
+static void glib_io_enable(pa_io_event*e, pa_io_event_flags f) {
GIOCondition c;
assert(e && !e->dead);
@@ -145,7 +147,7 @@ static void glib_io_enable(struct pa_io_event*e, enum pa_io_event_flags f) {
e->io_condition = c;
}
-static void glib_io_free(struct pa_io_event*e) {
+static void glib_io_free(pa_io_event*e) {
assert(e && !e->dead);
if (e->source) {
@@ -172,23 +174,23 @@ static void glib_io_free(struct pa_io_event*e) {
schedule_free_dead_events(e->mainloop);
}
-static void glib_io_set_destroy(struct pa_io_event*e, void (*callback)(struct pa_mainloop_api*m, struct pa_io_event *e, void *userdata)) {
+static void glib_io_set_destroy(pa_io_event*e, void (*callback)(pa_mainloop_api*m, pa_io_event *e, void *userdata)) {
assert(e);
e->destroy_callback = callback;
}
/* Time sources */
-static void glib_time_restart(struct pa_time_event*e, const struct timeval *tv);
+static void glib_time_restart(pa_time_event*e, const struct timeval *tv);
-static struct pa_time_event* glib_time_new(struct pa_mainloop_api*m, const struct timeval *tv, void (*callback) (struct pa_mainloop_api*m, struct pa_time_event*e, const struct timeval *tv, void *userdata), void *userdata) {
- struct pa_glib_mainloop *g;
- struct pa_time_event *e;
+static pa_time_event* glib_time_new(pa_mainloop_api*m, const struct timeval *tv, void (*callback) (pa_mainloop_api*m, pa_time_event*e, const struct timeval *tv, void *userdata), void *userdata) {
+ pa_glib_mainloop *g;
+ pa_time_event *e;
assert(m && m->userdata && tv && callback);
g = m->userdata;
- e = pa_xmalloc(sizeof(struct pa_time_event));
+ e = pa_xmalloc(sizeof(pa_time_event));
e->mainloop = g;
e->dead = 0;
e->callback = callback;
@@ -227,7 +229,7 @@ static guint msec_diff(const struct timeval *a, const struct timeval *b) {
}
static gboolean time_cb(gpointer data) {
- struct pa_time_event* e = data;
+ pa_time_event* e = data;
assert(e && e->mainloop && e->source);
g_source_unref(e->source);
@@ -237,7 +239,7 @@ static gboolean time_cb(gpointer data) {
return FALSE;
}
-static void glib_time_restart(struct pa_time_event*e, const struct timeval *tv) {
+static void glib_time_restart(pa_time_event*e, const struct timeval *tv) {
struct timeval now;
assert(e && e->mainloop && !e->dead);
@@ -258,7 +260,7 @@ static void glib_time_restart(struct pa_time_event*e, const struct timeval *tv)
e->source = NULL;
}
-static void glib_time_free(struct pa_time_event *e) {
+static void glib_time_free(pa_time_event *e) {
assert(e && e->mainloop && !e->dead);
if (e->source) {
@@ -285,23 +287,23 @@ static void glib_time_free(struct pa_time_event *e) {
schedule_free_dead_events(e->mainloop);
}
-static void glib_time_set_destroy(struct pa_time_event *e, void (*callback)(struct pa_mainloop_api*m, struct pa_time_event*e, void *userdata)) {
+static void glib_time_set_destroy(pa_time_event *e, void (*callback)(pa_mainloop_api*m, pa_time_event*e, void *userdata)) {
assert(e);
e->destroy_callback = callback;
}
/* Deferred sources */
-static void glib_defer_enable(struct pa_defer_event *e, int b);
+static void glib_defer_enable(pa_defer_event *e, int b);
-static struct pa_defer_event* glib_defer_new(struct pa_mainloop_api*m, void (*callback) (struct pa_mainloop_api*m, struct pa_defer_event *e, void *userdata), void *userdata) {
- struct pa_defer_event *e;
- struct pa_glib_mainloop *g;
+static pa_defer_event* glib_defer_new(pa_mainloop_api*m, void (*callback) (pa_mainloop_api*m, pa_defer_event *e, void *userdata), void *userdata) {
+ pa_defer_event *e;
+ pa_glib_mainloop *g;
assert(m && m->userdata && callback);
g = m->userdata;
- e = pa_xmalloc(sizeof(struct pa_defer_event));
+ e = pa_xmalloc(sizeof(pa_defer_event));
e->mainloop = g;
e->dead = 0;
e->callback = callback;
@@ -319,14 +321,14 @@ static struct pa_defer_event* glib_defer_new(struct pa_mainloop_api*m, void (*ca
}
static gboolean idle_cb(gpointer data) {
- struct pa_defer_event* e = data;
+ pa_defer_event* e = data;
assert(e && e->mainloop && e->source);
e->callback(&e->mainloop->api, e, e->userdata);
return TRUE;
}
-static void glib_defer_enable(struct pa_defer_event *e, int b) {
+static void glib_defer_enable(pa_defer_event *e, int b) {
assert(e && e->mainloop);
if (e->source && !b) {
@@ -342,7 +344,7 @@ static void glib_defer_enable(struct pa_defer_event *e, int b) {
}
}
-static void glib_defer_free(struct pa_defer_event *e) {
+static void glib_defer_free(pa_defer_event *e) {
assert(e && e->mainloop && !e->dead);
if (e->source) {
@@ -369,22 +371,22 @@ static void glib_defer_free(struct pa_defer_event *e) {
schedule_free_dead_events(e->mainloop);
}
-static void glib_defer_set_destroy(struct pa_defer_event *e, void (*callback)(struct pa_mainloop_api *m, struct pa_defer_event *e, void *userdata)) {
+static void glib_defer_set_destroy(pa_defer_event *e, void (*callback)(pa_mainloop_api *m, pa_defer_event *e, void *userdata)) {
assert(e);
e->destroy_callback = callback;
}
/* quit() */
-static void glib_quit(struct pa_mainloop_api*a, int retval) {
- struct pa_glib_mainloop *g;
+static void glib_quit(pa_mainloop_api*a, PA_GCC_UNUSED int retval) {
+ pa_glib_mainloop *g;
assert(a && a->userdata);
g = a->userdata;
/* NOOP */
}
-static const struct pa_mainloop_api vtable = {
+static const pa_mainloop_api vtable = {
.userdata = NULL,
.io_new = glib_io_new,
@@ -405,10 +407,10 @@ static const struct pa_mainloop_api vtable = {
.quit = glib_quit,
};
-struct pa_glib_mainloop *pa_glib_mainloop_new(GMainContext *c) {
- struct pa_glib_mainloop *g;
+pa_glib_mainloop *pa_glib_mainloop_new(GMainContext *c) {
+ pa_glib_mainloop *g;
- g = pa_xmalloc(sizeof(struct pa_glib_mainloop));
+ g = pa_xmalloc(sizeof(pa_glib_mainloop));
if (c) {
g->glib_main_context = c;
g_main_context_ref(c);
@@ -426,9 +428,9 @@ struct pa_glib_mainloop *pa_glib_mainloop_new(GMainContext *c) {
return g;
}
-static void free_io_events(struct pa_io_event *e) {
+static void free_io_events(pa_io_event *e) {
while (e) {
- struct pa_io_event *r = e;
+ pa_io_event *r = e;
e = r->next;
if (r->source) {
@@ -446,9 +448,9 @@ static void free_io_events(struct pa_io_event *e) {
}
}
-static void free_time_events(struct pa_time_event *e) {
+static void free_time_events(pa_time_event *e) {
while (e) {
- struct pa_time_event *r = e;
+ pa_time_event *r = e;
e = r->next;
if (r->source) {
@@ -463,9 +465,9 @@ static void free_time_events(struct pa_time_event *e) {
}
}
-static void free_defer_events(struct pa_defer_event *e) {
+static void free_defer_events(pa_defer_event *e) {
while (e) {
- struct pa_defer_event *r = e;
+ pa_defer_event *r = e;
e = r->next;
if (r->source) {
@@ -480,7 +482,7 @@ static void free_defer_events(struct pa_defer_event *e) {
}
}
-void pa_glib_mainloop_free(struct pa_glib_mainloop* g) {
+void pa_glib_mainloop_free(pa_glib_mainloop* g) {
assert(g);
free_io_events(g->io_events);
@@ -499,13 +501,13 @@ void pa_glib_mainloop_free(struct pa_glib_mainloop* g) {
pa_xfree(g);
}
-struct pa_mainloop_api* pa_glib_mainloop_get_api(struct pa_glib_mainloop *g) {
+pa_mainloop_api* pa_glib_mainloop_get_api(pa_glib_mainloop *g) {
assert(g);
return &g->api;
}
static gboolean free_dead_events(gpointer p) {
- struct pa_glib_mainloop *g = p;
+ pa_glib_mainloop *g = p;
assert(g);
free_io_events(g->dead_io_events);
@@ -523,7 +525,7 @@ static gboolean free_dead_events(gpointer p) {
return FALSE;
}
-static void schedule_free_dead_events(struct pa_glib_mainloop *g) {
+static void schedule_free_dead_events(pa_glib_mainloop *g) {
assert(g && g->glib_main_context);
if (g->cleanup_source)
generated by cgit (git 2.34.1) at 2024-11-16 10:23:42 +0000