[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[274] mplayerxp
Brought to you by:
olov
Menu
▾
▴
[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[274] mplayerxp
|
From: <nic...@us...> - 2012-11-01 15:53:59
|
Revision: 274
http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=274&view=rev
Author: nickols_k
Date: 2012-11-01 15:53:52 +0000 (Thu, 01 Nov 2012)
Log Message:
-----------
cleanups and few memory leaks--
Modified Paths:
--------------
mplayerxp/libmpconf/codec-cfg.c
mplayerxp/libmpconf/codec-cfg.h
mplayerxp/mplayer.c
mplayerxp/osdep/mp_malloc.c
mplayerxp/xmp_core.c
Modified: mplayerxp/libmpconf/codec-cfg.c
===================================================================
--- mplayerxp/libmpconf/codec-cfg.c 2012-11-01 14:02:30 UTC (rev 273)
+++ mplayerxp/libmpconf/codec-cfg.c 2012-11-01 15:53:52 UTC (rev 274)
@@ -389,6 +389,11 @@
static int nr_vcodecs = 0;
static int nr_acodecs = 0;
+void free_codec_cfg(void) {
+ if(video_codecs) mp_free(video_codecs);
+ if(audio_codecs) mp_free(audio_codecs);
+}
+
int parse_codec_cfg(const char *cfgfile)
{
codecs_t *codec = NULL; // current codec
Modified: mplayerxp/libmpconf/codec-cfg.h
===================================================================
--- mplayerxp/libmpconf/codec-cfg.h 2012-11-01 14:02:30 UTC (rev 273)
+++ mplayerxp/libmpconf/codec-cfg.h 2012-11-01 15:53:52 UTC (rev 274)
@@ -61,5 +61,5 @@
extern codecs_t* find_codec(unsigned int fourcc,unsigned int *fourccmap,const codecs_t *start,int audioflag);
extern void list_codecs(int audioflag);
extern void codecs_reset_selection(int audioflag);
-
+extern void free_codec_cfg(void);
#endif
Modified: mplayerxp/mplayer.c
===================================================================
--- mplayerxp/mplayer.c 2012-11-01 14:02:30 UTC (rev 273)
+++ mplayerxp/mplayer.c 2012-11-01 15:53:52 UTC (rev 274)
@@ -230,9 +230,12 @@
}
static void mpxp_uninit_structs(void) {
+ free_codec_cfg();
mp_free(mp_data->bench);
mp_free(mp_data->priv);
mp_free(mp_data);
+ if(vo_data) mp_free(vo_data);
+ if(ao_data) mp_free(ao_data);
mp_data=NULL;
xmp_uninit();
mp_uninit_malloc(1);
@@ -640,6 +643,7 @@
priv->inited_flags&=~INITED_VO;
MP_UNIT("uninit_vo");
vo_uninit(vo_data);
+ vo_data=NULL;
}
if(mask&INITED_ACODEC){
@@ -653,6 +657,7 @@
priv->inited_flags&=~INITED_AO;
MP_UNIT("uninit_ao");
ao_uninit(ao_data);
+ ao_data=NULL;
}
if(mask&INITED_GETCH2){
Modified: mplayerxp/osdep/mp_malloc.c
===================================================================
--- mplayerxp/osdep/mp_malloc.c 2012-11-01 14:02:30 UTC (rev 273)
+++ mplayerxp/osdep/mp_malloc.c 2012-11-01 15:53:52 UTC (rev 274)
@@ -3,6 +3,7 @@
#define MSGT_CLASS MSGT_OSDEP
#include "mp_msg.h"
+#include <ctype.h>
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
@@ -83,9 +84,9 @@
size_t idx=prot_find_slot_idx(ptr);
if(idx!=UINT_MAX) {
memmove(&priv->slots[idx],&priv->slots[idx+1],sizeof(mp_slot_t)*(priv->nslots-(idx+1)));
- priv->slots=realloc(priv->slots,sizeof(mp_slot_t)*(priv->nslots-1));
priv->nslots--;
- }
+ priv->slots=realloc(priv->slots,sizeof(mp_slot_t)*priv->nslots);
+ } else printf("Internal error! Can't find slot for address: %p\n",ptr);
}
static any_t* __prot_malloc(size_t size) {
@@ -101,6 +102,8 @@
return rp;
}
+static any_t* __prot_memalign(size_t boundary,size_t size) { UNUSED(boundary); return __prot_malloc(size); }
+
static void __prot_free(any_t*ptr) {
any_t *page_ptr=prot_page_align(ptr);
free(page_ptr);
@@ -137,6 +140,12 @@
return rp;
}
+static any_t* prot_memalign(size_t boundary,size_t size) {
+ any_t* rp;
+ rp=__prot_memalign(boundary,size);
+ return rp;
+}
+
static any_t* prot_realloc(any_t*ptr,size_t size) {
any_t* rp;
rp=__prot_realloc(ptr,size);
@@ -158,15 +167,36 @@
return rp;
}
+static __always_inline any_t* bt_memalign(size_t boundary,size_t size) {
+ any_t*rp;
+ mp_slot_t* slot;
+ rp=memalign(boundary,size);
+ if(rp) {
+ slot=prot_append_slot(rp,size);
+ slot->ncalls=backtrace(slot->calls,10);
+ }
+ return rp;
+}
+
static __always_inline any_t* bt_realloc(any_t*ptr,size_t size) {
- return realloc(ptr,size);
+ any_t* rp;
+ mp_slot_t* slot;
+ if(!ptr) return bt_malloc(size);
+ rp=realloc(ptr,size);
+ if(rp) {
+ slot=prot_find_slot(ptr);
+ if(!slot) MSG_WARN("Internal error! Can't find slot for address: %p\n",ptr);
+ else {
+ slot->page_ptr=rp; // update address after realloc
+ slot->size=size;
+ }
+ }
+ return rp;
}
static __always_inline void bt_free(any_t*ptr) {
mp_slot_t* slot=prot_find_slot(ptr);
- if(!slot) {
- MSG_WARN("Internal error! Can't find slot for address: %p\n",ptr);
- }
+ if(!slot) MSG_WARN("Internal error! Can't find slot for address: %p\n",ptr);
prot_free_slot(ptr);
free(ptr);
}
@@ -174,13 +204,28 @@
static void bt_print_slots(void) {
size_t i,j;
for(i=0;i<priv->nslots;i++) {
- MSG_INFO("Alloc's address: %p size: %u bt_stack: %u\n",priv->slots[i].page_ptr,priv->slots[i].size,priv->slots[i].ncalls);
+ char *s;
+ int printable=1;
+ MSG_INFO("address: %p size: %u dump: ",priv->slots[i].page_ptr,priv->slots[i].size);
+ s=priv->slots[i].page_ptr;
+ for(j=0;j<min(priv->slots[i].size,20);j++) {
+ if(!isprint(s[j])) {
+ printable=0;
+ break;
+ }
+ }
+ if(printable) MSG_INFO("%20s",s);
+ else for(j=0;j<min(priv->slots[i].size,10);j++) {
+ MSG_INFO("%02X ",(unsigned char)s[j]);
+ }
+ MSG_INFO("\n");
for(j=0;j<priv->slots[i].ncalls;j++) {
MSG_INFO(" %p\n",priv->slots[i].calls[j]);
}
}
+ MSG_HINT("For source lines print in (gdb): list *0xADDRESS\n");
}
-/* ================== HEAD ======================= */
+/* ================== HEAD FUNCTIONS ======================= */
void mp_init_malloc(unsigned rnd_limit,unsigned every_nth_call,enum mp_malloc_e flags)
{
if(!priv) priv=malloc(sizeof(priv_t));
@@ -192,9 +237,14 @@
void mp_uninit_malloc(int verbose)
{
- 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(priv->flags&MPA_FLG_BACKTRACE) bt_print_slots();
+ if(priv->flags&MPA_FLG_BACKTRACE) {
+ 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(priv->flags&MPA_FLG_BACKTRACE && verbose) bt_print_slots();
free(priv);
priv=NULL;
}
@@ -221,6 +271,23 @@
return rb;
}
+/* randomizing of memalign is useless feature */
+any_t* mp_memalign (size_t boundary, size_t __size)
+{
+ any_t* rb;
+ if(!priv) mp_init_malloc(1000,10,MPA_FLG_RANDOMIZER);
+ 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;
+}
+
any_t* mp_realloc(any_t*__ptr, size_t __size) {
any_t* rp;
if(priv->flags&(MPA_FLG_BOUNDS_CHECK|MPA_FLG_BEFORE_CHECK)) rp=prot_realloc(__ptr,__size);
@@ -250,15 +317,6 @@
return rp;
}
-/* randomizing of memalign is useless feature */
-any_t* mp_memalign (size_t boundary, size_t __size)
-{
- if(!priv) mp_init_malloc(1000,10,MPA_FLG_RANDOMIZER);
- priv->num_allocs++;
- if(priv->enable_stat) priv->stat_num_allocs++;
- return memalign(boundary,__size);
-}
-
char * mp_strdup(const char *src) {
char *rs=NULL;
if(src) {
Modified: mplayerxp/xmp_core.c
===================================================================
--- mplayerxp/xmp_core.c 2012-11-01 14:02:30 UTC (rev 273)
+++ mplayerxp/xmp_core.c 2012-11-01 15:53:52 UTC (rev 274)
@@ -40,7 +40,11 @@
xp_core->initial_apts=HUGE;
}
-void xmp_uninit(void) { mp_free(xp_core); xp_core=NULL; }
+void xmp_uninit(void) {
+ mp_free(xp_core->mpxp_threads[0]);
+ mp_free(xp_core);
+ xp_core=NULL;
+}
unsigned xmp_register_main(sig_handler_t sigfunc) {
unsigned idx=0;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
