| Commit message (Collapse) | Author | Files | Lines |
|---|
|
This allows clients to see sorted results while we're
updating the DB and removes the need for us to have
to sort manually.
We'll have to write separate routines for managing stored
playlists with songvecs eventually; but that's for another day.
|
|
mpd can't function without music_root; so don't bother
allocating it on the heap nor checking to see if it's
initialized.
Don't allow directory_new() to create a directory w/o a parent
or with an empty path, either: root is root and there can
be only one</highlander>.
|
|
Duplicated tokens in close proximity takes too long for my head
to parse; and "dir" is an easy and common abbreviation for
"directory".
|
|
The documentation for directory_update_init() was incorrect: a job ID
must be positive, not non-negative. If the update queue is full and
no job was created, it makes more sense to return 0 instead of -1,
because it is more consistent with the return value of isUpdatingDB().
|
|
If the user requests database update during startup, call
directory_update_init(). This should be changed to fully asynchronous
update later.
For this to work, main_notify has to be initialized before db_init().
|
|
Remove clutter from directory.c. Everything which saves or loads
to/from the hard disk goes to directory_save.c, and code which sends
directory information to the client is moved into directory_print.c.
|
|
Use sizeof(buffer) instead.
|
|
Removed a superfluous closure.
|
|
For the root directory, let's set path to an empty string. This saves
a few checks.
|
|
CamelCase is ugly, rename the functions.
[ew: "directory_get_directory" was too confusing, using
"directory_get_subdir" instead (old function was named
"getSubDirectory")]
|
|
Yet another CamelCase removal patch.
|
|
The same can be achieved with directory_print(db_get_directory()).
|
|
Taming the directory.c monster, part II: move the database management
stuff to database. directory.c should only contain code which works
on directory objects.
|
|
The function isRootDirectory() is tiny and can be converted to an
inline function. Don't allow name==NULL.
|
|
CamelCase is ugly... rename all functions.
|
|
Again, a data type which can be forward-declared.
[ew:
* used "struct mpd_song" instead to avoid token duplication
(like I did with "struct mpd_tag") as there's no good
abbreviation for "song" and identical tokens on the same
line don't read well
* rewritten using
perl -i -p -e 's/\bSong\b/struct mpd_song/g' src/*.[ch]
since it was too hard to merge
* also, I don't care much for forward declarations
]
|
|
The struct can be forward-declared by other headers, which relaxes the
header dependencies.
|
|
exploreDirectory() duplicates some code in updateDirectory(). Merge
both functions, and use directory_is_empty() to determine whether
update or explore mode should be used.
|
|
directory_is_empty() is a tiny inline function which determine if a
directory has any child objects (sub directories or songs).
|
|
The source directory.c mixes several libraries: directory object
management, database management and database update, resulting in a
1000+ line monster. Move the whole database update code to update.c.
|
|
oops :x
|
|
This makes the update code thread-safe and doesn't penalize
the playlist code by complicating it with complicated and
error-prone locks (and the associated overhead, not everybody
has a thread-implementation as good as NPTL).
The update task blocks during the delete; but the update task is
a slow task anyways so we can block w/o people caring too much.
This was also our only freeSong call site, so remove that
function.
Note that deleting entire directories is not fully thread-safe,
yet; as their traversals are not yet locked.
|
|
Get rid of songvec_write so we can enforce proper locking
|
|
Being consistent with most UNIX functions...
|
|
song objects cannot exist without a path or URL
|
|
We already know if a song is a URL or not based on whether it
has parentDir defined or not. Hopefully one day in the future
we can drop HTTP support from MPD entirely when an HTTP
filesystem comes along and we can access streams via open(2).
|
|
Reduce the number of allocations we make, so there's less
pressure on the allocator and less overhead to keep track
of the allocations in.
|
|
Wow, I must have been halfway asleep when I did that...
|
|
Instead of allocating a new one, just reuse an existing
one if one is found when rereading the DB. This is a small
makes the previous commit work on subdirectories
of the root music directory.
[1] "song: better handling of existing songs when rereading DB"
|
|
Now the "update" command can be issued multiple times regardless
of whether the client is in list mode or not.
We serialize the update tasks to prevent updates from trampling
over each other and will spawn another update task
once the current one is finished updating and reaped.
Right now we cap the queue size to 32 which is probably enough (I
bet most people usually run update with no argument anyways);
but we can make it grow/shrink dynamically if needed. There'll
still be a hard-coded limit to prevent DoS attacks, though.
|
|
Instead of relying on the shortname, just pass the song pointer
to prevent redundant lookups during deletes.
|
|
We already sanitize and duplicated our paths before calling
updateInit() to get pre-pthread_create() error-checking along
with heap allocation reduction because we don't have to redupe
because our parent stack went away.
|
|
Remove yet another use of our old malloc-happy linked list
implementation and replace it with a simple array of strings.
This also implements more eager error handling of invalid
paths (still centralized in updateInit) so we can filter out
bad paths before we spawn a thread.
This also does its part to fix the "update" command inside list mode
which lost its static variable in
ada24f9a921ff95d874195acf253b5a9dd12213d (although it was broken and
requires the fix in 769939b62f7557f8e7c483223d68a8b39af43e37, too).
|
|
Move error reporting to command.c so directory.c does not deal
with client error handling any more.
|
|
Improving the signal to noise ratio...
|
|
If a write failed, it's a good sign subsequent writes will fail,
too, so propgate errors all the way up the stack.
|
|
A long time ago in an mpd far away...
|
|
MPD has supported more audio formats than just MP3
for over five years...
|
|
It was a huge confusing mess of parameter passing around
and around. Add a few extra assertions to ensure we're
handling parent/child relationships properly.
|
|
Small memory reduction compared to songvec since most users have
much fewer dirs than songs, but still nice to have.
|
|
We no longer for for updates
|
|
"free" implies the songvec structure itself is freed,
which is not the case.
|
|
|
|
If we updated the mpd metadata database; then there's a chance
some of those songs in the playlist will have updated metadata.
So be on the safe side and increment the playlist version number
if _any_ song changed (this is how all released versions of mpd
did it, too).
This bug was introduced recently when making "update" threaded.
Thanks to stonecrest for the bug report.
|
|
This reverts commit efefaee1f9535012be2fbfea8f0f870904daad5d.
Conflicts:
src/directory.c
|
|
|
|
Use freeList() instead of free() to free all elements in
the list.
|
|
It's possible the playlist will be accessing a song that is to
be freed in the update thread. Rather than going through the
complexity (and potential to make mistakes) of locking the
playlist (as well as losing CPU cycles/pipelining due to
barriers with mutexes), we'll just line up all songs to
be freed in the main thread.
It's relatively uncommon to call freeSong() heavily (as it is to
update); so the extra, temporary memory usage won't be very
noticeable.
Additionally, if a song is renamed and it contains unique tag
item; this has the additional side effect of preventing
unnecessary fragmentation where an item is freed and shortly
reallocated.
|
|
open(2) should only interrupt on "slow" devices, afaik...
|
|
|
