[Spice-devel] [PATCH v2 2/3] tests: create and use a template file for events
Frediano Ziglio
fziglio at redhat.com
Thu Dec 17 05:22:19 PST 2015
This template will be reused for main loop
Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
---
server/Makefile.am | 1 +
server/event_loop.tmpl.c | 191 ++++++++++++++++++++++++++++++++++++++++
server/tests/basic_event_loop.c | 159 ++-------------------------------
3 files changed, 198 insertions(+), 153 deletions(-)
create mode 100644 server/event_loop.tmpl.c
diff --git a/server/Makefile.am b/server/Makefile.am
index 32ab8eb..ce42fbb 100644
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -155,6 +155,7 @@ EXTRA_DIST = \
cache-item.tmpl.c \
glz-encode-match.tmpl.c \
glz-encode.tmpl.c \
+ event_loop.tmpl.c \
spice-server.syms \
$(NULL)
diff --git a/server/event_loop.tmpl.c b/server/event_loop.tmpl.c
new file mode 100644
index 0000000..0790d36
--- /dev/null
+++ b/server/event_loop.tmpl.c
@@ -0,0 +1,191 @@
+/* -*- Mode: C; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/*
+ Copyright (C) 2009-2015 Red Hat, Inc.
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, see <http://www.gnu.org/licenses/>.
+*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <glib.h>
+#include "spice/macros.h"
+#include "common/mem.h"
+
+#ifndef CORE_NAME
+#error CORE_NAME must be defined!
+#endif
+
+#ifndef CORE_MAIN_CONTEXT
+#error CORE_MAIN_CONTEXT must be defined!
+#endif
+
+#ifndef CORE_CHANNEL_EVENT
+#define CORE_CHANNEL_EVENT NULL
+#endif
+
+struct SpiceTimer {
+ SpiceTimerFunc func;
+ void *opaque;
+ GSource *source;
+};
+
+static SpiceTimer* CORE_NAME(timer_add)(SpiceTimerFunc func, void *opaque)
+{
+ SpiceTimer *timer = spice_malloc0(sizeof(SpiceTimer));
+
+ timer->func = func;
+ timer->opaque = opaque;
+
+ return timer;
+}
+
+static gboolean CORE_NAME(timer_func)(gpointer user_data)
+{
+ SpiceTimer *timer = user_data;
+
+ timer->func(timer->opaque);
+ /* timer might be free after func(), don't touch */
+
+ return FALSE;
+}
+
+static void CORE_NAME(timer_cancel)(SpiceTimer *timer)
+{
+ if (timer->source) {
+ g_source_destroy(timer->source);
+ g_source_unref(timer->source);
+ timer->source = NULL;
+ }
+}
+
+static void CORE_NAME(timer_start)(SpiceTimer *timer, uint32_t ms)
+{
+ CORE_NAME(timer_cancel)(timer);
+
+ timer->source = g_timeout_source_new(ms);
+ spice_assert(timer->source != NULL);
+
+ g_source_set_callback(timer->source, CORE_NAME(timer_func), timer, NULL);
+
+ g_source_attach(timer->source, CORE_MAIN_CONTEXT(timer->opaque));
+}
+
+static void CORE_NAME(timer_remove)(SpiceTimer *timer)
+{
+ CORE_NAME(timer_cancel)(timer);
+ spice_assert(timer->source == NULL);
+ free(timer);
+}
+
+struct SpiceWatch {
+ void *opaque;
+ GSource *source;
+ GIOChannel *channel;
+ SpiceWatchFunc func;
+};
+
+static GIOCondition spice_event_to_giocondition(int event_mask)
+{
+ GIOCondition condition = 0;
+
+ if (event_mask & SPICE_WATCH_EVENT_READ)
+ condition |= G_IO_IN;
+ if (event_mask & SPICE_WATCH_EVENT_WRITE)
+ condition |= G_IO_OUT;
+
+ return condition;
+}
+
+static int giocondition_to_spice_event(GIOCondition condition)
+{
+ int event = 0;
+
+ if (condition & G_IO_IN)
+ event |= SPICE_WATCH_EVENT_READ;
+ if (condition & G_IO_OUT)
+ event |= SPICE_WATCH_EVENT_WRITE;
+
+ return event;
+}
+
+static gboolean CORE_NAME(watch_func)(GIOChannel *source, GIOCondition condition,
+ gpointer data)
+{
+ SpiceWatch *watch = data;
+ int fd = g_io_channel_unix_get_fd(source);
+
+ watch->func(fd, giocondition_to_spice_event(condition), watch->opaque);
+
+ return TRUE;
+}
+
+static void CORE_NAME(watch_update_mask)(SpiceWatch *watch, int event_mask)
+{
+ if (watch->source) {
+ g_source_destroy(watch->source);
+ g_source_unref(watch->source);
+ watch->source = NULL;
+ }
+
+ if (!event_mask)
+ return;
+
+ watch->source = g_io_create_watch(watch->channel, spice_event_to_giocondition(event_mask));
+ g_source_set_callback(watch->source, (GSourceFunc)CORE_NAME(watch_func), watch, NULL);
+ g_source_attach(watch->source, CORE_MAIN_CONTEXT(watch->opaque));
+}
+
+static SpiceWatch *CORE_NAME(watch_add)(int fd, int event_mask, SpiceWatchFunc func, void *opaque)
+{
+ SpiceWatch *watch;
+
+ spice_return_val_if_fail(fd != -1, NULL);
+ spice_return_val_if_fail(func != NULL, NULL);
+
+ watch = spice_malloc0(sizeof(SpiceWatch));
+ watch->channel = g_io_channel_unix_new(fd);
+ watch->func = func;
+ watch->opaque = opaque;
+
+ CORE_NAME(watch_update_mask)(watch, event_mask);
+
+ return watch;
+}
+
+static void CORE_NAME(watch_remove)(SpiceWatch *watch)
+{
+ CORE_NAME(watch_update_mask)(watch, 0);
+ spice_assert(watch->source == NULL);
+
+ g_io_channel_unref(watch->channel);
+ free(watch);
+}
+
+static SpiceCoreInterface CORE_NAME(core) = {
+ .base = {
+ .major_version = SPICE_INTERFACE_CORE_MAJOR,
+ .minor_version = SPICE_INTERFACE_CORE_MINOR,
+ },
+ .timer_add = CORE_NAME(timer_add),
+ .timer_start = CORE_NAME(timer_start),
+ .timer_cancel = CORE_NAME(timer_cancel),
+ .timer_remove = CORE_NAME(timer_remove),
+
+ .watch_add = CORE_NAME(watch_add),
+ .watch_update_mask = CORE_NAME(watch_update_mask),
+ .watch_remove = CORE_NAME(watch_remove),
+
+ .channel_event = CORE_CHANNEL_EVENT
+};
diff --git a/server/tests/basic_event_loop.c b/server/tests/basic_event_loop.c
index 450c998..cb4c36c 100644
--- a/server/tests/basic_event_loop.c
+++ b/server/tests/basic_event_loop.c
@@ -45,150 +45,18 @@ GMainContext *basic_event_loop_get_context(void)
return main_context;
}
-struct SpiceTimer {
- SpiceTimerFunc func;
- void *opaque;
- GSource *source;
-};
-
-static SpiceTimer* timer_add(SpiceTimerFunc func, void *opaque)
-{
- SpiceTimer *timer = spice_malloc0(sizeof(SpiceTimer));
-
- timer->func = func;
- timer->opaque = opaque;
-
- return timer;
-}
-
-static gboolean timer_func(gpointer user_data)
-{
- SpiceTimer *timer = user_data;
-
- timer->func(timer->opaque);
- /* timer might be free after func(), don't touch */
-
- return FALSE;
-}
-
-static void timer_cancel(SpiceTimer *timer)
-{
- if (timer->source) {
- g_source_destroy(timer->source);
- g_source_unref(timer->source);
- timer->source = NULL;
- }
-}
-
-static void timer_start(SpiceTimer *timer, uint32_t ms)
-{
- timer_cancel(timer);
-
- timer->source = g_timeout_source_new(ms);
- spice_assert(timer->source != NULL);
-
- g_source_set_callback(timer->source, timer_func, timer, NULL);
-
- g_source_attach(timer->source, main_context);
-}
-
-static void timer_remove(SpiceTimer *timer)
-{
- timer_cancel(timer);
- spice_assert(timer->source == NULL);
- free(timer);
-}
-
-struct SpiceWatch {
- void *opaque;
- GSource *source;
- GIOChannel *channel;
- SpiceWatchFunc func;
-};
-
-static GIOCondition spice_event_to_giocondition(int event_mask)
-{
- GIOCondition condition = 0;
-
- if (event_mask & SPICE_WATCH_EVENT_READ)
- condition |= G_IO_IN;
- if (event_mask & SPICE_WATCH_EVENT_WRITE)
- condition |= G_IO_OUT;
-
- return condition;
-}
-
-static int giocondition_to_spice_event(GIOCondition condition)
-{
- int event = 0;
-
- if (condition & G_IO_IN)
- event |= SPICE_WATCH_EVENT_READ;
- if (condition & G_IO_OUT)
- event |= SPICE_WATCH_EVENT_WRITE;
-
- return event;
-}
-
-static gboolean watch_func(GIOChannel *source, GIOCondition condition,
- gpointer data)
-{
- SpiceWatch *watch = data;
- int fd = g_io_channel_unix_get_fd(source);
-
- watch->func(fd, giocondition_to_spice_event(condition), watch->opaque);
-
- return TRUE;
-}
-
-static void watch_update_mask(SpiceWatch *watch, int event_mask)
-{
- if (watch->source) {
- g_source_destroy(watch->source);
- g_source_unref(watch->source);
- watch->source = NULL;
- }
-
- if (!event_mask)
- return;
-
- watch->source = g_io_create_watch(watch->channel, spice_event_to_giocondition(event_mask));
- g_source_set_callback(watch->source, (GSourceFunc)watch_func, watch, NULL);
- g_source_attach(watch->source, main_context);
-}
-
-static SpiceWatch *watch_add(int fd, int event_mask, SpiceWatchFunc func, void *opaque)
-{
- SpiceWatch *watch;
-
- spice_return_val_if_fail(fd != -1, NULL);
- spice_return_val_if_fail(func != NULL, NULL);
-
- watch = spice_malloc0(sizeof(SpiceWatch));
- watch->channel = g_io_channel_unix_new(fd);
- watch->func = func;
- watch->opaque = opaque;
-
- watch_update_mask(watch, event_mask);
-
- return watch;
-}
-
-static void watch_remove(SpiceWatch *watch)
-{
- watch_update_mask(watch, 0);
- spice_assert(watch->source == NULL);
-
- g_io_channel_unref(watch->channel);
- free(watch);
-}
-
static void channel_event(int event, SpiceChannelEventInfo *info)
{
DPRINTF(0, "channel event con, type, id, event: %d, %d, %d, %d",
info->connection_id, info->type, info->id, event);
}
+#define CORE_NAME(name) name
+#define CORE_MAIN_CONTEXT(opaque) main_context
+#define CORE_CHANNEL_EVENT channel_event
+
+#include "../event_loop.tmpl.c"
+
void basic_event_loop_mainloop(void)
{
GMainLoop *loop = g_main_loop_new(main_context, FALSE);
@@ -207,21 +75,6 @@ static void ignore_sigpipe(void)
sigaction(SIGPIPE, &act, NULL);
}
-static SpiceCoreInterface core = {
- .base = {
- .major_version = SPICE_INTERFACE_CORE_MAJOR,
- .minor_version = SPICE_INTERFACE_CORE_MINOR,
- },
- .timer_add = timer_add,
- .timer_start = timer_start,
- .timer_cancel = timer_cancel,
- .timer_remove = timer_remove,
- .watch_add = watch_add,
- .watch_update_mask = watch_update_mask,
- .watch_remove = watch_remove,
- .channel_event = channel_event,
-};
-
SpiceCoreInterface *basic_event_loop_init(void)
{
ignore_sigpipe();
--
2.4.3
More information about the Spice-devel
mailing list