Fix: Free die_name in bin_info_lookup_cu_function_name

[babeltrace.git] / lib / registry.c

diff --git a/lib/registry.c b/lib/registry.c
index 829ede9da77bf12dce5da544e3ea0bb3538a8049..bdce0c6d01e9cf306753791f44a588ed5cbe15a8 100644 (file)
--- a/lib/registry.c
+++ b/lib/registry.c
@@ -16,6 +16,14 @@
  *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
  *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.

+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.

  */
 
 #include <babeltrace/format.h>
  */
 
 #include <babeltrace/format.h>


@@ -29,21 +37,41 @@ struct walk_data {
        int iter;
 };
 
        int iter;
 };
 

-static int init_done;
-void __attribute__((constructor)) format_init(void);
-void __attribute__((destructor)) format_finalize(void);
-

 /*
  * Format registry hash table contains the registered formats. Format
  * registration is typically performed by a format plugin.
 /*
  * Format registry hash table contains the registered formats. Format
  * registration is typically performed by a format plugin.

- * TODO: support plugin unload (unregistration of formats).

  */
  */

-GHashTable *format_registry;
+static GHashTable *format_registry;
+static int format_refcount;
+static int init_done;
+
+static __attribute__((constructor)) void format_init(void);
+
+static
+void format_refcount_inc(void)
+{
+       format_refcount++;
+}
+
+static
+void format_cleanup(void)
+{
+       if (format_registry)
+               g_hash_table_destroy(format_registry);
+}

 
 

-struct format *bt_lookup_format(bt_intern_str name)
+static
+void format_refcount_dec(void)
+{
+       if (!--format_refcount)
+               format_cleanup();
+}
+
+struct bt_format *bt_lookup_format(bt_intern_str name)

 {
        if (!init_done)
                return NULL;
 {
        if (!init_done)
                return NULL;

+

        return g_hash_table_lookup(format_registry,
                                   (gconstpointer) (unsigned long) name);
 }
        return g_hash_table_lookup(format_registry,
                                   (gconstpointer) (unsigned long) name);
 }


@@ -61,6 +89,8 @@ void bt_fprintf_format_list(FILE *fp)
 {
        struct walk_data data;
 
 {
        struct walk_data data;
 

+       assert(fp);
+

        data.fp = fp;
        data.iter = 0;
 
        data.fp = fp;
        data.iter = 0;
 


@@ -73,30 +103,52 @@ void bt_fprintf_format_list(FILE *fp)
        fprintf(fp, ".\n");
 }
 
        fprintf(fp, ".\n");
 }
 

-int bt_register_format(struct format *format)
+int bt_register_format(struct bt_format *format)

 {
 {

+       if (!format)
+               return -EINVAL;
+

        if (!init_done)
                format_init();
 
        if (bt_lookup_format(format->name))
                return -EEXIST;
 
        if (!init_done)
                format_init();
 
        if (bt_lookup_format(format->name))
                return -EEXIST;
 

+       format_refcount_inc();

        g_hash_table_insert(format_registry,
                            (gpointer) (unsigned long) format->name,
                            format);
        return 0;
 }
 
        g_hash_table_insert(format_registry,
                            (gpointer) (unsigned long) format->name,
                            format);
        return 0;
 }
 

+void bt_unregister_format(struct bt_format *format)
+{
+       assert(bt_lookup_format(format->name));
+       g_hash_table_remove(format_registry,
+                           (gpointer) (unsigned long) format->name);
+       format_refcount_dec();
+}
+
+/*
+ * We cannot assume that the constructor and destructor order will be
+ * right: another library might be loaded before us, and initialize us
+ * from bt_register_format(). This is why we use a reference count to
+ * handle cleanup of this module. The format_finalize destructor
+ * refcount decrement matches format_init refcount increment.
+ */
+static __attribute__((constructor))

 void format_init(void)
 {
        if (init_done)
                return;
 void format_init(void)
 {
        if (init_done)
                return;

+       format_refcount_inc();

        format_registry = g_hash_table_new(g_direct_hash, g_direct_equal);
        assert(format_registry);
        init_done = 1;
 }
 
        format_registry = g_hash_table_new(g_direct_hash, g_direct_equal);
        assert(format_registry);
        init_done = 1;
 }
 

+static __attribute__((destructor))

 void format_finalize(void)
 {
 void format_finalize(void)
 {

-       g_hash_table_destroy(format_registry);
+       format_refcount_dec();

 }
 }