| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Return an "enum playlist_result" value instead of calling
commandError() in storedPlaylist.c.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The playlist library shouldn't talk to the client if possible.
Introduce the "enum playlist_result" type which the caller
(i.e. command.c) may use to generate an error message.
|
| | | |
| | | |
| | | |
| | | | |
Make them both return void.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Client's input values should be validated by the command
implementation, and the core libraries shouldn't talk to the client
directly if possible. Thus, setPlaylistRepeatStatus() and
setPlaylistRandomStatus() don't get the file descriptor, and cannot
fail (return void).
|
| | | |
| | | |
| | | |
| | | |
| | | | |
When an error occurs after the file has been opened, the function will
never close the FILE object.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The "fspath" argument of writeStoredPlaylistToPath() must never be
NULL. There should be an assertion on that, instead of a run-time
check.
[ew: fspath => utf8path]
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The function valid_playlist_name() checks the name, but it insists on
reporting an eventual error to the client. The new function
is_valid_playlist_name() is more generic: it just returns a boolean,
and does not care what the caller will use it for. The old function
valid_playlist_name() will be removed later.
|
| | | |
| | | |
| | | |
| | | | |
The usual bunch of const pointer conversions.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Instead of letting ALSA block for us (and potentially allowing
something stupid on certain hardware or drivers), we do the
sleeping ourselves. We calculate the sleep to be a fraction of
period_time to avoid oversleeping (and thus audible skipping).
|
|\ \ \ \
| | |/ /
| |/| |
| | | |
| | | |
| | | |
| | | | |
* mk/strset:
use strset.h instead of tagTracker.h
strset: fix duplicate values
added string set library
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
With a large music database, the linear string collection in
tagTracker.c becomes very slow. We implemented that in a
quick'n'dirty fashion when we removed tree.c, and now we rewrite it
using the fast hashed string set.
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Due to a minor typo, the string set had duplicate values, because
strset_add() didn't check the base slot properly.
|
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
"struct strset" is a hashed string set: you can add strings to this
library, and it stores them as a set of unique strings. You can get
the size of the set, and you can enumerate through all values.
This will be used to replace the linear tagTracker library.
|
|/ /
| |
| |
| |
| | |
The writer can be far ahead of the reader during HTTP stalls; so
stop spamming the logs with this message.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The way we used non-blocking mode was HORRIBLE.
It was non-blocking to ALSA, but we end up blocking in a busy
loop that does absolutely NOTHING but retry. We don't check
for playback cancellation (like we do in decoders) or anything.
This is seriously broken and I can imagine it affects people on
fast CPUs more because we do asynchronous output buffering and
our ALSA device will always have data ready.
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Print out {buffer,period}_{size,time}. Not sure if this
is going to help. I've been searching everywhere looking
for a possible clue as to what's causing the high CPU
usage problems...
Also, add device information to some messages I missed earlier.
|
| | |
|
| |
| |
| |
| |
| | |
Lets not use deprecated functions. It's apparently
possible to not care about the sw_params stuff at all!
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This is safer than the patch in
http://www.musicpd.org/mantis/view.php?id=1542
with multiple audio outputs enabled.
Sadly, I only noticed that patch/problem when I googled for
"snd_config_update_free_global"
|
| | |
|
| | |
|
| | |
|
| |
| |
| |
| |
| | |
We never use it for anything anyways as we release the device
entirely on pause.
|
| |
| |
| |
| | |
This saves me precious terminal space
|
| | |
|
| |
| |
| |
| | |
That's the name of this project.
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | | |
* ew/alsa:
alsa: optimistically try resuming from suspend
alsa: extra debugging outputs to fix suspend/hibernate
alsa: cleanup debug assignment of the "cmd" variable
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Apparently snd_pcm_hw_params_can_resume() can return false even
though my hardware does in fact support resuming. So stop
carrying that value in the canResume flag and just try to resume
when we're in the suspended state; falling back to
snd_pcm_prepare only if resuming fails. libao does something
similar on resume, too.
While we're at it, use the E() macro which will enable us to
have better error reporting.
|
| | |
| | |
| | |
| | |
| | |
| | | |
Hibernating my laptop while MPD is playing results in ugliness
about "alsa device foo was suspend" constantly printed to the
logs.
|
| | |
| | |
| | |
| | |
| | | |
Given the length of the ALSA command names, I only want
to see them once per-section of code, if at all...
|
|/ /
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
When random is enabled and a user explicitly specifies
a certain song on the playlist should be played; we need
to re-randomize the internal ordering.
To reproduce this, assuming a four song playlist:
play <song_a>
next => <song_b>
next => <song_c>
next => <song_d>
play <song_a>
next => <song_b>
next => <song_c>
next => <song_d>
...
That is, the "next" command restarts song_{b,c,d} the second
time "play" starts playing song_a.
Thus, the second time "play" is called, the ordering of
song_{b,c,d} needs to be reshuffled.
Reported-by: Qball
|
| |
| |
| |
| |
| |
| | |
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.
|
|\ \
| | |
| | |
| | |
| | |
| | | |
* ew/tag-threadsafe:
tag: lock all accesses to tag_pool
tag: introduce handy items_size() function
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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.
|