Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/2.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
@daschuer
daschuer committed Sep 15, 2019
2 parents d0447ad + 4000c66 commit bdc87af
Show file tree
Hide file tree
Showing 11 changed files with 295 additions and 171 deletions.
1 change: 1 addition & 0 deletions README
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ Mixxx has the following dependencies:
- libvorbis
- libvorbisfile
- libsndfile
- libmodplug
- libflac
- libopus
- libshout
Expand Down
1 change: 1 addition & 0 deletions build/debian/control
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ Build-Depends: debhelper (>= 9),
libhidapi-dev,
libupower-glib-dev,
liblilv-dev,
libmodplug-dev
libmp3lame-dev,
# for running mixxx-test
xvfb
Expand Down
31 changes: 22 additions & 9 deletions build/features.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -314,29 +314,42 @@ def description(self):
return "Modplug module decoder plugin"

def enabled(self, build):
build.flags['modplug'] = util.get_flags(build.env, 'modplug', 0)
# Default to enabled on but only throw an error if it was explicitly
# requested and is not available.
if 'modplug' in build.flags:
return int(build.flags['modplug']) > 0
build.flags['modplug'] = util.get_flags(build.env, 'modplug', 1)
if int(build.flags['modplug']):
return True
return False

def add_options(self, build, vars):
vars.Add('modplug',
'Set to 1 to enable libmodplug based module tracker support.', 0)
'Set to 1 to enable libmodplug based module tracker support.',
1)

def configure(self, build, conf):
if not self.enabled(build):
return

build.env.Append(CPPDEFINES='__MODPLUG__')
# Only block the configure if modplug was explicitly requested.
explicit = 'modplug' in SCons.ARGUMENTS

have_modplug_h = conf.CheckHeader('libmodplug/modplug.h')
have_modplug = conf.CheckLib(['modplug', 'libmodplug'], autoadd=True)
if not conf.CheckHeader('libmodplug/modplug.h'):
if explicit:
raise Exception('Could not find libmodplug development headers.')
else:
build.flags['modplug'] = 0
return

if not have_modplug_h:
raise Exception('Could not find libmodplug development headers.')
if not conf.CheckLib(['modplug', 'libmodplug'], autoadd=True):
if explicit:
raise Exception('Could not find libmodplug shared library.')
else:
build.flags['modplug'] = 0
return

if not have_modplug:
raise Exception('Could not find libmodplug shared library.')
build.env.Append(CPPDEFINES='__MODPLUG__')

def sources(self, build):
depends.Qt.uic(build)('src/preferences/dialog/dlgprefmodplugdlg.ui')
Expand Down
183 changes: 106 additions & 77 deletions src/engine/cachingreader/cachingreader.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,21 @@ mixxx::Logger kLogger("CachingReader");
// TODO() Do we suffer cache misses if we use an audio buffer of above 23 ms?
const SINT kDefaultHintFrames = 1024;

// currently CachingReaderWorker::kCachingReaderChunkLength is 65536 (0x10000);
// For 80 chunks we need 5242880 (0x500000) bytes (5 MiB) of Memory
//static
// With CachingReaderChunk::kFrames = 8192 each chunk consumes
// 8192 frames * 2 channels/frame * 4-bytes per sample = 65 kB.
//
// 80 chunks -> 5120 KB = 5 MB
//
// Each deck (including sample decks) will use their own CachingReader.
// Consequently the total memory required for all allocated chunks depends
// on the number of decks. The amount of memory reserved for a single
// CachingReader must be multiplied by the number of decks to calculate
// the total amount!
//
// NOTE(uklotzde, 2019-09-05): Reduce this number to just few chunks
// (kNumberOfCachedChunksInMemory = 1, 2, 3, ...) for testing purposes
// to verify that the MRU/LRU cache works as expected. Even though
// massive drop outs are expected to occur Mixxx should run reliably!
const SINT kNumberOfCachedChunksInMemory = 80;

} // anonymous namespace
Expand All @@ -32,8 +44,20 @@ const SINT kNumberOfCachedChunksInMemory = 80;
CachingReader::CachingReader(QString group,
UserSettingsPointer config)
: m_pConfig(config),
m_chunkReadRequestFIFO(1024),
m_readerStatusFIFO(1024),
// Limit the number of in-flight requests to the worker. This should
// prevent to overload the worker when it is not able to fetch those
// requests from the FIFO timely. Otherwise outdated requests pile up
// in the FIFO and it would take a long time to process them, just to
// discard the results that most likely have already become obsolete.
// TODO(XXX): Ideally the request FIFO would be implemented as a ring
// buffer, where new requests replace old requests when full. Those
// old requests need to be returned immediately to the CachingReader
// that must take ownership and free them!!!
m_chunkReadRequestFIFO(kNumberOfCachedChunksInMemory / 4),
// The capacity of the back channel must be equal to the number of
// allocated chunks, because the worker use writeBlocking(). Otherwise
// the worker could get stuck in a hot loop!!!
m_readerStatusFIFO(kNumberOfCachedChunksInMemory),
m_readerStatus(INVALID),
m_mruCachingReaderChunk(nullptr),
m_lruCachingReaderChunk(nullptr),
Expand Down Expand Up @@ -74,8 +98,16 @@ CachingReader::~CachingReader() {
qDeleteAll(m_chunks);
}

