[xiph-cvs] cvs commit: ogg/src Makefile.am buffer.c
Monty
xiphmont at xiph.org
Thu Jul 17 21:45:21 PDT 2003
xiphmont 03/07/18 00:45:21
Modified: include/ogg2 Tag: libogg2-zerocopy Makefile Makefile.am
Makefile.in
src Tag: libogg2-zerocopy Makefile.am buffer.c
Log:
locking fix, build fixes
Revision Changes Path
No revision
<p>No revision
<p>1.1.2.3 +9 -9 ogg/include/ogg2/Attic/Makefile
Index: Makefile
===================================================================
RCS file: /usr/local/cvsroot/ogg/include/ogg2/Attic/Makefile,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- Makefile 27 Mar 2003 09:19:43 -0000 1.1.2.2
+++ Makefile 18 Jul 2003 04:45:21 -0000 1.1.2.3
@@ -1,5 +1,4 @@
-# Generated automatically from Makefile.in by configure.
-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
+# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
@@ -16,6 +15,7 @@
srcdir = .
top_srcdir = ../..
+
prefix = /usr/local
exec_prefix = ${prefix}
@@ -39,15 +39,15 @@
top_builddir = ../..
-ACLOCAL = aclocal
+ACLOCAL = aclocal-1.4
AUTOCONF = autoconf
-AUTOMAKE = automake
+AUTOMAKE = automake-1.4
AUTOHEADER = autoheader
INSTALL = /usr/bin/install -c
INSTALL_PROGRAM = ${INSTALL} $(AM_INSTALL_PROGRAM_FLAGS)
INSTALL_DATA = ${INSTALL} -m 644
-INSTALL_SCRIPT = ${INSTALL_PROGRAM}
+INSTALL_SCRIPT = ${INSTALL}
transform = s,x,x,
NORMAL_INSTALL = :
@@ -56,8 +56,8 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-host_alias = powerpc-unknown-linux-gnu
-host_triplet = powerpc-unknown-linux-gnu
+host_alias =
+host_triplet = i686-pc-linux-gnu
AS = @AS@
CC = gcc
CFLAGS = -O20 -ffast-math -fsigned-char -g -O2 -DUSE_POSIX_THREADS
@@ -72,7 +72,7 @@
LIB_CURRENT = 6
LIB_REVISION = 0
LN_S = ln -s
-MAKEINFO = makeinfo
+MAKEINFO = /home/xiphmont/MotherfishCVS/ogg/missing makeinfo
OBJDUMP = @OBJDUMP@
OBJEXT = o
OPT =
@@ -89,7 +89,7 @@
AUTOMAKE_OPTIONS = foreign
-includedir = $(prefix)/include/ogg
+includedir = $(prefix)/include/ogg2
include_HEADERS = ogg.h os_types.h config_types.h
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
<p><p>1.1.2.2 +1 -1 ogg/include/ogg2/Attic/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/ogg/include/ogg2/Attic/Makefile.am,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- Makefile.am 6 Mar 2003 23:12:27 -0000 1.1.2.1
+++ Makefile.am 18 Jul 2003 04:45:21 -0000 1.1.2.2
@@ -2,6 +2,6 @@
AUTOMAKE_OPTIONS = foreign
-includedir = $(prefix)/include/ogg
+includedir = $(prefix)/include/ogg2
include_HEADERS = ogg.h os_types.h config_types.h
<p><p>1.1.2.3 +2 -2 ogg/include/ogg2/Attic/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /usr/local/cvsroot/ogg/include/ogg2/Attic/Makefile.in,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- Makefile.in 27 Mar 2003 09:19:43 -0000 1.1.2.2
+++ Makefile.in 18 Jul 2003 04:45:21 -0000 1.1.2.3
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
+# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
@@ -89,7 +89,7 @@
AUTOMAKE_OPTIONS = foreign
-includedir = $(prefix)/include/ogg
+includedir = $(prefix)/include/ogg2
include_HEADERS = ogg.h os_types.h config_types.h
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
<p><p>No revision
<p>No revision
<p>1.5.2.3 +3 -3 ogg/src/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/ogg/src/Makefile.am,v
retrieving revision 1.5.2.2
retrieving revision 1.5.2.3
diff -u -r1.5.2.2 -r1.5.2.3
--- Makefile.am 22 Mar 2003 05:44:51 -0000 1.5.2.2
+++ Makefile.am 18 Jul 2003 04:45:21 -0000 1.5.2.3
@@ -4,10 +4,10 @@
INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include
-lib_LTLIBRARIES = libogg.la
+lib_LTLIBRARIES = libogg2.la
-libogg_la_SOURCES = sync.c stream.c bitwise.c bytewise.c
-libogg_la_LDFLAGS = -version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@
+libogg2_la_SOURCES = sync.c stream.c bitwise.c bytewise.c buffer.c
+libogg2_la_LDFLAGS = -version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@
debug:
$(MAKE) all CFLAGS="@DEBUG@"
<p><p>1.1.2.15 +4 -1 ogg/src/Attic/buffer.c
Index: buffer.c
===================================================================
RCS file: /usr/local/cvsroot/ogg/src/Attic/buffer.c,v
retrieving revision 1.1.2.14
retrieving revision 1.1.2.15
diff -u -r1.1.2.14 -r1.1.2.15
--- buffer.c 28 Mar 2003 22:37:16 -0000 1.1.2.14
+++ buffer.c 18 Jul 2003 04:45:21 -0000 1.1.2.15
@@ -11,7 +11,7 @@
********************************************************************
function: centralized fragment buffer management
- last mod: $Id: buffer.c,v 1.1.2.14 2003/03/28 22:37:16 xiphmont Exp $
+ last mod: $Id: buffer.c,v 1.1.2.15 2003/07/18 04:45:21 xiphmont Exp $
********************************************************************/
@@ -374,10 +374,12 @@
#ifdef OGGBUFFER_DEBUG
if(ob->refcount==0){
+ ogg_mutex_unlock(&bs->mutex);
fprintf(stderr,"WARNING: releasing buffer fragment with refcount of zero!\n");
exit(1);
}
if(or->used==0){
+ ogg_mutex_unlock(&bs->mutex);
fprintf(stderr,"WARNING: releasing previously released reference!\n");
exit(1);
}
@@ -394,6 +396,7 @@
bs->outstanding--; /* for the returned reference */
or->next=bs->unused_references;
bs->unused_references=or;
+ ogg_mutex_unlock(&bs->mutex);
_ogg_buffer_destroy(bs); /* lazy cleanup (if needed) */
<p><p>--- >8 ----
List archives: http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body. No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.
More information about the commits
mailing list