glib2 3.4.3 → 3.4.7

data/ext/glib2/glib-enum-types.h

@@ -0,0 +1,154 @@
+
+/* Generated by glib-mkenums.rb ($Id$) */ 
+
+#ifndef __GLIB_ENUM_TYPES_H__
+#define __GLIB_ENUM_TYPES_H__
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+/* enumerations from "/usr/include/glib-2.0/glib/gvariant.h" */
+GType g_variant_class_get_type (void);
+#define G_TYPE_VARIANT_CLASS (g_variant_class_get_type())
+GType g_variant_parse_error_get_type (void);
+#define G_TYPE_VARIANT_PARSE_ERROR (g_variant_parse_error_get_type())
+
+/* enumerations from "/usr/include/glib-2.0/glib/gspawn.h" */
+GType g_spawn_error_get_type (void);
+#define G_TYPE_SPAWN_ERROR (g_spawn_error_get_type())
+GType g_spawn_flags_get_type (void);
+#define G_TYPE_SPAWN_FLAGS (g_spawn_flags_get_type())
+
+/* enumerations from "/usr/include/glib-2.0/glib/gkeyfile.h" */
+GType g_key_file_error_get_type (void);
+#define G_TYPE_KEY_FILE_ERROR (g_key_file_error_get_type())
+GType g_key_file_flags_get_type (void);
+#define G_TYPE_KEY_FILE_FLAGS (g_key_file_flags_get_type())
+
+/* enumerations from "/usr/include/glib-2.0/glib/gnode.h" */
+GType g_traverse_flags_get_type (void);
+#define G_TYPE_TRAVERSE_FLAGS (g_traverse_flags_get_type())
+GType g_traverse_type_get_type (void);
+#define G_TYPE_TRAVERSE_TYPE (g_traverse_type_get_type())
+
+/* enumerations from "/usr/include/glib-2.0/glib/gshell.h" */
+GType g_shell_error_get_type (void);
+#define G_TYPE_SHELL_ERROR (g_shell_error_get_type())
+
+/* enumerations from "/usr/include/glib-2.0/glib/gslice.h" */
+GType g_slice_config_get_type (void);
+#define G_TYPE_SLICE_CONFIG (g_slice_config_get_type())
+
+/* enumerations from "/usr/include/glib-2.0/glib/gregex.h" */
+GType g_regex_error_get_type (void);
+#define G_TYPE_REGEX_ERROR (g_regex_error_get_type())
+GType g_regex_compile_flags_get_type (void);
+#define G_TYPE_REGEX_COMPILE_FLAGS (g_regex_compile_flags_get_type())
+GType g_regex_match_flags_get_type (void);
+#define G_TYPE_REGEX_MATCH_FLAGS (g_regex_match_flags_get_type())
+
+/* enumerations from "/usr/include/glib-2.0/glib/gmarkup.h" */
+GType g_markup_error_get_type (void);
+#define G_TYPE_MARKUP_ERROR (g_markup_error_get_type())
+GType g_markup_parse_flags_get_type (void);
+#define G_TYPE_MARKUP_PARSE_FLAGS (g_markup_parse_flags_get_type())
+GType g_markup_collect_type_get_type (void);
+#define G_TYPE_MARKUP_COLLECT_TYPE (g_markup_collect_type_get_type())
+
+/* enumerations from "/usr/include/glib-2.0/glib/gtestutils.h" */
+GType g_test_trap_flags_get_type (void);
+#define G_TYPE_TEST_TRAP_FLAGS (g_test_trap_flags_get_type())
+GType g_test_subprocess_flags_get_type (void);
+#define G_TYPE_TEST_SUBPROCESS_FLAGS (g_test_subprocess_flags_get_type())
+GType g_test_log_type_get_type (void);
+#define G_TYPE_TEST_LOG_TYPE (g_test_log_type_get_type())
+GType g_test_file_type_get_type (void);
+#define G_TYPE_TEST_FILE_TYPE (g_test_file_type_get_type())
+
+/* enumerations from "/usr/include/glib-2.0/glib/gfileutils.h" */
+GType g_file_error_get_type (void);
+#define G_TYPE_FILE_ERROR (g_file_error_get_type())
+GType g_file_test_get_type (void);
+#define G_TYPE_FILE_TEST (g_file_test_get_type())
+
+/* enumerations from "/usr/include/glib-2.0/glib/gtimezone.h" */
+GType g_time_type_get_type (void);
+#define G_TYPE_TIME_TYPE (g_time_type_get_type())
+
+/* enumerations from "/usr/include/glib-2.0/glib/gdate.h" */
+GType g_date_dm_y_get_type (void);
+#define G_TYPE_DATE_DM_Y (g_date_dm_y_get_type())
+GType g_date_weekday_get_type (void);
+#define G_TYPE_DATE_WEEKDAY (g_date_weekday_get_type())
+GType g_date_month_get_type (void);
+#define G_TYPE_DATE_MONTH (g_date_month_get_type())
+
+/* enumerations from "/usr/include/glib-2.0/glib/gunicode.h" */
+GType g_unicode_type_get_type (void);
+#define G_TYPE_UNICODE_TYPE (g_unicode_type_get_type())
+GType g_unicode_break_type_get_type (void);
+#define G_TYPE_UNICODE_BREAK_TYPE (g_unicode_break_type_get_type())
+GType g_unicode_script_get_type (void);
+#define G_TYPE_UNICODE_SCRIPT (g_unicode_script_get_type())
+GType g_normalize_mode_get_type (void);
+#define G_TYPE_NORMALIZE_MODE (g_normalize_mode_get_type())
+
+/* enumerations from "/usr/include/glib-2.0/glib/ghook.h" */
+GType g_hook_flag_mask_get_type (void);
+#define G_TYPE_HOOK_FLAG_MASK (g_hook_flag_mask_get_type())
+
+/* enumerations from "/usr/include/glib-2.0/glib/gthread.h" */
+GType g_thread_error_get_type (void);
+#define G_TYPE_THREAD_ERROR (g_thread_error_get_type())
+GType g_once_status_get_type (void);
+#define G_TYPE_ONCE_STATUS (g_once_status_get_type())
+
+/* enumerations from "/usr/include/glib-2.0/glib/gstrfuncs.h" */
+GType g_ascii_type_get_type (void);
+#define G_TYPE_ASCII_TYPE (g_ascii_type_get_type())
+
+/* enumerations from "/usr/include/glib-2.0/glib/gmessages.h" */
+GType g_log_level_flags_get_type (void);
+#define G_TYPE_LOG_LEVEL_FLAGS (g_log_level_flags_get_type())
+
+/* enumerations from "/usr/include/glib-2.0/glib/gchecksum.h" */
+GType g_checksum_type_get_type (void);
+#define G_TYPE_CHECKSUM_TYPE (g_checksum_type_get_type())
+
+/* enumerations from "/usr/include/glib-2.0/glib/gutils.h" */
+GType g_user_directory_get_type (void);
+#define G_TYPE_USER_DIRECTORY (g_user_directory_get_type())
+GType g_format_size_flags_get_type (void);
+#define G_TYPE_FORMAT_SIZE_FLAGS (g_format_size_flags_get_type())
+
+/* enumerations from "/usr/include/glib-2.0/glib/goption.h" */
+GType g_option_flags_get_type (void);
+#define G_TYPE_OPTION_FLAGS (g_option_flags_get_type())
+GType g_option_arg_get_type (void);
+#define G_TYPE_OPTION_ARG (g_option_arg_get_type())
+GType g_option_error_get_type (void);
+#define G_TYPE_OPTION_ERROR (g_option_error_get_type())
+
+/* enumerations from "/usr/include/glib-2.0/glib/gconvert.h" */
+GType g_convert_error_get_type (void);
+#define G_TYPE_CONVERT_ERROR (g_convert_error_get_type())
+
+/* enumerations from "/usr/include/glib-2.0/glib/gbookmarkfile.h" */
+GType g_bookmark_file_error_get_type (void);
+#define G_TYPE_BOOKMARK_FILE_ERROR (g_bookmark_file_error_get_type())
+
+/* enumerations from "/usr/include/glib-2.0/gobject/gsignal.h" */
+GType g_signal_flags_get_type (void);
+#define G_TYPE_SIGNAL_FLAGS (g_signal_flags_get_type())
+GType g_connect_flags_get_type (void);
+#define G_TYPE_CONNECT_FLAGS (g_connect_flags_get_type())
+GType g_signal_match_type_get_type (void);
+#define G_TYPE_SIGNAL_MATCH_TYPE (g_signal_match_type_get_type())
+
+G_END_DECLS
+
+#endif /* __GLIB_ENUM_TYPES_H__ */
+
+/* Generated data ends here */
+

