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

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

Revision: 241
          http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=241&view=rev
Author:   nickols_k
Date:     2012-10-29 10:51:07 +0000 (Mon, 29 Oct 2012)
Log Message:
-----------
move uncommon stuff into osdep

Modified Paths:
--------------
    mplayerxp/Makefile
    mplayerxp/libvo/osd.c
    mplayerxp/libvo/video_out.c
    mplayerxp/mplayer.c
    mplayerxp/osdep/Makefile

Added Paths:
-----------
    mplayerxp/osdep/my_malloc.c
    mplayerxp/osdep/my_malloc.h
    mplayerxp/osdep/my_profile.c
    mplayerxp/osdep/my_profile.h

Removed Paths:
-------------
    mplayerxp/my_malloc.c
    mplayerxp/my_malloc.h
    mplayerxp/my_profile.c
    mplayerxp/my_profile.h

Modified: mplayerxp/Makefile
===================================================================
--- mplayerxp/Makefile	2012-10-29 10:29:04 UTC (rev 240)
+++ mplayerxp/Makefile	2012-10-29 10:51:07 UTC (rev 241)
@@ -23,7 +23,7 @@
 MANDIR = ${prefix}/man
 LDFLAGS += -Wl,-rpath,${CODECDIR}/codecs
 
-SRCS_COMMON = cpudetect.c mp_msg.c my_profile.c my_malloc.c mp_image.c
+SRCS_COMMON = cpudetect.c mp_msg.c mp_image.c
 SRCS_MPLAYER = mplayer.c fifo.c $(SRCS_COMMON) mixer.c mp-opt-reg.c sig_hand.c dump.c
 SRCS_MPLAYER+= xmp_core.c
 

Modified: mplayerxp/libvo/osd.c
===================================================================
--- mplayerxp/libvo/osd.c	2012-10-29 10:29:04 UTC (rev 240)
+++ mplayerxp/libvo/osd.c	2012-10-29 10:51:07 UTC (rev 241)
@@ -6,13 +6,14 @@
 
 #include <stdio.h>
 #include <pthread.h>
-#include "../mp_config.h"
+
+#include "mp_config.h"
 //#define ENABLE_PROFILE
-#include "../my_profile.h"
+#include "osdep/my_profile.h"
 #include <inttypes.h>
-#include "../cpudetect.h"
-#include "../mangle.h"
-#include "../mplayer.h"
+#include "cpudetect.h"
+#include "mangle.h"
+#include "mplayer.h"
 #include "osd.h"
 #include "vo_msg.h"
 

Modified: mplayerxp/libvo/video_out.c
===================================================================
--- mplayerxp/libvo/video_out.c	2012-10-29 10:29:04 UTC (rev 240)
+++ mplayerxp/libvo/video_out.c	2012-10-29 10:51:07 UTC (rev 241)
@@ -33,7 +33,7 @@
 #include "postproc/swscale.h"
 #include "postproc/vf.h"
 #include "xmp_core.h"
-#include "my_malloc.h"
+#include "osdep/my_malloc.h"
 #include "mplayer.h"
 #include "fastmemcpy.h"
 #include "img_format.h"

Modified: mplayerxp/mplayer.c
===================================================================
--- mplayerxp/mplayer.c	2012-10-29 10:29:04 UTC (rev 240)
+++ mplayerxp/mplayer.c	2012-10-29 10:51:07 UTC (rev 241)
@@ -25,7 +25,7 @@
 #include "mp_config.h"
 #include "sig_hand.h"
 #include "mplayer.h"
-#include "my_malloc.h"
+#include "osdep/my_malloc.h"
 #include "postproc/swscale.h"
 #include "postproc/af.h"
 #include "postproc/vf.h"

