kcat/openal-soft
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove the unused thunk code

Browse Source
This commit is contained in:
Chris Robinson 2018-02-02 22:59:06 -08:00
parent 28fa82378b
commit 80cc32d77b
9 changed files with 0 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Alc/ALc.c
View File

@ -32,7 +32,6 @@
#include "alMain.h" #include "alMain.h"
#include "alSource.h" #include "alSource.h"
#include "alListener.h" #include "alListener.h"
#include "alThunk.h"
#include "alSource.h" #include "alSource.h"
#include "alBuffer.h" #include "alBuffer.h"
#include "alAuxEffectSlot.h" #include "alAuxEffectSlot.h"
@ -882,8 +881,6 @@ static void alc_init(void)
ret = almtx_init(&ListLock, almtx_recursive); ret = almtx_init(&ListLock, almtx_recursive);
assert(ret == althrd_success); assert(ret == althrd_success);
ThunkInit();
} }
static void alc_initconfig(void) static void alc_initconfig(void)
@ -1237,7 +1234,6 @@ static void alc_deinit_safe(void)
FreeHrtfs(); FreeHrtfs();
FreeALConfig(); FreeALConfig();
ThunkExit();
almtx_destroy(&ListLock); almtx_destroy(&ListLock);
altss_delete(LocalContext); altss_delete(LocalContext);

1
CMakeLists.txt
View File

@ -707,7 +707,6 @@ SET(OPENAL_OBJS OpenAL32/alAuxEffectSlot.c
OpenAL32/alListener.c OpenAL32/alListener.c
OpenAL32/alSource.c OpenAL32/alSource.c
OpenAL32/alState.c OpenAL32/alState.c
OpenAL32/alThunk.c
OpenAL32/event.c OpenAL32/event.c
OpenAL32/sample_cvt.c OpenAL32/sample_cvt.c
) )

20
OpenAL32/Include/alThunk.h
View File

@ -1,20 +0,0 @@
#ifndef ALTHUNK_H
#define ALTHUNK_H
#include "alMain.h"
#ifdef __cplusplus
extern "C" {
#endif
void ThunkInit(void);
void ThunkExit(void);
ALenum NewThunkEntry(ALuint *index);
void FreeThunkEntry(ALuint index);
#ifdef __cplusplus
}
#endif
#endif //ALTHUNK_H

1
OpenAL32/alAuxEffectSlot.c
View File

@ -27,7 +27,6 @@
#include "AL/alc.h" #include "AL/alc.h"
#include "alMain.h" #include "alMain.h"
#include "alAuxEffectSlot.h" #include "alAuxEffectSlot.h"
#include "alThunk.h"
#include "alError.h" #include "alError.h"
#include "alListener.h" #include "alListener.h"
#include "alSource.h" #include "alSource.h"

1
OpenAL32/alBuffer.c
View File

@ -32,7 +32,6 @@
#include "alu.h" #include "alu.h"
#include "alError.h" #include "alError.h"
#include "alBuffer.h" #include "alBuffer.h"
#include "alThunk.h"
#include "sample_cvt.h" #include "sample_cvt.h"

1
OpenAL32/alEffect.c
View File

@ -28,7 +28,6 @@
#include "AL/alc.h" #include "AL/alc.h"
#include "alMain.h" #include "alMain.h"
#include "alEffect.h" #include "alEffect.h"
#include "alThunk.h"
#include "alError.h" #include "alError.h"

1
OpenAL32/alFilter.c
View File

@ -25,7 +25,6 @@
#include "alMain.h" #include "alMain.h"
#include "alu.h" #include "alu.h"
#include "alFilter.h" #include "alFilter.h"
#include "alThunk.h"
#include "alError.h" #include "alError.h"

1
OpenAL32/alSource.c
View File

@ -31,7 +31,6 @@
#include "alError.h" #include "alError.h"
#include "alSource.h" #include "alSource.h"
#include "alBuffer.h" #include "alBuffer.h"
#include "alThunk.h"
#include "alAuxEffectSlot.h" #include "alAuxEffectSlot.h"
#include "backends/base.h" #include "backends/base.h"

108
OpenAL32/alThunk.c
View File

@ -1,108 +0,0 @@
/**
* OpenAL cross platform audio library
* Copyright (C) 1999-2007 by authors.
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library 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
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
* Or go to http://www.gnu.org/copyleft/lgpl.html
*/
#include "config.h"
#include <stdlib.h>
#include "alMain.h"
#include "alThunk.h"
#include "almalloc.h"
static ATOMIC_FLAG *ThunkArray;
static ALsizei ThunkArraySize;
static RWLock ThunkLock;
void ThunkInit(void)
{
RWLockInit(&ThunkLock);
ThunkArraySize = 1024;
ThunkArray = al_calloc(16, ThunkArraySize * sizeof(*ThunkArray));
}
void ThunkExit(void)
{
al_free(ThunkArray);
ThunkArray = NULL;
ThunkArraySize = 0;
}
ALenum NewThunkEntry(ALuint *index)
{
void *NewList;
ALsizei i;
ReadLock(&ThunkLock);
for(i = 0;i < ThunkArraySize;i++)
{
if(!ATOMIC_FLAG_TEST_AND_SET(&ThunkArray[i], almemory_order_acq_rel))
{
ReadUnlock(&ThunkLock);
*index = i+1;
return AL_NO_ERROR;
}
}
ReadUnlock(&ThunkLock);
WriteLock(&ThunkLock);
/* Double-check that there's still no free entries, in case another
* invocation just came through and increased the size of the array.
*/
for(;i < ThunkArraySize;i++)
{
if(!ATOMIC_FLAG_TEST_AND_SET(&ThunkArray[i], almemory_order_acq_rel))
{
WriteUnlock(&ThunkLock);
*index = i+1;
return AL_NO_ERROR;
}
}
NewList = al_calloc(16, ThunkArraySize*2 * sizeof(*ThunkArray));
if(!NewList)
{
WriteUnlock(&ThunkLock);
ERR("Realloc failed to increase to %u entries!\n", ThunkArraySize*2);
return AL_OUT_OF_MEMORY;
}
memcpy(NewList, ThunkArray, ThunkArraySize*sizeof(*ThunkArray));
al_free(ThunkArray);
ThunkArray = NewList;
ThunkArraySize *= 2;
ATOMIC_FLAG_TEST_AND_SET(&ThunkArray[i], almemory_order_seq_cst);
*index = ++i;
for(;i < ThunkArraySize;i++)
ATOMIC_FLAG_CLEAR(&ThunkArray[i], almemory_order_relaxed);
WriteUnlock(&ThunkLock);
return AL_NO_ERROR;
}
void FreeThunkEntry(ALuint index)
{
ReadLock(&ThunkLock);
if(index > 0 && (ALsizei)index <= ThunkArraySize)
ATOMIC_FLAG_CLEAR(&ThunkArray[index-1], almemory_order_release);
ReadUnlock(&ThunkLock);
}