luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-09-20 01:06:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'gtype-use-sized-free' into 'main'

Browse Source 
Revert "gtype: Use the system allocator on UNIX" and use g_free_sized instead

See merge request GNOME/glib!3251
This commit is contained in:
Philip Withnall 2023-02-06 14:00:38 +00:00
commit bd8b756853
1 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gobject/gtype.c
View File

@ -1872,18 +1872,6 @@ maybe_issue_deprecation_warning (GType type)
name);
}
/* We use the system allocator on UNIX-y systems, where we know we have
* access to a decent allocator. On other systems, we fall back to the
* slice allocator, as we know its performance profile
*/
#ifdef G_OS_UNIX
# define instance_alloc(s) g_malloc0 ((s))
# define instance_free(s,p) g_free ((p))
#else
# define instance_alloc(s) g_slice_alloc0 ((s))
# define instance_free(s,p) g_slice_free1 ((s),(p))
#endif
/**
* g_type_create_instance: (skip)
* @type: an instantiatable type to create an instance for
@ -1964,7 +1952,7 @@ g_type_create_instance (GType type)
private_size += ALIGN_STRUCT (1);
/* Allocate one extra pointer size... */
allocated = instance_alloc (private_size + ivar_size + sizeof (gpointer));
allocated = g_malloc0 (private_size + ivar_size + sizeof (gpointer));
/* ... and point it back to the start of the private data. */
*(gpointer *) (allocated + private_size + ivar_size) = allocated + ALIGN_STRUCT (1);
@ -1974,7 +1962,7 @@ g_type_create_instance (GType type)
}
else
#endif
allocated = instance_alloc (private_size + ivar_size);
allocated = g_malloc0 (private_size + ivar_size);
instance = (GTypeInstance *) (allocated + private_size);
@ -2064,14 +2052,14 @@ g_type_free_instance (GTypeInstance *instance)
/* Clear out the extra pointer... */
*(gpointer *) (allocated + private_size + ivar_size) = NULL;
/* ... and ensure we include it in the size we free. */
instance_free (private_size + ivar_size + sizeof (gpointer), allocated);
g_free_sized (allocated, private_size + ivar_size + sizeof (gpointer));
VALGRIND_FREELIKE_BLOCK (allocated + ALIGN_STRUCT (1), 0);
VALGRIND_FREELIKE_BLOCK (instance, 0);
}
else
#endif
instance_free (private_size + ivar_size, allocated);
g_free_sized (allocated, private_size + ivar_size);
#ifdef G_ENABLE_DEBUG
IF_DEBUG (INSTANCE_COUNT)