data/ext/glib2/glib2.def

@@ -158,6 +158,7 @@ EXPORTS
 	rbgutil_stop_callback_dispatch_thread
 	rbgutil_string_set_utf8_encoding
 	rbgutil_key_equal
+	rbgerr_ruby_error_quark
 	rbgerr_define_gerror
 	rbgerr_gerror2exception
 	rbgobj_convert_define

data/ext/glib2/rbglib-bytes.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2017-2019  Ruby-GNOME Project Team
+ *  Copyright (C) 2017-2021  Ruby-GNOME Project Team
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public
@@ -32,7 +32,6 @@ rbg_is_bytes(VALUE object)
     return RVAL2CBOOL(rb_obj_is_kind_of(object, RG_TARGET_NAMESPACE));
 }
 
-#if GLIB_CHECK_VERSION(2, 32, 0)
 static VALUE RG_TARGET_NAMESPACE;
 
 static VALUE
@@ -119,12 +118,10 @@ rg_pointer(VALUE self)
 
     return ULONG2NUM((guintptr)data);
 }
-#endif
 
 void
 Init_glib_bytes(void)
 {
-#if GLIB_CHECK_VERSION(2, 32, 0)
     RG_TARGET_NAMESPACE = G_DEF_CLASS(G_TYPE_BYTES, "Bytes", mGLib);
 
     RG_DEF_SMETHOD(try_convert, 1);
@@ -135,5 +132,4 @@ Init_glib_bytes(void)
     RG_DEF_METHOD(size, 0);
     RG_DEF_ALIAS("length", "size");
     RG_DEF_METHOD(pointer, 0);
-#endif
 }