Deleted: mplayerxp/my_malloc.c
===================================================================
--- mplayerxp/my_malloc.c	2012-10-29 10:29:04 UTC (rev 240)
+++ mplayerxp/my_malloc.c	2012-10-29 10:51:07 UTC (rev 241)
@@ -1,120 +0,0 @@
-#include "my_malloc.h"
-
-#include <string.h>
-#include <stdio.h>
-#include <time.h>
-
-any_t*my_malloc(size_t __size)
-{
-  char *retval;
-  long msize,mval;
-  msize = __size;
-  retval = malloc(msize+2*sizeof(long));
-  if(retval) 
-  {
-    mval = (long)retval;
-    memcpy(retval,&msize,sizeof(long));
-    memcpy(retval+msize+sizeof(long),&mval,sizeof(long));
-    retval += sizeof(long);
-  }
-//  printf("malloc returns: %08X for size: %08X\n",retval,__size);
-  return retval;
-}
-
-any_t*my_realloc(any_t*__ptr, size_t __size)
-{
-  char *retval,*myptr;
-  long crc,osize;
-  long msize,mval;
-  msize = __size;
-  myptr = __ptr;
-  if(__ptr)
-  {
-    memcpy(&osize,(char *)__ptr-sizeof(long),sizeof(long));
-    memcpy(&crc,(char *)__ptr+osize,sizeof(long));
-    if(crc != (long)((char *)__ptr-sizeof(long)))
-    {
-      printf("Internal error: my_realloc found out memory corruption!\n");
-      printf("INFO: ptr=%p ptr[0]=%lX crc=%lX\n",
-		__ptr,
-		osize,
-		crc);
-#ifdef __i386__
-	__asm __volatile(".short 0xffff":::"memory");
-#endif
-    }
-    myptr -= sizeof(long);
-  }
-  retval = realloc(myptr,__size+2*sizeof(long));
-  {
-    mval = (long)retval;
-    memcpy(retval,&msize,sizeof(long));
-    memcpy(retval+__size+sizeof(long),&mval,sizeof(long));
-    retval += sizeof(long);
-  }
-  return retval;
-}
-
-any_t*my_calloc (size_t __nelem, size_t __size)
-{
-  char *retval;
-  long my_size;
-  long msize,mval;
-  msize = __nelem*__size;
-  retval = malloc(msize+2*sizeof(long));
-  if(retval) 
-  {
-    mval = (long)retval;
-    memset(retval+sizeof(long),0,msize);
-    memcpy(retval,&msize,sizeof(long));
-    memcpy(retval+msize+sizeof(long),&mval,sizeof(long));
-    retval += sizeof(long);
-  }
-  return retval;
-}
-
-void  my_free(any_t*__ptr)
-{
-  any_t*myptr;
-  long crc,osize;
-  if(__ptr)
-  {
-    myptr = (char *)__ptr-sizeof(long);
-    memcpy(&osize,(char *)myptr,sizeof(long));
-    memcpy(&crc,(char *)myptr+osize+sizeof(long),sizeof(long));
-    if(crc != (long)myptr)
-    {
-	printf("Internal error: my_free found out memory corruption!\n");
-	printf("INFO: ptr=%p ptr[0]=%lX crc=%lX\n",
-		__ptr,
-		osize,
-		crc);
-#ifdef __i386__
-	__asm __volatile(".short 0xffff":::"memory");
-#endif
-    }
-    free((char *)__ptr-sizeof(long));
-  }
-}
-
-char * my_strdup(const char *s)
-{
-  any_t*a;
-  a = my_malloc(strlen(s)+1);
-  strcpy(a,s);
-  return a;
-}
-
-any_t* random_malloc(size_t __size,unsigned rnd_limit)
-{
-    any_t* rb,*rnd_buff;
-    static int inited=0;
-    if(!inited) {
-	srand(time(NULL));
-	inited=1;
-    }
-    rnd_buff=malloc(rand()%rnd_limit);
-    rb = malloc(__size);
-    free(rnd_buff);
-    return rb;
-}

