diff options
| -rw-r--r-- | src/xine-utils/Makefile.am | 2 | ||||
| -rw-r--r-- | src/xine-utils/monitor.c | 6 | ||||
| -rw-r--r-- | src/xine-utils/xine_mutex.c | 80 | ||||
| -rw-r--r-- | src/xine-utils/xineutils.h | 21 |
4 files changed, 104 insertions, 5 deletions
diff --git a/src/xine-utils/Makefile.am b/src/xine-utils/Makefile.am index 22d6a99d3..5d4e809de 100644 --- a/src/xine-utils/Makefile.am +++ b/src/xine-utils/Makefile.am @@ -6,7 +6,7 @@ CFLAGS = @GLOBAL_CFLAGS@ lib_LTLIBRARIES = libxineutils.la -libxineutils_la_SOURCES = utils.c memcpy.c monitor.c cpu_accel.c +libxineutils_la_SOURCES = utils.c memcpy.c monitor.c cpu_accel.c xine_mutex.c libxineutils_la_LDFLAGS = \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ diff --git a/src/xine-utils/monitor.c b/src/xine-utils/monitor.c index f780baa77..e1a6ab57d 100644 --- a/src/xine-utils/monitor.c +++ b/src/xine-utils/monitor.c @@ -1,7 +1,7 @@ /* - * Copyright (C) 2000-2001 the xine project + * Copyright (C) 2000-2002 the xine project * - * This file is part of xine, a unix video player. + * This file is part of xine, a free video player. * * xine is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: monitor.c,v 1.2 2001/11/17 14:26:39 f1rmb Exp $ + * $Id: monitor.c,v 1.3 2002/03/21 21:30:51 guenter Exp $ * * debug print and profiling functions - implementation * diff --git a/src/xine-utils/xine_mutex.c b/src/xine-utils/xine_mutex.c new file mode 100644 index 000000000..7ec965bc5 --- /dev/null +++ b/src/xine-utils/xine_mutex.c @@ -0,0 +1,80 @@ +/* + * Copyright (C) 2000-2002 the xine project + * + * This file is part of xine, a free video player. + * + * xine is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * xine is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * + * $Id: xine_mutex.c,v 1.1 2002/03/21 21:30:51 guenter Exp $ + * + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include <stdio.h> +#include <pthread.h> +#include "xineutils.h" + +#define DBG_MUTEX + +int xine_mutex_init (xine_mutex_t *mutex, const pthread_mutexattr_t *mutexattr, + char *id) { + +#ifdef DBG_MUTEX + strcpy (mutex->id, id); +#endif + + return pthread_mutex_init (&mutex->mutex, mutexattr); +} + +int xine_mutex_lock (xine_mutex_t *mutex, char *who) { + +#ifndef DBG_MUTEX + + return pthread_mutex_lock (&mutex->mutex); + +#else + + if (pthread_mutex_trylock (&mutex->mutex)) { + printf ("xine_mutex: BLOCK when %s tried to lock mutex %s because it is locked by %s. continue trying...)\n", + who, mutex->id, mutex->locked_by); + + pthread_mutex_lock (&mutex->mutex); + } + + printf ("xine_mutex: %s has now locked mutex %s\n", + who, mutex->id); + mutex->locked_by = who; + + return 1; + +#endif +} + +int xine_mutex_unlock (xine_mutex_t *mutex, char *who) { + + printf ("xine_mutex: mutex %s unlocked by %s\n", + mutex->id, who); + return pthread_mutex_unlock (&mutex->mutex); +} + +int xine_mutex_destroy (xine_mutex_t *mutex) { + return pthread_mutex_destroy (&mutex->mutex); +} + + + diff --git a/src/xine-utils/xineutils.h b/src/xine-utils/xineutils.h index 28ffb7620..349fc594f 100644 --- a/src/xine-utils/xineutils.h +++ b/src/xine-utils/xineutils.h @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: xineutils.h,v 1.9 2002/02/06 02:20:59 f1rmb Exp $ + * $Id: xineutils.h,v 1.10 2002/03/21 21:30:51 guenter Exp $ * */ #ifndef XINEUTILS_H @@ -34,6 +34,25 @@ extern "C" { #include "attributes.h" #include "compat.h" + /* + * debugable mutexes + */ + + typedef struct { + pthread_mutex_t mutex; + char id[80]; + char *locked_by; + } xine_mutex_t; + + int xine_mutex_init (xine_mutex_t *mutex, const pthread_mutexattr_t *mutexattr, + char *id); + + int xine_mutex_lock (xine_mutex_t *mutex, char *who); + int xine_mutex_unlock (xine_mutex_t *mutex, char *who); + int xine_mutex_destroy (xine_mutex_t *mutex); + + + /* CPU Acceleration */ /* |