data/ext/glib2/rbglib-gc.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2018-2019  Ruby-GNOME Project Team
+ *  Copyright (C) 2018-2020  Ruby-GNOME Project Team
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public
@@ -20,32 +20,45 @@
 
 #include "rbgprivate.h"
 
-static GHashTable *rbg_objects = NULL;
+typedef struct {
+    VALUE object;
+    guint ref_count;
+} RBGGCMarkItem;
+
+typedef struct {
+    GHashTable *items;
+    GMutex mutex;
+} RBGGCMarker;
+
+static RBGGCMarker *rbg_gc_marker_raw = NULL;
 
 static void
 gc_marker_mark_each(G_GNUC_UNUSED gpointer key,
                     gpointer value,
                     G_GNUC_UNUSED gpointer user_data)
 {
-    VALUE rb_object = (VALUE)value;
-    rb_gc_mark(rb_object);
+    RBGGCMarkItem *item = value;
+    rb_gc_mark(item->object);
 }
 
 static void
 gc_marker_mark(void *data)
 {
-    GHashTable *hash_table = data;
-    g_hash_table_foreach(hash_table, gc_marker_mark_each, NULL);
+    RBGGCMarker *marker = data;
+    g_mutex_lock(&(marker->mutex));
+    g_hash_table_foreach(marker->items, gc_marker_mark_each, NULL);
+    g_mutex_unlock(&(marker->mutex));
 }
 
 static void
 gc_marker_free(void *data)
 {
-    GHashTable *hash_table = data;
-    g_hash_table_unref(hash_table);
-    if (hash_table == rbg_objects) {
-        rbg_objects = NULL;
+    RBGGCMarker *marker_raw = data;
+    if (marker_raw == rbg_gc_marker_raw) {
+        rbg_gc_marker_raw = NULL;
     }
+    g_hash_table_unref(marker_raw->items);
+    g_free(marker_raw);
 }
 
 static const rb_data_type_t rbg_gc_marker_type = {
@@ -59,95 +72,128 @@ static const rb_data_type_t rbg_gc_marker_type = {
     RUBY_TYPED_FREE_IMMEDIATELY,
 };
 
-void
-rbg_gc_guard(gpointer key, VALUE rb_object)
+static VALUE
+rbg_gc_marker_new_raw(void)
 {
-    if (!rbg_objects)
-        return;
+    RBGGCMarker *gc_marker_raw = g_new(RBGGCMarker, 1);
+    gc_marker_raw->items = g_hash_table_new_full(g_direct_hash,
+                                                 g_direct_equal,
+                                                 NULL,
+                                                 g_free);
+    g_mutex_init(&(gc_marker_raw->mutex));
+
+    return TypedData_Wrap_Struct(rb_cObject,
+                                 &rbg_gc_marker_type,
+                                 gc_marker_raw);
+}
+
+static void
+rbg_gc_guard_raw(RBGGCMarker *gc_marker, gpointer key, VALUE rb_object)
+{
+    g_mutex_lock(&(gc_marker->mutex));
+    RBGGCMarkItem *item = g_hash_table_lookup(gc_marker->items, key);
+    if (item) {
+        item->ref_count++;
+    } else {
+        item = g_new(RBGGCMarkItem, 1);
+        item->object = rb_object;
+        item->ref_count = 1;
+        g_hash_table_insert(gc_marker->items, key, item);
+    }
+    g_mutex_unlock(&(gc_marker->mutex));
+}
 
-    g_hash_table_insert(rbg_objects,
-                        key,
-                        (gpointer)rb_object);
+static void
+rbg_gc_unguard_raw(RBGGCMarker *gc_marker, gpointer key)
+{
+    g_mutex_lock(&(gc_marker->mutex));
+    RBGGCMarkItem *item = g_hash_table_lookup(gc_marker->items, key);
+    if (item) {
+        item->ref_count--;
+        if (item->ref_count == 0) {
+            g_hash_table_remove(gc_marker->items, key);
+        }
+    }
+    g_mutex_unlock(&(gc_marker->mutex));
+}
+
+static void
+rbg_gc_unguard_all_raw(RBGGCMarker *gc_marker)
+{
+    g_mutex_lock(&(gc_marker->mutex));
+    g_hash_table_remove_all(gc_marker->items);
+    g_mutex_unlock(&(gc_marker->mutex));
 }
 
 void
-rbg_gc_unguard(gpointer key)
+rbg_gc_guard(gpointer key, VALUE rb_object)
 {
-    if (!rbg_objects)
+    if (!rbg_gc_marker_raw)
         return;
 
-    g_hash_table_remove(rbg_objects, key);
+    rbg_gc_guard_raw(rbg_gc_marker_raw, key, rb_object);
 }
 
-static VALUE
-rbg_gc_marker_new_raw(GHashTable *rb_objects)
+void
+rbg_gc_unguard(gpointer key)
 {
-    VALUE gc_marker;
+    if (!rbg_gc_marker_raw)
+        return;
 
-    gc_marker = TypedData_Wrap_Struct(rb_cData,
-                                      &rbg_gc_marker_type,
-                                      rb_objects);
-    return gc_marker;
+    rbg_gc_unguard_raw(rbg_gc_marker_raw, key);
 }
 
 VALUE
 rbg_gc_marker_new(void)
 {
-    GHashTable *rb_objects;
-
-    rb_objects = g_hash_table_new(g_direct_hash, g_direct_equal);
-    return rbg_gc_marker_new_raw(rb_objects);
+    return rbg_gc_marker_new_raw();
 }
 
 void
 rbg_gc_marker_guard(VALUE rb_gc_marker, VALUE rb_object)
 {
-    GHashTable *rb_objects;
-
+    RBGGCMarker *gc_marker;
     TypedData_Get_Struct(rb_gc_marker,
-                         GHashTable,
+                         RBGGCMarker,
                          &rbg_gc_marker_type,
-                         rb_objects);
-    g_hash_table_insert(rb_objects,
-                        (gpointer)rb_object,
-                        (gpointer)rb_object);
+                         gc_marker);
+    rbg_gc_guard_raw(gc_marker, RVAL2POINTER(rb_object), rb_object);
 }
 
 void
 rbg_gc_marker_unguard(VALUE rb_gc_marker, VALUE rb_object)
 {
-    GHashTable *rb_objects;
-
     if (!RB_TYPE_P(rb_gc_marker, RUBY_T_DATA))
         return;
     if (!RTYPEDDATA_P(rb_gc_marker))
         return;
 
+    RBGGCMarker *gc_marker;
     TypedData_Get_Struct(rb_gc_marker,
-                         GHashTable,
+                         RBGGCMarker,
                          &rbg_gc_marker_type,
-                         rb_objects);
-    g_hash_table_remove(rb_objects, (gpointer)rb_object);
+                         gc_marker);
+    rbg_gc_unguard_raw(gc_marker, RVAL2POINTER(rb_object));
 }
 
 void
 rbg_gc_marker_unguard_all(VALUE rb_gc_marker)
 {
-    GHashTable *rb_objects;
-
+    RBGGCMarker *gc_marker;
     TypedData_Get_Struct(rb_gc_marker,
-                         GHashTable,
+                         RBGGCMarker,
                          &rbg_gc_marker_type,
-                         rb_objects);
-    g_hash_table_remove_all(rb_objects);
+                         gc_marker);
+    rbg_gc_unguard_all_raw(gc_marker);
 }
 
 void
 Init_glib_gc(void)
 {
-    VALUE gc_marker;
-
-    rbg_objects = g_hash_table_new(g_direct_hash, g_direct_equal);
-    gc_marker = rbg_gc_marker_new_raw(rbg_objects);
+    VALUE gc_marker = rbg_gc_marker_new_raw();
     rb_ivar_set(mGLib, rb_intern("gc_marker"), gc_marker);
+    TypedData_Get_Struct(gc_marker,
+                         RBGGCMarker,
+                         &rbg_gc_marker_type,
+                         rbg_gc_marker_raw);
 }

data/ext/glib2/rbglib-variant-type.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2015-2016  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2015-2021  Ruby-GNOME Project Team
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public
@@ -303,14 +303,10 @@ Init_glib_variant_type(void)
         DEF_TYPE(DICT_ENTRY);
         DEF_TYPE(DICTIONARY);
         DEF_TYPE(STRING_ARRAY);
-#  if GLIB_CHECK_VERSION(2, 30, 0)
         DEF_TYPE(OBJECT_PATH_ARRAY);
-#  endif
         DEF_TYPE(BYTESTRING);
         DEF_TYPE(BYTESTRING_ARRAY);
-#  if GLIB_CHECK_VERSION(2, 30, 0)
         DEF_TYPE(VARDICT);
-#  endif
 
 #undef DEF_TYPE
     }