mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-29 05:01:23 +00:00
Code Issues 1 Projects Releases Wiki Activity

memory: add some performce debug info

Browse source 
Add some PERFORMANCE debug lines where we copy and do other suboptimal things.
This commit is contained in:
Wim Taymans 2012-02-02 12:07:28 +01:00
parent d54fbe677f
commit d8c12ceb2b
2 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
gst/gstbuffer.c
View file

@ -197,6 +197,8 @@ _memory_add (GstBuffer * buffer, guint idx, GstMemory * mem)
/* FIXME, there is room for improvement here: We could only try to merge /* FIXME, there is room for improvement here: We could only try to merge
* 2 buffers to make some room. If we can't efficiently merge 2 buffers we * 2 buffers to make some room. If we can't efficiently merge 2 buffers we
* could try to only merge the two smallest buffers to avoid memcpy, etc. */ * could try to only merge the two smallest buffers to avoid memcpy, etc. */
GST_CAT_DEBUG (GST_CAT_PERFORMANCE, "memory array overflow in buffer %p",
buffer);
_replace_memory (buffer, _span_memory (buffer, 0, -1, FALSE)); _replace_memory (buffer, _span_memory (buffer, 0, -1, FALSE));
/* we now have 1 single spanned buffer */ /* we now have 1 single spanned buffer */
len = 1; len = 1;
@ -973,6 +975,10 @@ gst_buffer_map (GstBuffer * buffer, GstMapInfo * info, GstMapFlags flags)
/* if the buffer is writable, replace the memory */ /* if the buffer is writable, replace the memory */
if (writable) if (writable)
_replace_memory (buffer, gst_memory_ref (mem)); _replace_memory (buffer, gst_memory_ref (mem));
else if (GST_BUFFER_MEM_LEN (buffer) > 1) {
GST_CAT_DEBUG (GST_CAT_PERFORMANCE,
"temporary mapping for memory %p in buffer %p", mem, buffer);
}
return TRUE; return TRUE;
@ -995,7 +1001,6 @@ no_memory:
cannot_map: cannot_map:
{ {
GST_DEBUG_OBJECT (buffer, "cannot map memory"); GST_DEBUG_OBJECT (buffer, "cannot map memory");
gst_memory_unref (mem);
return FALSE; return FALSE;
} }
} }
@ -1301,10 +1306,12 @@ _gst_buffer_arr_span (GstMemory ** mem[], gsize len[], guint n, gsize offset,
if (!writable if (!writable
&& _gst_buffer_arr_is_span_fast (mem, len, n, &poffset, &parent)) { && _gst_buffer_arr_is_span_fast (mem, len, n, &poffset, &parent)) {
if (parent->flags & GST_MEMORY_FLAG_NO_SHARE) if (parent->flags & GST_MEMORY_FLAG_NO_SHARE) {
GST_CAT_DEBUG (GST_CAT_PERFORMANCE, "copy for span %p", parent);
span = gst_memory_copy (parent, offset + poffset, size); span = gst_memory_copy (parent, offset + poffset, size);
else } else {
span = gst_memory_share (parent, offset + poffset, size); span = gst_memory_share (parent, offset + poffset, size);
}
} else { } else {
gsize count, left; gsize count, left;
GstMapInfo dinfo; GstMapInfo dinfo;
@ -1328,6 +1335,8 @@ _gst_buffer_arr_span (GstMemory ** mem[], gsize len[], guint n, gsize offset,
gst_memory_map (cmem[i], &sinfo, GST_MAP_READ); gst_memory_map (cmem[i], &sinfo, GST_MAP_READ);
tocopy = MIN (sinfo.size, left); tocopy = MIN (sinfo.size, left);
if (tocopy > offset) { if (tocopy > offset) {
GST_CAT_DEBUG (GST_CAT_PERFORMANCE,
"memcpy for span %p from memory %p", span, cmem[i]);
memcpy (ptr, (guint8 *) sinfo.data + offset, tocopy - offset); memcpy (ptr, (guint8 *) sinfo.data + offset, tocopy - offset);
left -= tocopy; left -= tocopy;
ptr += tocopy; ptr += tocopy;

2
gst/gstmemory.c
View file

@ -232,6 +232,7 @@ _default_mem_copy (GstMemoryDefault * mem, gssize offset, gsize size)
_default_mem_new_block (mem->mem.maxsize, 0, mem->mem.offset + offset, _default_mem_new_block (mem->mem.maxsize, 0, mem->mem.offset + offset,
size); size);
memcpy (copy->data, mem->data, mem->mem.maxsize); memcpy (copy->data, mem->data, mem->mem.maxsize);
GST_CAT_DEBUG (GST_CAT_PERFORMANCE, "copy memory %p -> %p", mem, copy);
return copy; return copy;
} }
@ -295,6 +296,7 @@ _fallback_mem_copy (GstMemory * mem, gssize offset, gssize size)
} }
memcpy (dinfo.data, sinfo.data + offset, size); memcpy (dinfo.data, sinfo.data + offset, size);
GST_CAT_DEBUG (GST_CAT_PERFORMANCE, "copy memory %p -> %p", mem, copy);
gst_memory_unmap (copy, &dinfo); gst_memory_unmap (copy, &dinfo);
gst_memory_unmap (mem, &sinfo); gst_memory_unmap (mem, &sinfo);