mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-26 19:51:11 +00:00
Code Issues 1 Projects Releases Wiki Activity

Added g_malloc instead of a memchunk when using memprof

Browse source 
Original commit message from CVS:
Added g_malloc instead of a memchunk when using memprof
This commit is contained in:
Wim Taymans 2002-05-26 21:22:50 +00:00
parent 4aaca5cc34
commit 692b076459
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
gst/gstbuffer.c
View file

@ -26,6 +26,7 @@
#include "gstbuffer.h" #include "gstbuffer.h"
/* #define MEMPROF */
GType _gst_buffer_type; GType _gst_buffer_type;
@ -88,7 +89,11 @@ gst_buffer_new (void)
GstBuffer *buffer; GstBuffer *buffer;
g_mutex_lock (_gst_buffer_chunk_lock); g_mutex_lock (_gst_buffer_chunk_lock);
#ifdef MEMPROF
buffer = g_new0 (GstBuffer, 1);
#else
buffer = g_mem_chunk_alloc (_gst_buffer_chunk); buffer = g_mem_chunk_alloc (_gst_buffer_chunk);
#endif
_gst_buffer_live++; _gst_buffer_live++;
g_mutex_unlock (_gst_buffer_chunk_lock); g_mutex_unlock (_gst_buffer_chunk_lock);
GST_INFO (GST_CAT_BUFFER,"creating new buffer %p",buffer); GST_INFO (GST_CAT_BUFFER,"creating new buffer %p",buffer);
@ -169,7 +174,11 @@ gst_buffer_create_sub (GstBuffer *parent,
g_return_val_if_fail ((offset+size) <= parent->size, NULL); g_return_val_if_fail ((offset+size) <= parent->size, NULL);
g_mutex_lock (_gst_buffer_chunk_lock); g_mutex_lock (_gst_buffer_chunk_lock);
#ifdef MEMPROF
buffer = g_new0 (GstBuffer, 1);
#else
buffer = g_mem_chunk_alloc (_gst_buffer_chunk); buffer = g_mem_chunk_alloc (_gst_buffer_chunk);
#endif
_gst_buffer_live++; _gst_buffer_live++;
g_mutex_unlock (_gst_buffer_chunk_lock); g_mutex_unlock (_gst_buffer_chunk_lock);
GST_INFO (GST_CAT_BUFFER,"creating new subbuffer %p from parent %p (size %u, offset %u)", GST_INFO (GST_CAT_BUFFER,"creating new subbuffer %p from parent %p (size %u, offset %u)",
@ -314,7 +323,11 @@ gst_buffer_destroy (GstBuffer *buffer)
/* remove it entirely from memory */ /* remove it entirely from memory */
g_mutex_lock (_gst_buffer_chunk_lock); g_mutex_lock (_gst_buffer_chunk_lock);
#ifdef MEMPROF
g_free (buffer);
#else
g_mem_chunk_free (_gst_buffer_chunk,buffer); g_mem_chunk_free (_gst_buffer_chunk,buffer);
#endif
_gst_buffer_live--; _gst_buffer_live--;
g_mutex_unlock (_gst_buffer_chunk_lock); g_mutex_unlock (_gst_buffer_chunk_lock);
} }

1
gst/gstbuffer.h
View file

@ -84,7 +84,6 @@ typedef enum {
GST_BUFFER_READONLY, GST_BUFFER_READONLY,
GST_BUFFER_ORIGINAL, GST_BUFFER_ORIGINAL,
GST_BUFFER_DONTFREE, GST_BUFFER_DONTFREE,
} GstBufferFlag; } GstBufferFlag;