From a0440191eaee67c386ce19c68f9fb7cf1d965ef6 Mon Sep 17 00:00:00 2001 From: fliep Date: Tue, 9 Jun 2009 21:51:05 +0000 Subject: [PATCH] Moved startup code to the Glk thread. Now Frotz works! (Fix #14) --- libchimara/chimara-glk.c | 76 ++++++++++++++++++++++------------------ libchimara/glk.c | 3 +- tests/main.c | 8 ++--- 3 files changed, 47 insertions(+), 40 deletions(-) diff --git a/libchimara/chimara-glk.c b/libchimara/chimara-glk.c index bf0e60b..172e765 100644 --- a/libchimara/chimara-glk.c +++ b/libchimara/chimara-glk.c @@ -913,14 +913,37 @@ chimara_glk_get_spacing(ChimaraGlk *glk) return priv->spacing; } +struct StartupData { + glk_main_t glk_main; + glkunix_startup_code_t glkunix_startup_code; + glkunix_startup_t args; +}; + /* glk_enter() is the actual function called in the new thread in which glk_main() runs. */ static gpointer -glk_enter(gpointer glk_main) +glk_enter(struct StartupData *startup) { extern ChimaraGlkPrivate *glk_data; - + + /* Run startup function */ + if(startup->glkunix_startup_code) { + glk_data->in_startup = TRUE; + int result = startup->glkunix_startup_code(&startup->args); + glk_data->in_startup = FALSE; + + int i = 0; + while(i < startup->args.argc) + g_free(startup->args.argv[i++]); + g_free(startup->args.argv); + + if(!result) + return NULL; + } + + /* Run main function */ g_signal_emit_by_name(glk_data->self, "started"); - ((glk_main_t)glk_main)(); + (startup->glk_main)(); + g_slice_free(struct StartupData, startup); g_signal_emit_by_name(glk_data->self, "stopped"); return NULL; } @@ -952,10 +975,9 @@ chimara_glk_run(ChimaraGlk *glk, gchar *plugin, int argc, char *argv[], GError * g_return_val_if_fail(plugin, FALSE); ChimaraGlkPrivate *priv = CHIMARA_GLK_PRIVATE(glk); + struct StartupData *startup = g_slice_new0(struct StartupData); /* Open the module to run */ - glk_main_t glk_main; - glkunix_startup_code_t glkunix_startup_code; g_assert( g_module_supported() ); priv->program = g_module_open(plugin, G_MODULE_BIND_LAZY); @@ -964,51 +986,35 @@ chimara_glk_run(ChimaraGlk *glk, gchar *plugin, int argc, char *argv[], GError * g_warning( "Error opening module: %s", g_module_error() ); return FALSE; } - if( !g_module_symbol(priv->program, "glk_main", (gpointer *) &glk_main) ) + if( !g_module_symbol(priv->program, "glk_main", (gpointer *) &startup->glk_main) ) { g_warning( "Error finding glk_main(): %s", g_module_error() ); return FALSE; } - extern ChimaraGlkPrivate *glk_data; - /* Set the thread's private data */ - /* TODO: Do this with a GPrivate */ - glk_data = priv; - - if( g_module_symbol(priv->program, "glkunix_startup_code", (gpointer *) &glkunix_startup_code) ) + if( g_module_symbol(priv->program, "glkunix_startup_code", (gpointer *) &startup->glkunix_startup_code) ) { - glkunix_startup_t data; glkunix_argumentlist_t *glkunix_arguments; - gboolean startup_succeeded; - if( !(g_module_symbol(priv->program, "glkunix_arguments", (gpointer *) &glkunix_arguments) && parse_command_line(glkunix_arguments, argc, argv, &data)) ) + if( !(g_module_symbol(priv->program, "glkunix_arguments", (gpointer *) &glkunix_arguments) + && parse_command_line(glkunix_arguments, argc, argv, &startup->args)) ) { /* arguments could not be parsed, so create data ourselves */ - data.argc = 1; - data.argv = g_new0(gchar *, 1); + startup->args.argc = 1; + startup->args.argv = g_new0(gchar *, 1); } /* Set the program name */ - data.argv[0] = g_strdup(plugin); - - priv->in_startup = TRUE; - startup_succeeded = glkunix_startup_code(&data); - priv->in_startup = FALSE; - - int i=0; - while(i < data.argc) - g_free(data.argv[i++]); - g_free(data.argv); - - if(!startup_succeeded) - { - chimara_glk_stopped(glk); - return FALSE; - } + startup->args.argv[0] = g_strdup(plugin); } + + extern ChimaraGlkPrivate *glk_data; + /* Set the thread's private data */ + /* TODO: Do this with a GPrivate */ + glk_data = priv; /* Run in a separate thread */ - priv->thread = g_thread_create(glk_enter, glk_main, TRUE, error); + priv->thread = g_thread_create((GThreadFunc)glk_enter, startup, TRUE, error); return !(priv->thread == NULL); } @@ -1026,7 +1032,7 @@ chimara_glk_stop(ChimaraGlk *glk) { g_return_if_fail(glk || CHIMARA_IS_GLK(glk)); /* TODO: check if glk is actually running a program */ - signal_abort(); + signal_abort(); } /** diff --git a/libchimara/glk.c b/libchimara/glk.c index d96c951..2f7e10f 100644 --- a/libchimara/glk.c +++ b/libchimara/glk.c @@ -42,7 +42,8 @@ G_GNUC_INTERNAL ChimaraGlkPrivate *glk_data = NULL; void glk_exit(void) { - g_signal_emit_by_name(glk_data->self, "stopped"); + if(!glk_data->in_startup) + g_signal_emit_by_name(glk_data->self, "stopped"); /* Stop any timers */ glk_request_timer_events(0); diff --git a/tests/main.c b/tests/main.c index ee011a2..0a03c3c 100644 --- a/tests/main.c +++ b/tests/main.c @@ -118,10 +118,10 @@ main(int argc, char *argv[]) g_object_unref( G_OBJECT(builder) ); - if( !chimara_glk_run(CHIMARA_GLK(glk), "../interpreters/nitfol/.libs/nitfol.so", argc, argv, &error) ) { - error_dialog(GTK_WINDOW(window), error, "Error starting Glk library: "); - return 1; - } + if( !chimara_glk_run(CHIMARA_GLK(glk), "../interpreters/frotz/.libs/frotz.so", argc, argv, &error) ) { + error_dialog(GTK_WINDOW(window), error, "Error starting Glk library: "); + return 1; + } gdk_threads_enter(); gtk_main(); -- 2.30.2