mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-01-24 16:18:16 +00:00
remove GstMemChunk
Original commit message from CVS: remove GstMemChunk
This commit is contained in:
parent
88bb6309f6
commit
68f8c5e090
9 changed files with 25 additions and 43 deletions
16
ChangeLog
16
ChangeLog
|
@ -1,3 +1,19 @@
|
||||||
|
2005-05-16 Benjamin Otte <in7y118@public.uni-hamburg.de>
|
||||||
|
|
||||||
|
* gst/gsttrashstack.[ch]:
|
||||||
|
* gst/gstmemchunk.[ch]:
|
||||||
|
remove these
|
||||||
|
* gst/Makefile.am:
|
||||||
|
* gst/gstbuffer.c: (_gst_buffer_initialize),
|
||||||
|
(gst_buffer_alloc_chunk), (gst_buffer_free_chunk):
|
||||||
|
* gst/gstclock.c: (gst_clock_entry_new), (gst_clock_id_free),
|
||||||
|
(gst_clock_class_init):
|
||||||
|
* gst/gstevent.c: (_gst_event_initialize), (_gst_event_copy),
|
||||||
|
(_gst_event_free), (gst_event_new):
|
||||||
|
* testsuite/elements/struct_i386.h:
|
||||||
|
* testsuite/elements/struct_size.c:
|
||||||
|
remove all references to GstMemChunk
|
||||||
|
|
||||||
2005-05-16 Benjamin Otte <in7y118@public.uni-hamburg.de>
|
2005-05-16 Benjamin Otte <in7y118@public.uni-hamburg.de>
|
||||||
|
|
||||||
* configure.ac:
|
* configure.ac:
|
||||||
|
|
|
@ -98,7 +98,6 @@ libgstreamer_@GST_MAJORMINOR@_la_SOURCES = \
|
||||||
$(GST_INDEX_SRC) \
|
$(GST_INDEX_SRC) \
|
||||||
gstinfo.c \
|
gstinfo.c \
|
||||||
gstinterface.c \
|
gstinterface.c \
|
||||||
gstmemchunk.c \
|
|
||||||
gstpad.c \
|
gstpad.c \
|
||||||
gstchildproxy.c \
|
gstchildproxy.c \
|
||||||
gstpipeline.c \
|
gstpipeline.c \
|
||||||
|
@ -114,7 +113,6 @@ libgstreamer_@GST_MAJORMINOR@_la_SOURCES = \
|
||||||
gsttaginterface.c \
|
gsttaginterface.c \
|
||||||
gstthread.c \
|
gstthread.c \
|
||||||
$(GST_TRACE_SRC) \
|
$(GST_TRACE_SRC) \
|
||||||
gsttrashstack.c \
|
|
||||||
gsttypefind.c \
|
gsttypefind.c \
|
||||||
$(GST_URI_SRC) \
|
$(GST_URI_SRC) \
|
||||||
gsturitype.c \
|
gsturitype.c \
|
||||||
|
@ -173,7 +171,6 @@ gst_headers = \
|
||||||
gstinfo.h \
|
gstinfo.h \
|
||||||
gstinterface.h \
|
gstinterface.h \
|
||||||
gstmacros.h \
|
gstmacros.h \
|
||||||
gstmemchunk.h \
|
|
||||||
gstpad.h \
|
gstpad.h \
|
||||||
gstchildproxy.h \
|
gstchildproxy.h \
|
||||||
gstpipeline.h \
|
gstpipeline.h \
|
||||||
|
@ -189,7 +186,6 @@ gst_headers = \
|
||||||
gsttaginterface.h \
|
gsttaginterface.h \
|
||||||
gstthread.h \
|
gstthread.h \
|
||||||
gsttrace.h \
|
gsttrace.h \
|
||||||
gsttrashstack.h \
|
|
||||||
gsttypefind.h \
|
gsttypefind.h \
|
||||||
gsttypes.h \
|
gsttypes.h \
|
||||||
gsturi.h \
|
gsturi.h \
|
||||||
|
|
|
@ -25,7 +25,6 @@
|
||||||
#include "gstatomic_impl.h"
|
#include "gstatomic_impl.h"
|
||||||
#include "gstdata_private.h"
|
#include "gstdata_private.h"
|
||||||
#include "gstbuffer.h"
|
#include "gstbuffer.h"
|
||||||
#include "gstmemchunk.h"
|
|
||||||
#include "gstinfo.h"
|
#include "gstinfo.h"
|
||||||
|
|
||||||
GType _gst_buffer_type;
|
GType _gst_buffer_type;
|
||||||
|
@ -37,8 +36,6 @@ GType _gst_buffer_type;
|
||||||
static GstAllocTrace *_gst_buffer_trace;
|
static GstAllocTrace *_gst_buffer_trace;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static GstMemChunk *chunk;
|
|
||||||
|
|
||||||
static GstBuffer *gst_buffer_alloc_chunk (void);
|
static GstBuffer *gst_buffer_alloc_chunk (void);
|
||||||
static void gst_buffer_free_chunk (GstBuffer * buffer);
|
static void gst_buffer_free_chunk (GstBuffer * buffer);
|
||||||
|
|
||||||
|
@ -51,9 +48,6 @@ _gst_buffer_initialize (void)
|
||||||
_gst_buffer_trace = gst_alloc_trace_register (GST_BUFFER_TRACE_NAME);
|
_gst_buffer_trace = gst_alloc_trace_register (GST_BUFFER_TRACE_NAME);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
chunk = gst_mem_chunk_new ("GstBufferChunk", sizeof (GstBuffer),
|
|
||||||
sizeof (GstBuffer) * 200, 0);
|
|
||||||
|
|
||||||
GST_CAT_LOG (GST_CAT_BUFFER, "Buffers are initialized now");
|
GST_CAT_LOG (GST_CAT_BUFFER, "Buffers are initialized now");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -177,7 +171,7 @@ gst_buffer_alloc_chunk (void)
|
||||||
{
|
{
|
||||||
GstBuffer *newbuf;
|
GstBuffer *newbuf;
|
||||||
|
|
||||||
newbuf = gst_mem_chunk_alloc (chunk);
|
newbuf = g_new (GstBuffer, 1);
|
||||||
#ifndef GST_DISABLE_TRACE
|
#ifndef GST_DISABLE_TRACE
|
||||||
gst_alloc_trace_new (_gst_buffer_trace, newbuf);
|
gst_alloc_trace_new (_gst_buffer_trace, newbuf);
|
||||||
#endif
|
#endif
|
||||||
|
@ -188,7 +182,7 @@ gst_buffer_alloc_chunk (void)
|
||||||
static void
|
static void
|
||||||
gst_buffer_free_chunk (GstBuffer * buffer)
|
gst_buffer_free_chunk (GstBuffer * buffer)
|
||||||
{
|
{
|
||||||
gst_mem_chunk_free (chunk, GST_DATA (buffer));
|
g_free (buffer);
|
||||||
#ifndef GST_DISABLE_TRACE
|
#ifndef GST_DISABLE_TRACE
|
||||||
gst_alloc_trace_free (_gst_buffer_trace, buffer);
|
gst_alloc_trace_free (_gst_buffer_trace, buffer);
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -26,7 +26,6 @@
|
||||||
|
|
||||||
#include "gstclock.h"
|
#include "gstclock.h"
|
||||||
#include "gstinfo.h"
|
#include "gstinfo.h"
|
||||||
#include "gstmemchunk.h"
|
|
||||||
|
|
||||||
#ifndef GST_DISABLE_TRACE
|
#ifndef GST_DISABLE_TRACE
|
||||||
/* #define GST_WITH_ALLOC_TRACE */
|
/* #define GST_WITH_ALLOC_TRACE */
|
||||||
|
@ -45,8 +44,6 @@ enum
|
||||||
ARG_EVENT_DIFF
|
ARG_EVENT_DIFF
|
||||||
};
|
};
|
||||||
|
|
||||||
static GstMemChunk *_gst_clock_entries_chunk;
|
|
||||||
|
|
||||||
void gst_clock_id_unlock (GstClockID id);
|
void gst_clock_id_unlock (GstClockID id);
|
||||||
|
|
||||||
|
|
||||||
|
@ -71,7 +68,7 @@ gst_clock_entry_new (GstClock * clock, GstClockTime time,
|
||||||
{
|
{
|
||||||
GstClockEntry *entry;
|
GstClockEntry *entry;
|
||||||
|
|
||||||
entry = gst_mem_chunk_alloc (_gst_clock_entries_chunk);
|
entry = g_new (GstClockEntry, 1);
|
||||||
#ifndef GST_DISABLE_TRACE
|
#ifndef GST_DISABLE_TRACE
|
||||||
gst_alloc_trace_new (_gst_clock_entry_trace, entry);
|
gst_alloc_trace_new (_gst_clock_entry_trace, entry);
|
||||||
#endif
|
#endif
|
||||||
|
@ -298,7 +295,7 @@ gst_clock_id_free (GstClockID id)
|
||||||
#ifndef GST_DISABLE_TRACE
|
#ifndef GST_DISABLE_TRACE
|
||||||
gst_alloc_trace_free (_gst_clock_entry_trace, id);
|
gst_alloc_trace_free (_gst_clock_entry_trace, id);
|
||||||
#endif
|
#endif
|
||||||
gst_mem_chunk_free (_gst_clock_entries_chunk, id);
|
g_free (id);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -368,9 +365,6 @@ gst_clock_class_init (GstClockClass * klass)
|
||||||
if (!g_thread_supported ())
|
if (!g_thread_supported ())
|
||||||
g_thread_init (NULL);
|
g_thread_init (NULL);
|
||||||
|
|
||||||
_gst_clock_entries_chunk = gst_mem_chunk_new ("GstClockEntries",
|
|
||||||
sizeof (GstClockEntry), sizeof (GstClockEntry) * 32, G_ALLOC_AND_FREE);
|
|
||||||
|
|
||||||
#ifndef GST_DISABLE_TRACE
|
#ifndef GST_DISABLE_TRACE
|
||||||
_gst_clock_entry_trace =
|
_gst_clock_entry_trace =
|
||||||
gst_alloc_trace_register (GST_CLOCK_ENTRY_TRACE_NAME);
|
gst_alloc_trace_register (GST_CLOCK_ENTRY_TRACE_NAME);
|
||||||
|
|
|
@ -27,7 +27,6 @@
|
||||||
|
|
||||||
#include "gstclock.h"
|
#include "gstclock.h"
|
||||||
#include "gstinfo.h"
|
#include "gstinfo.h"
|
||||||
#include "gstmemchunk.h"
|
|
||||||
#include "gstevent.h"
|
#include "gstevent.h"
|
||||||
#include "gsttag.h"
|
#include "gsttag.h"
|
||||||
|
|
||||||
|
@ -37,10 +36,6 @@
|
||||||
static GstAllocTrace *_event_trace;
|
static GstAllocTrace *_event_trace;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static GstMemChunk *chunk;
|
|
||||||
|
|
||||||
/* #define MEMPROF */
|
|
||||||
|
|
||||||
GType _gst_event_type;
|
GType _gst_event_type;
|
||||||
|
|
||||||
void
|
void
|
||||||
|
@ -52,9 +47,6 @@ _gst_event_initialize (void)
|
||||||
#ifndef GST_DISABLE_TRACE
|
#ifndef GST_DISABLE_TRACE
|
||||||
_event_trace = gst_alloc_trace_register (GST_EVENT_TRACE_NAME);
|
_event_trace = gst_alloc_trace_register (GST_EVENT_TRACE_NAME);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
chunk = gst_mem_chunk_new ("GstEventChunk", sizeof (GstEvent),
|
|
||||||
sizeof (GstEvent) * 50, 0);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static GstEvent *
|
static GstEvent *
|
||||||
|
@ -62,7 +54,7 @@ _gst_event_copy (GstEvent * event)
|
||||||
{
|
{
|
||||||
GstEvent *copy;
|
GstEvent *copy;
|
||||||
|
|
||||||
copy = gst_mem_chunk_alloc (chunk);
|
copy = g_new (GstEvent, 1);
|
||||||
#ifndef GST_DISABLE_TRACE
|
#ifndef GST_DISABLE_TRACE
|
||||||
gst_alloc_trace_new (_event_trace, copy);
|
gst_alloc_trace_new (_event_trace, copy);
|
||||||
#endif
|
#endif
|
||||||
|
@ -116,7 +108,7 @@ _gst_event_free (GstEvent * event)
|
||||||
#ifndef GST_DISABLE_TRACE
|
#ifndef GST_DISABLE_TRACE
|
||||||
gst_alloc_trace_free (_event_trace, event);
|
gst_alloc_trace_free (_event_trace, event);
|
||||||
#endif
|
#endif
|
||||||
gst_mem_chunk_free (chunk, event);
|
g_free (event);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -171,7 +163,7 @@ gst_event_new (GstEventType type)
|
||||||
{
|
{
|
||||||
GstEvent *event;
|
GstEvent *event;
|
||||||
|
|
||||||
event = gst_mem_chunk_alloc0 (chunk);
|
event = g_new0 (GstEvent, 1);
|
||||||
#ifndef GST_DISABLE_TRACE
|
#ifndef GST_DISABLE_TRACE
|
||||||
gst_alloc_trace_new (_event_trace, event);
|
gst_alloc_trace_new (_event_trace, event);
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -102,10 +102,6 @@ Struct list[] = {
|
||||||
,
|
,
|
||||||
{"GstAllocTrace", sizeof (GstAllocTrace), 16}
|
{"GstAllocTrace", sizeof (GstAllocTrace), 16}
|
||||||
,
|
,
|
||||||
{"GstTrashStack", sizeof (GstTrashStack), 12}
|
|
||||||
,
|
|
||||||
{"GstTrashStackElement", sizeof (GstTrashStackElement), 4}
|
|
||||||
,
|
|
||||||
{"GstTypeFind", sizeof (GstTypeFind), 32}
|
{"GstTypeFind", sizeof (GstTypeFind), 32}
|
||||||
,
|
,
|
||||||
{"GstTypeFindFactory", sizeof (GstTypeFindFactory), 72}
|
{"GstTypeFindFactory", sizeof (GstTypeFindFactory), 72}
|
||||||
|
|
|
@ -5,7 +5,6 @@
|
||||||
|
|
||||||
#include <gst/gst.h>
|
#include <gst/gst.h>
|
||||||
#include <gst/gstqueue.h>
|
#include <gst/gstqueue.h>
|
||||||
#include <gst/gsttrashstack.h>
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
||||||
typedef struct
|
typedef struct
|
||||||
|
@ -16,7 +15,7 @@ typedef struct
|
||||||
}
|
}
|
||||||
Struct;
|
Struct;
|
||||||
|
|
||||||
#ifdef HAVE_CPU_I386
|
#if 0
|
||||||
#include "struct_i386.h"
|
#include "struct_i386.h"
|
||||||
#define HAVE_ABI_SIZES
|
#define HAVE_ABI_SIZES
|
||||||
#else
|
#else
|
||||||
|
|
|
@ -102,10 +102,6 @@ Struct list[] = {
|
||||||
,
|
,
|
||||||
{"GstAllocTrace", sizeof (GstAllocTrace), 16}
|
{"GstAllocTrace", sizeof (GstAllocTrace), 16}
|
||||||
,
|
,
|
||||||
{"GstTrashStack", sizeof (GstTrashStack), 12}
|
|
||||||
,
|
|
||||||
{"GstTrashStackElement", sizeof (GstTrashStackElement), 4}
|
|
||||||
,
|
|
||||||
{"GstTypeFind", sizeof (GstTypeFind), 32}
|
{"GstTypeFind", sizeof (GstTypeFind), 32}
|
||||||
,
|
,
|
||||||
{"GstTypeFindFactory", sizeof (GstTypeFindFactory), 72}
|
{"GstTypeFindFactory", sizeof (GstTypeFindFactory), 72}
|
||||||
|
|
|
@ -5,7 +5,6 @@
|
||||||
|
|
||||||
#include <gst/gst.h>
|
#include <gst/gst.h>
|
||||||
#include <gst/gstqueue.h>
|
#include <gst/gstqueue.h>
|
||||||
#include <gst/gsttrashstack.h>
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
||||||
typedef struct
|
typedef struct
|
||||||
|
@ -16,7 +15,7 @@ typedef struct
|
||||||
}
|
}
|
||||||
Struct;
|
Struct;
|
||||||
|
|
||||||
#ifdef HAVE_CPU_I386
|
#if 0
|
||||||
#include "struct_i386.h"
|
#include "struct_i386.h"
|
||||||
#define HAVE_ABI_SIZES
|
#define HAVE_ABI_SIZES
|
||||||
#else
|
#else
|
||||||
|
|
Loading…
Reference in a new issue