memory: add some performce debug info

Add some PERFORMANCE debug lines where we copy and do other suboptimal things.

diff --git a/gst/gstbuffer.c b/gst/gstbuffer.c
index d4e67a5d77b953831e797997c7bb894922e09f84..2ab9f6947c3be15a8e1cb17defaa5edbe6da6256 100644 (file)
--- a/gst/gstbuffer.c
+++ b/gst/gstbuffer.c
@@ -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
      * 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. */
+    GST_CAT_DEBUG (GST_CAT_PERFORMANCE, "memory array overflow in buffer %p",
+        buffer);
     _replace_memory (buffer, _span_memory (buffer, 0, -1, FALSE));
     /* we now have 1 single spanned buffer */
     len = 1;
@@ -973,6 +975,10 @@ gst_buffer_map (GstBuffer * buffer, GstMapInfo * info, GstMapFlags flags)
   /* if the buffer is writable, replace the memory */
   if (writable)
     _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;
 
@@ -995,7 +1001,6 @@ no_memory:
 cannot_map:
   {
     GST_DEBUG_OBJECT (buffer, "cannot map memory");
-    gst_memory_unref (mem);
     return FALSE;
   }
 }
@@ -1301,10 +1306,12 @@ _gst_buffer_arr_span (GstMemory ** mem[], gsize len[], guint n, gsize offset,
 
   if (!writable
       && _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);
-    else
+    } else {
       span = gst_memory_share (parent, offset + poffset, size);
+    }
   } else {
     gsize count, left;
     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);
         tocopy = MIN (sinfo.size, left);
         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);
           left -= tocopy;
           ptr += tocopy;

diff --git a/gst/gstmemory.c b/gst/gstmemory.c
index ec6a95f84db9a89178e41f435abbfc5f56420bbb..80598138b4de61403e3ec66e221088142b328a4c 100644 (file)
--- a/gst/gstmemory.c
+++ b/gst/gstmemory.c
@@ -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,
       size);
   memcpy (copy->data, mem->data, mem->mem.maxsize);
+  GST_CAT_DEBUG (GST_CAT_PERFORMANCE, "copy memory %p -> %p", mem, copy);
 
   return copy;
 }
@@ -295,6 +296,7 @@ _fallback_mem_copy (GstMemory * mem, gssize offset, gssize 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 (mem, &sinfo);