[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[275] mplayerxp

[<nic...@us...>]

Revision: 275
          http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=275&view=rev
Author:   nickols_k
Date:     2012-11-01 16:13:56 +0000 (Thu, 01 Nov 2012)
Log Message:
-----------
remove mp_malloc's statistics because malloc_backtrace is precisiongly! TODO: rewrite demuxer: it lose 40 bytes per every packet

Modified Paths:
--------------
    mplayerxp/mplayer.c
    mplayerxp/osdep/mp_malloc.c
    mplayerxp/osdep/mplib.h

Modified: mplayerxp/mplayer.c
===================================================================
--- mplayerxp/mplayer.c	2012-11-01 15:53:52 UTC (rev 274)
+++ mplayerxp/mplayer.c	2012-11-01 16:13:56 UTC (rev 275)
@@ -238,7 +238,7 @@
     if(ao_data) mp_free(ao_data);
     mp_data=NULL;
     xmp_uninit();
-    mp_uninit_malloc(1);
+    mp_uninit_malloc(mp_conf.verbose);
 }
 
 /************************************************************************

Modified: mplayerxp/osdep/mp_malloc.c
===================================================================
--- mplayerxp/osdep/mp_malloc.c	2012-11-01 15:53:52 UTC (rev 274)
+++ mplayerxp/osdep/mp_malloc.c	2012-11-01 16:13:56 UTC (rev 275)
@@ -25,13 +25,9 @@
     unsigned			rnd_limit;
     unsigned			every_nth_call;
     enum mp_malloc_e		flags;
-    // statistics
+    /* for randomizer */
     unsigned long long int	total_calls;
-    unsigned long long int	num_allocs;
-    // local statistics
-    int				enable_stat;
-    unsigned long long int	stat_total_calls;
-    unsigned long long int	stat_num_allocs;
+    /* backtrace and protector slots */
     mp_slot_t*			slots;
     size_t			nslots;
 }priv_t;
@@ -238,13 +234,11 @@
 void	mp_uninit_malloc(int verbose)
 {
     if(priv->flags&MPA_FLG_BACKTRACE) {
-	if(priv->nslots)
+	if(priv->nslots) {
 	    MSG_WARN("Warning! %lli slots were not freed\n",priv->nslots);
-    } else {
-	if(priv->num_allocs && verbose)
-	    MSG_WARN("Warning! From %lli total calls of alloc() were not freed %lli buffers\n",priv->total_calls,priv->num_allocs);
+	    if(verbose) bt_print_slots();
+	}
     }
-    if(priv->flags&MPA_FLG_BACKTRACE && verbose) bt_print_slots();
     free(priv);
     priv=NULL;
 }
@@ -263,11 +257,6 @@
     else							rb=malloc(__size);
     if(rnd_buff) free(rnd_buff);
     priv->total_calls++;
-    priv->num_allocs++;
-    if(priv->enable_stat) {
-	priv->stat_total_calls++;
-	priv->stat_num_allocs++;
-    }
     return rb;
 }
 
@@ -279,12 +268,6 @@
     if(priv->flags&(MPA_FLG_BOUNDS_CHECK|MPA_FLG_BEFORE_CHECK)) rb=prot_memalign(boundary,__size);
     else if(priv->flags&MPA_FLG_BACKTRACE)			rb=bt_memalign(boundary,__size);
     else							rb=memalign(boundary,__size);
-    priv->total_calls++;
-    priv->num_allocs++;
-    if(priv->enable_stat) {
-	priv->stat_total_calls++;
-	priv->stat_num_allocs++;
-    }
     return rb;
 }
 
@@ -300,11 +283,12 @@
 {
     if(!priv) mp_init_malloc(1000,10,MPA_FLG_RANDOMIZER);
     if(__ptr) {
-	if(priv->flags&(MPA_FLG_BOUNDS_CHECK|MPA_FLG_BEFORE_CHECK)) prot_free(__ptr);
-	else if(priv->flags&MPA_FLG_BACKTRACE)			bt_free(__ptr);
-	else							free(__ptr);
-	priv->num_allocs--;
-	if(priv->enable_stat) priv->stat_num_allocs--;
+	if(priv->flags&(MPA_FLG_BOUNDS_CHECK|MPA_FLG_BEFORE_CHECK))
+	    prot_free(__ptr);
+	else if(priv->flags&MPA_FLG_BACKTRACE)
+	    bt_free(__ptr);
+	else
+	    free(__ptr);
     }
 }
 
@@ -327,22 +311,6 @@
     return rs;
 }
 
-void	__FASTCALL__ mp_open_malloc_stat(void) {
-    if(!priv) mp_init_malloc(1000,10,MPA_FLG_RANDOMIZER);
-    priv->enable_stat=1;
-    priv->stat_total_calls=priv->stat_num_allocs=0ULL;
-}
-
-unsigned long long __FASTCALL__ mp_close_malloc_stat(int verbose) {
-    if(!priv) mp_init_malloc(1000,10,MPA_FLG_RANDOMIZER);
-    priv->enable_stat=0;
-    if(verbose)
-	MSG_INFO("mp_malloc stat: from %lli total calls of alloc() were not freed %lli buffers\n"
-	,priv->stat_total_calls
-	,priv->stat_num_allocs);
-    return priv->stat_num_allocs;
-}
-
 int __FASTCALL__ mp_mprotect(const any_t* addr,size_t len,enum mp_prot_e flags)
 {
     return mprotect(addr,len,flags);

Modified: mplayerxp/osdep/mplib.h
===================================================================
--- mplayerxp/osdep/mplib.h	2012-11-01 15:53:52 UTC (rev 274)
+++ mplayerxp/osdep/mplib.h	2012-11-01 16:13:56 UTC (rev 275)
@@ -45,9 +45,6 @@
 extern void	__FASTCALL__ mp_init_malloc(unsigned rnd_limit,unsigned every_nth_call,enum mp_malloc_e flags);
 extern void	__FASTCALL__ mp_uninit_malloc(int verbose);
 
-extern void	__FASTCALL__ mp_open_malloc_stat(void);
-extern unsigned long long __FASTCALL__ mp_close_malloc_stat(int verbose);
-
 extern any_t*	__FASTCALL__ mp_malloc(size_t __size);
 extern any_t*	__FASTCALL__ mp_mallocz(size_t __size);
 extern any_t*	__FASTCALL__ mp_realloc(any_t*__ptr, size_t __size);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.