void CachingReader::freeChunkFromList(CachingReaderChunkForOwner* pChunk) {
pChunk->removeFromList(
&m_mruCachingReaderChunk,
&m_lruCachingReaderChunk);
pChunk->free();
m_freeChunks.push_back(pChunk);
}

void CachingReader::freeChunk(CachingReaderChunkForOwner* pChunk) {
DEBUG_ASSERT(pChunk != nullptr);
DEBUG_ASSERT(pChunk);
DEBUG_ASSERT(pChunk->getState() != CachingReaderChunkForOwner::READ_PENDING);

const int removed = m_allocatedCachingReaderChunks.remove(pChunk->getIndex());
Expand All @@ -84,10 +116,7 @@ void CachingReader::freeChunk(CachingReaderChunkForOwner* pChunk) {
// because sometime you free a chunk right after you allocated it.
DEBUG_ASSERT(removed <= 1);

pChunk->removeFromList(
&m_mruCachingReaderChunk, &m_lruCachingReaderChunk);
pChunk->free();
m_freeChunks.push_back(pChunk);
freeChunkFromList(pChunk);
}

void CachingReader::freeAllChunks() {
Expand All @@ -99,15 +128,13 @@ void CachingReader::freeAllChunks() {
}

if (pChunk->getState() != CachingReaderChunkForOwner::FREE) {
pChunk->removeFromList(
&m_mruCachingReaderChunk, &m_lruCachingReaderChunk);
pChunk->free();
m_freeChunks.push_back(pChunk);
freeChunkFromList(pChunk);
}
}
DEBUG_ASSERT(!m_mruCachingReaderChunk);
DEBUG_ASSERT(!m_lruCachingReaderChunk);

m_allocatedCachingReaderChunks.clear();
m_mruCachingReaderChunk = nullptr;
}

