| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
| |
| |
| |
| |
| |
| | |
Gah, it seems like doing sizeof here either way is error
prone. Too easy to leave out a '*' character we can
forget.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
volatile provides absolutely no guarantee thread-safety in SMP
environments. volatile was designed to access memory locations
in peripheral hardware directly; not for SMP. If volatile is
needed to work properly on SMP, then it is only hiding subtle
bugs.
volatile only prevents the /compiler/ from making optimizations
when accessing variables. CPUs do their own optimizations at
runtime so it cannot guarantee registers of CPUs are flushed
to memory cache-coherent access on different CPUs.
Furthermore, the thread-communication via condition variables
between threads sharing audio formats already results in memory
barriers.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The tag pool is a shared global resource that is infrequently
modified. However, it can occasionally be modified by several
threads, especially by the metadata_pipe for streaming metadata
(both reading/writing).
The bulk tag_item pool is NOT locked as currently only the
update thread uses it.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Trying to read or remember
"tag->numOfItems * sizeof(*tag->items)"
requires too much thinking and mental effort on my part.
Also, favor "sizeof(struct mpd_tag)" over "sizeof(*tag->items)"
because the former is easier to read and follow, even though
the latter is easier to modify if the items member changes
to a different type.
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* mk/tag: (22 commits)
tag: fix segfault on update
utf8.h: Fix build (broken os_compat.h #include)
tag: optimize tag_dup(), copy item references
tag: fix the shout and oggflac plugins
const pointers
tag: static directory name
tag: try not to reallocate tag.items in every add() call
song: don't export newNullSong()
tag: try not to duplicate the input string
tag: pass length to fix_utf8()
added "length" parameter to validUtf8String()
assert value!=NULL in fix_utf8()
tag: converted macro fixUtf8() to an inline function
tag: added a pool for tag items
tag: converted tag_item.value to a char array
removed tree.c
tag: converted MpdTag.items to a pointer list
tag: moved code to tag_id3.c
wavpack: tag_new() cannot fail
tag: converted tag_add_item() to an inline function
...
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
clearMpdTag could be called on a tag that was still in a
tag_begin_add transaction before tag_end_add is called. This
was causing free() to attempt to operate on bulk.items; which is
un-free()-able. Now instead we unmark the bulk.busy to avoid
committing the tags to the heap only to be immediately freed.
Additionally, we need to remember to call tag_end_add() when
a song is updated before we NULL song->tag to avoid tripping
an assertion the next time tag_begin_add() is called.
|
| | |
| | |
| | |
| | | |
This is not a system header
|
| | |
| | |
| | |
| | |
| | | |
Don't call tag_pool_get_item() for duplicating tags, just increase the
item's reference counter instead.
|
| | |
| | |
| | |
| | |
| | |
| | | |
During the tag library refactoring, the shout plugin was disabled, and
I forgot about adapting it to the new API. Apply the same fixes to
the oggflac decoder plugin.
|
| | |
| | |
| | |
| | | |
Yet another patch which converts pointer arguments to "const".
|
| | |
| | |
| | |
| | |
| | |
| | | |
While parsing the tag cache, don't allocate the directory name from
the heap, but copy it into a buffer on the stack. This reduces heap
fragmentation by 1%.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
If many tag_items are added at once while the tag cache is being
loaded, manage these items in a static fixed list, instead of
reallocating the list with every newly created item. This reduces
heap fragmentation.
Massif results again:
mk before: total 12,837,632; useful 10,626,383; extra 2,211,249
mk now: total 12,736,720; useful 10,626,383; extra 2,110,337
The "useful" value is the same since this patch only changes the way
we allocate the same amount of memory, but heap fragmentation was
reduced by 5%.
|
| | |
| | |
| | |
| | | |
The function newNullSong() is only used internally in song.c.
|
| | |
| | |
| | |
| | |
| | |
| | | |
Try to detect if the string needs Latin1-UTF8 conversion, or
whitespace cleanup. If not, we don't need to allocate temporary
memory, leading to decreased heap fragmentation.
|
| | |
| | |
| | |
| | | |
Same as the previous patch, prepare the function fix_utf8() this time.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
At several places, we create temporary copies of non-null-terminated
strings, just to use them in functions like validUtf8String(). We can
save this temporary allocation and avoid heap fragmentation if we
add a length parameter instead of expecting a null-terminated string.
|
| | |
| | |
| | |
| | |
| | | |
We must never pass value==NULL to fix_utf(). Replace the run-time
check with an assertion.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Since the inline function cannot modify its caller's variables (which
is a good thing for code readability), the new string pointer is the
return value. The resulting binary should be the same as with the
macro.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The new source tag_pool.c manages a pool of reference counted tag_item
objects. This is used to merge tag items of the same type and value,
saving lots of memory. Formerly, only the value itself was pooled,
wasting memory for all the pointers and tag_item structs.
The following results were measured with massif. Started MPD on
amd64, typed "mpc", no song being played. My music database contains
35k tagged songs. The results are what massif reports as "peak".
0.13.2: total 14,131,392; useful 11,408,972; extra 2,722,420
eric: total 18,370,696; useful 15,648,182; extra 2,722,514
mk f34f694: total 15,833,952; useful 13,111,470; extra 2,722,482
mk now: total 12,837,632; useful 10,626,383; extra 2,211,249
This patch set saves 20% memory, and does a good job in reducing heap
fragmentation.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The value is stored in the same memory allocation as the tag_item
struct; this saves memory because we do not store the value pointer
anymore. Also remove the getTagItemString()/removeTagItemString()
dummies.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This patch makes MPD consume much more memory because string pooling
is disabled, but it prepares the next bunch of patches. Replace the
code in tagTracker.c with naive algorithms without the tree code. For
now, this should do; later we should find better algorithms,
especially for getNumberOfTagItems(), which has become wasteful with
temporary memory.
|
| | |
| | |
| | |
| | |
| | |
| | | |
This prepares the following patches, which aim to reduce MPD's memory
usage: we plan to share tag_item instances, instead of just their
values.
|
| | |
| | |
| | |
| | |
| | | |
The ID3 code uses only the public tag API, but is otherwise
unrelated. Move it to a separate source file.
|
| | |
| | |
| | |
| | |
| | | |
Since tag_new() uses xmalloc(), it cannot fail - if we're really out
of memory, the process will abort.
|
| | | |
|
| | | |
|
| | |
| | |
| | |
| | |
| | | |
Getting rid of CamelCase; not having typedefs also allows us to
forward-declare the structures.
|
| | | |
|
| | | |
|
|/ / |
|
|\ \
| | |
| | |
| | |
| | |
| | | |
* ew/deconst:
use deconst_ptr instead of duplicating deconst logic
provide a generic deconst_ptr function
|
| | | |
|
| |/
| |
| |
| |
| |
| |
| |
| |
| | |
This is generic enough to be used for various purposes. It will
only deconst their argument to work around various braindead
APIs without having to write a new wrapper each time we use one
of those braindead APIs. It does not cast nor do do anything
other than quietly remove the const qualifier for those
braindead APIs.
|
|/
|
|
|
|
|
|
|
|
| |
Previously we were using a naive randomization algorithm that
could shuffle already shuffled songs. Now we attempt to
correctly[1] implement the Fisher-Yates shuffle.
[1] Note: I absolutely suck at basic arithmetic, so there could
be off-by-one errors in here, too. I've added assertions in
swapSongs and swapOrder functions to more quickly detect them.
|
|
|
|
|
| |
Otherwise we'd be writing to whatever directory that mpd is
running in.
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* mk/cleanups: (60 commits)
pass constant pointers
const pointers
unsigned integers and size_t
oggflac: fix GCC warnings
include cleanup
protect locate.h from double inclusion
playlist: eliminate unused fd parameters
jack: made "sample_size" static const
moved jack configuration to the JackData struct
jack: removed unused macros
jack: don't set audioOutput->data=NULL
jack: initialize JackData in jack_initDriver()
jack: added freeJackClient()
jack: initialize jd->client after !jd check
jack: eliminate superfluous freeJackData() calls
mp3: converted the MUTEFRAME_ macros to an enum
mp3: converted the DECODE_ constants to an enum
wavpack: don't use "isp" before initialization
wavpack: moved code to wavpack_open_wvc()
simplified code in the ogg decoder plugin
...
|
| |
| |
| |
| | |
And again, convert arguments to const.
|
| |
| |
| |
| | |
The usual bunch of pointer arguments which should be const.
|
| |
| |
| |
| |
| | |
Use "unsigned int" whenever negative values are not meaningful. Use
size_t whenever we are going to describe buffer sizes.
|
| |
| |
| |
| |
| |
| | |
Fix lots of "unused parameter" warnings in the OggFLAC decoder
plugin. Not sure if anybody uses it anymore, since newer libflac
obsoletes it.
|
| |
| |
| |
| | |
Only include headers which are really needed.
|
| | |
|
| |
| |
| |
| |
| | |
Again, remove file descriptor parameters, which are not actually
used. These functions can also be converted to return void.
|
| |
| |
| |
| |
| | |
sample_size is a variable which is computed at compile time. Declare
it "static const", so the compiler can optimize it away.
|
| |
| |
| |
| |
| |
| | |
Storing local configuration in global (static) variables is obviously
a bad idea. Move all those variables into the JackData struct,
including the locks.
|
| | |
|
| |
| |
| |
| |
| |
| |
| | |
There is only one caller of freeJackData() left: jack_finishDriver().
This function is called by the mpd core, and is called exactly once
for every successful jack_initDriver(). We do not need to clear
audioOutput->data, since this variable is invalidated anyway.
|
| |
| |
| |
| |
| |
| |
| |
| | |
Over the lifetime of the jack AudioOutput object, we want a single
valid JackData object, so we can persistently store data there
(configuration etc.). Allocate JackData in jack_initDriver(). After
that, we can safely remove all audioOutput->data==NULL checks (and
replace them with assertions).
|
| |
| |
| |
| |
| |
| |
| | |
No need to destroy the JackData object when an error occurs, since
jack_finishDriver() already frees it. Only deinitialize the jack
library, introduce freeJackClient() for that, and move code from
freeJackData().
|
| |
| |
| |
| |
| |
| | |
Prepare the next patch: make the "!jd" check independent of the
jd->client initialization. This way we can change the "jd"
initialization semantics later.
|