module: Split out the GTypeModule subclass.

[upkg.git] / src / module.c

diff --git a/src/module.c b/src/module.c
index f97bc65646f946c367ef78b05bd6a96ff0b404c2..ffc06e292ad300aaeb0a841d8428ccd8eee7c761 100644 (file)
--- a/src/module.c
+++ b/src/module.c
@@ -1,3 +1,22 @@
+/*
+ *  upkg: tool for manipulating Unreal Tournament packages.
+ *  Copyright (C) 2009 Nick Bowler
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program 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 General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -5,115 +24,84 @@
 #include <glib-object.h>
 #include <ltdl.h>
 
-#include "module.h"
-
-G_DEFINE_TYPE(UPkgModule, upkg_module, G_TYPE_TYPE_MODULE);
+#include <uobject/module.h>
+#include <uobject/package.h>
+#include "avl.h"
 
 static unsigned initialized;
+static struct avl_table *package_tree;
 
-static void dl_print_errors(const char *prefix)
+static char *str_cpy_lower(char *dst, const char *src)
 {
-       const char *err;
-       while (err = lt_dlerror()) {
-               if (prefix) fprintf(stderr, "%s: ", prefix);
-               puts(err);
-       }
-}
+       size_t i;
 
-static gboolean module_load(GTypeModule *m)
-{
-       UPkgModule *mod = UPKG_MODULE(m);
-       int (*init_func)(GTypeModule *);
+       for (i = 0; src[i]; i++)
+               dst[i] = tolower(src[i]);
+       dst[i] = 0;
 
-       mod->dl = lt_dlopenext(G_TYPE_MODULE(m)->name);
-       if (!mod->dl) {
-               dl_print_errors(__func__);
-               return FALSE;
-       }
+       return dst;
+}
 
-       init_func = lt_dlsym(mod->dl, "init");
-       if (!init_func || init_func(m) != 0) {
-               dl_print_errors(__func__);
-               lt_dlclose(mod->dl);
-               return FALSE;
-       }
+static int modcmp(const void *a, const void *b, void *_data)
+{
+       const GTypeModule *ma = a;
+       const GTypeModule *mb = b;
 
-       return TRUE;
+       return strcmp(ma->name, mb->name);
 }
 
-static void module_unload(GTypeModule *m)
+int uobject_module_init(void)
 {
-       UPkgModule *mod = UPKG_MODULE(m);
+       if (!initialized) {
+               package_tree = avl_create(modcmp, NULL, NULL);
+               if (!package_tree) {
+                       fprintf(stderr, "%s: failed to create package tree.\n", __func__);
+                       return -1;
+               }
 
-       if (lt_dlclose(mod->dl) != 0) {
-               dl_print_errors(__func__);
+               g_type_init();
        }
-}
 
-static void upkg_module_init(UPkgModule *mod)
-{
+       initialized++;
+       return 0;
 }
 
-static void upkg_module_class_init(UPkgModuleClass *class)
+int uobject_module_exit(void)
 {
-       GTypeModuleClass *modclass = G_TYPE_MODULE_CLASS(class);
+       if (--initialized)
+               return 0;
 
-       modclass->load   = module_load;
-       modclass->unload = module_unload;
+       avl_destroy(package_tree, NULL);
+
+       return 0;
 }
 
-UPkgModule *upkg_module_new(const char *name)
+GType uobject_module_get_class(const char *package, const char *class)
 {
-       char *name2;
-       size_t len;
+       char buf[strlen(package) + strlen(class) + 1];
+       GTypeModule search = { .name = str_cpy_lower(buf, package) };
 
-       if (!name) {
-               return NULL;
-       }
-
-       len   = strlen(name);
-       name2 = malloc(len+1);
-       if (!name2) {
-               return NULL;
-       }
-
-       UPkgModule *mod = g_object_new(UPKG_MODULE_TYPE, NULL);
+       GTypeModule *mod = avl_find(package_tree, &search);
        if (!mod) {
-               free(name2);
-               return NULL;
-       }
+               void **p;
 
-       G_TYPE_MODULE(mod)->name = name2;
-       for (size_t i = 0; i < len; i++) {
-               name2[i] = tolower(name[i]);
-       }
-       name2[len] = 0;
-
-       return mod;
-}
-
-int module_init(void)
-{
-       if (!initialized) {
-               if (lt_dlinit() != 0) {
-                       dl_print_errors(__func__);
-                       return -1;
+               mod = u_pkg_new(package);
+               if (!mod) {
+                       return 0;
                }
 
-               g_type_init();
+               p = avl_probe(package_tree, mod);
+               if (!p) {
+                       g_object_unref(mod);
+                       return 0;
+               }
        }
 
-       initialized++;
-       return 0;
-}
-
-int module_exit(void)
-{
-       if (--initialized)
+       if (!g_type_module_use(mod))
                return 0;
 
-       if (lt_dlexit() != 0) {
-               dl_print_errors(__func__);
-               return -1;
-       }
+       str_cpy_lower(buf+strlen(package), class);
+       buf[0] = toupper(buf[0]);
+       buf[strlen(package)] = toupper(buf[strlen(package)]);
+       return g_type_from_name(buf);
 }