Deleted: mplayerxp/my_malloc.h
===================================================================
--- mplayerxp/my_malloc.h	2012-10-29 10:29:04 UTC (rev 240)
+++ mplayerxp/my_malloc.h	2012-10-29 10:51:07 UTC (rev 241)
@@ -1,33 +0,0 @@
-/*
-    This file contains functions for debugging purposes only!
-    They work with triplex - ptr,size,crc to control memory boundaries
-    at run-time. They are useful only when you have builded mplayerxp
-    with debug info (./configure --enable_debug[=3]).
-    To use them please add '#include "my_malloc.h"' at end of mp_config.h
-    manually.
-*/
-#ifndef __MY_MALLOC_H
-#define __MY_MALLOC_H 1
-#include "mp_config.h"
-
-#include <stdlib.h>
-
-//#define __ENABLE_MALLOC_DEBUG 1
-#ifdef __ENABLE_MALLOC_DEBUG
-extern any_t*my_malloc(size_t __size);
-extern any_t*my_realloc(any_t*__ptr, size_t __size);
-extern any_t*my_calloc (size_t __nelem, size_t __size);
-extern void  my_free(any_t*__ptr);
-extern char *my_strdup(const char *src);
-#define strdup(a) my_strdup(a)
-#define malloc(a) my_malloc(a)
-#define memalign(a,b) my_malloc(b)
-#define realloc(a,b) my_realloc(a,b)
-#define calloc(a,b) my_calloc(a,b)
-#define free(a) my_free(a)
-#endif
-
-/* Pseudo-randomizing memory objects makes memory exploits harder */
-extern any_t*	random_malloc(size_t __size,unsigned upper_rnd_limit);
-
-#endif

Deleted: mplayerxp/my_profile.c
===================================================================
--- mplayerxp/my_profile.c	2012-10-29 10:29:04 UTC (rev 240)
+++ mplayerxp/my_profile.c	2012-10-29 10:51:07 UTC (rev 241)
@@ -1,12 +0,0 @@
-/*
- *  my_profile.c
- *
- *	Copyright (C) Nickols_K <nic...@ma...> - Oct 2001
- *
- *  You can redistribute this file under terms and conditions
- *  of GNU General Public licence v2.
- */
- 
-#include "my_profile.h"
-
-volatile unsigned long long int my_profile_start,my_profile_end,my_profile_total;

Deleted: mplayerxp/my_profile.h
===================================================================
--- mplayerxp/my_profile.h	2012-10-29 10:29:04 UTC (rev 240)
+++ mplayerxp/my_profile.h	2012-10-29 10:51:07 UTC (rev 241)
@@ -1,31 +0,0 @@
-/*
- *  my_profile.h
- *
- *	Copyright (C) Nickols_K <nic...@ma...> - Oct 2001
- *
- *  You can redistribute this file under terms and conditions
- *  of GNU General Public licence v2.
- */
-#ifndef MY_PROFILE_INC
-#define MY_PROFILE_INC
-
-extern volatile unsigned long long int my_profile_start,my_profile_end,my_profile_total;
-
-#if defined ( ENABLE_PROFILE ) && (defined ( ARCH_X86 ) || defined( ARCH_X86_64 ))
-static inline unsigned long long int read_tsc( void )
-{
-  unsigned long long int retval;
-  __asm __volatile ("rdtsc":"=A"(retval)::"memory");
-  return retval;
-}
-
-#define PROFILE_RESET()                 (my_profile_total=0ULL)
-#define PROFILE_START()			{ static int inited=0; if(!inited) { inited=1; my_profile_total=0ULL; } my_profile_start=read_tsc(); }
-#define PROFILE_END(your_message)	{ my_profile_end=read_tsc(); my_profile_total+=(my_profile_end-my_profile_start); printf(your_message" current=%llu total=%llu\n\t",(my_profile_end-my_profile_start),my_profile_total); }
-#else
-#define PROFILE_RESET()
-#define PROFILE_START()
-#define PROFILE_END(your_message)
-#endif
-
-#endif

Modified: mplayerxp/osdep/Makefile
===================================================================
--- mplayerxp/osdep/Makefile	2012-10-29 10:29:04 UTC (rev 240)
+++ mplayerxp/osdep/Makefile	2012-10-29 10:51:07 UTC (rev 241)
@@ -3,7 +3,7 @@
 
 LIBNAME = libosdep.a
 
-SRCS=getch2.c timer-lx.c timer.c shmem.c get_path.c
+SRCS=getch2.c timer-lx.c timer.c shmem.c get_path.c my_malloc.c my_profile.c
 OBJS=$(SRCS:.c=.o)
 
 ifeq ($(TARGET_OS),LINUX_GNU)