CachingReaderChunkForOwner* CachingReader::allocateChunk(SINT chunkIndex) {
Expand All @@ -117,62 +144,59 @@ CachingReaderChunkForOwner* CachingReader::allocateChunk(SINT chunkIndex) {
CachingReaderChunkForOwner* pChunk = m_freeChunks.takeFirst();
pChunk->init(chunkIndex);

//kLogger.debug() << "Allocating chunk" << pChunk << pChunk->getIndex();
m_allocatedCachingReaderChunks.insert(chunkIndex, pChunk);

return pChunk;
}

CachingReaderChunkForOwner* CachingReader::allocateChunkExpireLRU(SINT chunkIndex) {
CachingReaderChunkForOwner* pChunk = allocateChunk(chunkIndex);
auto pChunk = allocateChunk(chunkIndex);
if (!pChunk) {
if (m_lruCachingReaderChunk == nullptr) {
kLogger.warning() << "ERROR: No LRU chunk to free in allocateChunkExpireLRU.";
return nullptr;
if (m_lruCachingReaderChunk) {
freeChunk(m_lruCachingReaderChunk);
pChunk = allocateChunk(chunkIndex);
} else {
kLogger.warning() << "No cached LRU chunk available for freeing";
}
freeChunk(m_lruCachingReaderChunk);
pChunk = allocateChunk(chunkIndex);
}
//kLogger.debug() << "allocateChunkExpireLRU" << chunk << pChunk;
if (kLogger.traceEnabled()) {
kLogger.trace() << "allocateChunkExpireLRU" << chunkIndex << pChunk;
}
return pChunk;
}

CachingReaderChunkForOwner* CachingReader::lookupChunk(SINT chunkIndex) {
// Defaults to nullptr if it's not in the hash.
CachingReaderChunkForOwner* chunk = m_allocatedCachingReaderChunks.value(chunkIndex, nullptr);

// Make sure the allocated number matches the indexed chunk number.
DEBUG_ASSERT(chunk == nullptr || chunkIndex == chunk->getIndex());

return chunk;
auto pChunk = m_allocatedCachingReaderChunks.value(chunkIndex, nullptr);
DEBUG_ASSERT(!pChunk || pChunk->getIndex() == chunkIndex);
return pChunk;
}

void CachingReader::freshenChunk(CachingReaderChunkForOwner* pChunk) {
DEBUG_ASSERT(pChunk != nullptr);
DEBUG_ASSERT(pChunk->getState() != CachingReaderChunkForOwner::READ_PENDING);

// Remove the chunk from the LRU list
pChunk->removeFromList(&m_mruCachingReaderChunk, &m_lruCachingReaderChunk);

// Adjust the least-recently-used item before inserting the
// chunk as the new most-recently-used item.
if (m_lruCachingReaderChunk == nullptr) {
if (m_mruCachingReaderChunk == nullptr) {
m_lruCachingReaderChunk = pChunk;
} else {
m_lruCachingReaderChunk = m_mruCachingReaderChunk;
}
DEBUG_ASSERT(pChunk);
DEBUG_ASSERT(pChunk->getState() == CachingReaderChunkForOwner::READY);
if (kLogger.traceEnabled()) {
kLogger.trace()
<< "freshenChunk()"
<< pChunk->getIndex()
<< pChunk;
}

// Insert the chunk as the new most-recently-used item.
pChunk->insertIntoListBefore(m_mruCachingReaderChunk);
m_mruCachingReaderChunk = pChunk;
// Remove the chunk from the MRU/LRU list
pChunk->removeFromList(
&m_mruCachingReaderChunk,
&m_lruCachingReaderChunk);

// Reinsert has new head of MRU list
pChunk->insertIntoListBefore(
&m_mruCachingReaderChunk,
&m_lruCachingReaderChunk,
m_mruCachingReaderChunk);
}

CachingReaderChunkForOwner* CachingReader::lookupChunkAndFreshen(SINT chunkIndex) {
CachingReaderChunkForOwner* pChunk = lookupChunk(chunkIndex);
if (pChunk &&
(pChunk->getState() != CachingReaderChunkForOwner::READ_PENDING)) {
auto pChunk = lookupChunk(chunkIndex);
if (pChunk && (pChunk->getState() == CachingReaderChunkForOwner::READY)) {
freshenChunk(pChunk);
}
return pChunk;
Expand All @@ -184,15 +208,11 @@ void CachingReader::newTrack(TrackPointer pTrack) {
}

void CachingReader::process() {
ReaderStatusUpdate status;
while (m_readerStatusFIFO.read(&status, 1) == 1) {
CachingReaderChunkForOwner* pChunk = static_cast<CachingReaderChunkForOwner*>(status.chunk);
ReaderStatusUpdate update;
while (m_readerStatusFIFO.read(&update, 1) == 1) {
auto pChunk = update.takeFromWorker();
if (pChunk) {
// Take over control of the chunk from the worker.
// This has to be done before freeing all chunks
// after a new track has been loaded (see below)!
pChunk->takeFromWorker();
if (status.status == CHUNK_READ_SUCCESS) {
if (update.status == CHUNK_READ_SUCCESS) {
// Insert or freshen the chunk in the MRU/LRU list after
// obtaining ownership from the worker.
freshenChunk(pChunk);
Expand All @@ -201,20 +221,20 @@ void CachingReader::process() {
freeChunk(pChunk);
}
}
if (status.status == TRACK_NOT_LOADED) {
m_readerStatus = status.status;
} else if (status.status == TRACK_LOADED) {
m_readerStatus = status.status;
if (update.status == TRACK_NOT_LOADED) {
m_readerStatus = update.status;
} else if (update.status == TRACK_LOADED) {
m_readerStatus = update.status;
// Reset the max. readable frame index
m_readableFrameIndexRange = status.readableFrameIndexRange();
m_readableFrameIndexRange = update.readableFrameIndexRange();
// Free all chunks with sample data from a previous track
freeAllChunks();
}
if (m_readerStatus == TRACK_LOADED) {
// Adjust the readable frame index range after loading or reading
m_readableFrameIndexRange = intersect(
m_readableFrameIndexRange,
status.readableFrameIndexRange());
update.readableFrameIndexRange());
} else {
// Reset the readable frame index range
m_readableFrameIndexRange = mixxx::IndexRange();
Expand All @@ -230,9 +250,10 @@ CachingReader::ReadResult CachingReader::read(SINT startSample, SINT numSamples,
// Refuse to read from an invalid number of samples
(numSamples % CachingReaderChunk::kChannels == 0) && (numSamples >= 0)) {
kLogger.critical()
<< "read() invalid arguments:"
<< "Invalid arguments for read():"
<< "startSample =" << startSample
<< "numSamples =" << numSamples;
<< "numSamples =" << numSamples
<< "reverse =" << reverse;
return ReadResult::UNAVAILABLE;
}
VERIFY_OR_DEBUG_ASSERT(buffer) {
Expand Down Expand Up @@ -283,10 +304,12 @@ CachingReader::ReadResult CachingReader::read(SINT startSample, SINT numSamples,
remainingFrameIndexRange.start(),
m_readableFrameIndexRange.start());
DEBUG_ASSERT(prerollFrameIndexRange.length() <= remainingFrameIndexRange.length());
kLogger.debug()
<< "Prepending"
<< prerollFrameIndexRange.length()
<< "frames of silence";
if (kLogger.traceEnabled()) {
kLogger.trace()
<< "Prepending"
<< prerollFrameIndexRange.length()
<< "frames of silence";
}
const SINT prerollFrames = prerollFrameIndexRange.length();
const SINT prerollSamples = CachingReaderChunk::frames2samples(prerollFrames);
DEBUG_ASSERT(samplesRemaining >= prerollSamples);
Expand Down Expand Up @@ -475,27 +498,33 @@ void CachingReader::hintAndMaybeWake(const HintVector& hintList) {
const int lastChunkIndex = CachingReaderChunk::indexForFrame(readableFrameIndexRange.end() - 1);
for (int chunkIndex = firstChunkIndex; chunkIndex <= lastChunkIndex; ++chunkIndex) {
CachingReaderChunkForOwner* pChunk = lookupChunk(chunkIndex);
if (pChunk == nullptr) {
if (!pChunk) {
shouldWake = true;
pChunk = allocateChunkExpireLRU(chunkIndex);
if (pChunk == nullptr) {
kLogger.warning() << "ERROR: Couldn't allocate spare CachingReaderChunk to make CachingReaderChunkReadRequest.";
if (!pChunk) {
kLogger.warning()
<< "Failed to allocate chunk"
<< chunkIndex
<< "for read request";
continue;
}
// Do not insert the allocated chunk into the MRU/LRU list,
// because it will be handed over to the worker immediately
CachingReaderChunkReadRequest request;
request.giveToWorker(pChunk);
// kLogger.debug() << "Requesting read of chunk" << current << "into" << pChunk;
// kLogger.debug() << "Requesting read into " << request.chunk->data;
if (kLogger.traceEnabled()) {
kLogger.trace()
<< "Requesting read of chunk"
<< request.chunk;
}
if (m_chunkReadRequestFIFO.write(&request, 1) != 1) {
kLogger.warning() << "ERROR: Could not submit read request for "
<< chunkIndex;
kLogger.warning()
<< "Failed to submit read request for chunk"
<< chunkIndex;
// Revoke the chunk from the worker and free it
pChunk->takeFromWorker();
freeChunk(pChunk);
}
//kLogger.debug() << "Checking chunk " << current << " shouldWake:" << shouldWake << " chunksToRead" << m_chunksToRead.size();
} else if (pChunk->getState() == CachingReaderChunkForOwner::READY) {
// This will cause the chunk to be 'freshened' in the cache. The
// chunk will be moved to the end of the LRU list.
Expand Down
1 change: 1 addition & 0 deletions src/engine/cachingreader/cachingreader.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ class CachingReader : public QObject {

// Returns a CachingReaderChunk to the free list
void freeChunk(CachingReaderChunkForOwner* pChunk);
void freeChunkFromList(CachingReaderChunkForOwner* pChunk);

// Returns all allocated chunks to the free list
void freeAllChunks();
Expand Down
Loading

0 comments on commit bdc87af

Please sign in to comment.