[pulseaudio-commits] r1543 - /branches/lennart/src/pulsecore/memblock.c

[svnmailer-noreply at 0pointer.de]

Author: lennart
Date: Thu Jul 26 15:20:11 2007
New Revision: 1543

URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=3D1543&root=3Dpulseaudio&vi=
ew=3Drev
Log:
reverse order flist destruction and mempool allocation warning

Modified:
    branches/lennart/src/pulsecore/memblock.c

Modified: branches/lennart/src/pulsecore/memblock.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/lennart/src/pulsecore/=
memblock.c?rev=3D1543&root=3Dpulseaudio&r1=3D1542&r2=3D1543&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/lennart/src/pulsecore/memblock.c (original)
+++ branches/lennart/src/pulsecore/memblock.c Thu Jul 26 15:20:11 2007
@@ -669,12 +669,13 @@
 =

     pa_mutex_unlock(p->mutex);
 =

+    pa_flist_free(p->free_slots, NULL);
+
     if (pa_atomic_load(&p->stat.n_allocated) > 0) {
 /*         raise(SIGTRAP);  */
         pa_log_warn("WARNING! Memory pool destroyed but not all memory blo=
cks freed! %u remain.", pa_atomic_load(&p->stat.n_allocated));
     }
 =

-    pa_flist_free(p->free_slots, NULL);
     pa_shm_free(&p->memory);
 =

     pa_mutex_free(p->mutex);