Copied: mplayerxp/osdep/my_malloc.c (from rev 229, mplayerxp/my_malloc.c)
===================================================================
--- mplayerxp/osdep/my_malloc.c	                        (rev 0)
+++ mplayerxp/osdep/my_malloc.c	2012-10-29 10:51:07 UTC (rev 241)
@@ -0,0 +1,120 @@
+#include "my_malloc.h"
+
+#include <string.h>
+#include <stdio.h>
+#include <time.h>
+
+any_t*my_malloc(size_t __size)
+{
+  char *retval;
+  long msize,mval;
+  msize = __size;
+  retval = malloc(msize+2*sizeof(long));
+  if(retval) 
+  {
+    mval = (long)retval;
+    memcpy(retval,&msize,sizeof(long));
+    memcpy(retval+msize+sizeof(long),&mval,sizeof(long));
+    retval += sizeof(long);
+  }
+//  printf("malloc returns: %08X for size: %08X\n",retval,__size);
+  return retval;
+}
+
+any_t*my_realloc(any_t*__ptr, size_t __size)
+{
+  char *retval,*myptr;
+  long crc,osize;
+  long msize,mval;
+  msize = __size;
+  myptr = __ptr;
+  if(__ptr)
+  {
+    memcpy(&osize,(char *)__ptr-sizeof(long),sizeof(long));
+    memcpy(&crc,(char *)__ptr+osize,sizeof(long));
+    if(crc != (long)((char *)__ptr-sizeof(long)))
+    {
+      printf("Internal error: my_realloc found out memory corruption!\n");
+      printf("INFO: ptr=%p ptr[0]=%lX crc=%lX\n",
+		__ptr,
+		osize,
+		crc);
+#ifdef __i386__
+	__asm __volatile(".short 0xffff":::"memory");
+#endif
+    }
+    myptr -= sizeof(long);
+  }
+  retval = realloc(myptr,__size+2*sizeof(long));
+  {
+    mval = (long)retval;
+    memcpy(retval,&msize,sizeof(long));
+    memcpy(retval+__size+sizeof(long),&mval,sizeof(long));
+    retval += sizeof(long);
+  }
+  return retval;
+}
+
+any_t*my_calloc (size_t __nelem, size_t __size)
+{
+  char *retval;
+  long my_size;
+  long msize,mval;
+  msize = __nelem*__size;
+  retval = malloc(msize+2*sizeof(long));
+  if(retval) 
+  {
+    mval = (long)retval;
+    memset(retval+sizeof(long),0,msize);
+    memcpy(retval,&msize,sizeof(long));
+    memcpy(retval+msize+sizeof(long),&mval,sizeof(long));
+    retval += sizeof(long);
+  }
+  return retval;
+}
+
+void  my_free(any_t*__ptr)
+{
+  any_t*myptr;
+  long crc,osize;
+  if(__ptr)
+  {
+    myptr = (char *)__ptr-sizeof(long);
+    memcpy(&osize,(char *)myptr,sizeof(long));
+    memcpy(&crc,(char *)myptr+osize+sizeof(long),sizeof(long));
+    if(crc != (long)myptr)
+    {
+	printf("Internal error: my_free found out memory corruption!\n");
+	printf("INFO: ptr=%p ptr[0]=%lX crc=%lX\n",
+		__ptr,
+		osize,
+		crc);
+#ifdef __i386__
+	__asm __volatile(".short 0xffff":::"memory");
+#endif
+    }
+    free((char *)__ptr-sizeof(long));
+  }
+}
+
+char * my_strdup(const char *s)
+{
+  any_t*a;
+  a = my_malloc(strlen(s)+1);
+  strcpy(a,s);
+  return a;
+}
+
+any_t* random_malloc(size_t __size,unsigned rnd_limit)
+{
+    any_t* rb,*rnd_buff;
+    static int inited=0;
+    if(!inited) {
+	srand(time(NULL));
+	inited=1;
+    }
+    rnd_buff=malloc(rand()%rnd_limit);
+    rb = malloc(__size);
+    free(rnd_buff);
+    return rb;
+}

Copied: mplayerxp/osdep/my_malloc.h (from rev 229, mplayerxp/my_malloc.h)
===================================================================
--- mplayerxp/osdep/my_malloc.h	                        (rev 0)
+++ mplayerxp/osdep/my_malloc.h	2012-10-29 10:51:07 UTC (rev 241)
@@ -0,0 +1,33 @@
+/*
+    This file contains functions for debugging purposes only!
+    They work with triplex - ptr,size,crc to control memory boundaries
+    at run-time. They are useful only when you have builded mplayerxp
+    with debug info (./configure --enable_debug[=3]).
+    To use them please add '#include "my_malloc.h"' at end of mp_config.h
+    manually.
+*/
+#ifndef __MY_MALLOC_H
+#define __MY_MALLOC_H 1
+#include "mp_config.h"
+
+#include <stdlib.h>
+
+//#define __ENABLE_MALLOC_DEBUG 1
+#ifdef __ENABLE_MALLOC_DEBUG
+extern any_t*my_malloc(size_t __size);
+extern any_t*my_realloc(any_t*__ptr, size_t __size);
+extern any_t*my_calloc (size_t __nelem, size_t __size);
+extern void  my_free(any_t*__ptr);
+extern char *my_strdup(const char *src);
+#define strdup(a) my_strdup(a)
+#define malloc(a) my_malloc(a)
+#define memalign(a,b) my_malloc(b)
+#define realloc(a,b) my_realloc(a,b)
+#define calloc(a,b) my_calloc(a,b)
+#define free(a) my_free(a)
+#endif
+
+/* Pseudo-randomizing memory objects makes memory exploits harder */
+extern any_t*	random_malloc(size_t __size,unsigned upper_rnd_limit);
+
+#endif

Copied: mplayerxp/osdep/my_profile.c (from rev 229, mplayerxp/my_profile.c)
===================================================================
--- mplayerxp/osdep/my_profile.c	                        (rev 0)
+++ mplayerxp/osdep/my_profile.c	2012-10-29 10:51:07 UTC (rev 241)
@@ -0,0 +1,12 @@
+/*
+ *  my_profile.c
+ *
+ *	Copyright (C) Nickols_K <nic...@ma...> - Oct 2001
+ *
+ *  You can redistribute this file under terms and conditions
+ *  of GNU General Public licence v2.
+ */
+ 
+#include "my_profile.h"
+
+volatile unsigned long long int my_profile_start,my_profile_end,my_profile_total;

Copied: mplayerxp/osdep/my_profile.h (from rev 229, mplayerxp/my_profile.h)
===================================================================
--- mplayerxp/osdep/my_profile.h	                        (rev 0)
+++ mplayerxp/osdep/my_profile.h	2012-10-29 10:51:07 UTC (rev 241)
@@ -0,0 +1,31 @@
+/*
+ *  my_profile.h
+ *
+ *	Copyright (C) Nickols_K <nic...@ma...> - Oct 2001
+ *
+ *  You can redistribute this file under terms and conditions
+ *  of GNU General Public licence v2.
+ */
+#ifndef MY_PROFILE_INC
+#define MY_PROFILE_INC
+
+extern volatile unsigned long long int my_profile_start,my_profile_end,my_profile_total;
+
+#if defined ( ENABLE_PROFILE ) && (defined ( ARCH_X86 ) || defined( ARCH_X86_64 ))
+static inline unsigned long long int read_tsc( void )
+{
+  unsigned long long int retval;
+  __asm __volatile ("rdtsc":"=A"(retval)::"memory");
+  return retval;
+}
+
+#define PROFILE_RESET()                 (my_profile_total=0ULL)
+#define PROFILE_START()			{ static int inited=0; if(!inited) { inited=1; my_profile_total=0ULL; } my_profile_start=read_tsc(); }
+#define PROFILE_END(your_message)	{ my_profile_end=read_tsc(); my_profile_total+=(my_profile_end-my_profile_start); printf(your_message" current=%llu total=%llu\n\t",(my_profile_end-my_profile_start),my_profile_total); }
+#else
+#define PROFILE_RESET()
+#define PROFILE_START()
+#define PROFILE_END(your_message)
+#endif
+
+#endif

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