| Commit message (Collapse) | Author | Files | Lines |
|
Pass a callback and argument to it instead of requiring
explicit type.
|
|
Our beefier directory_free takes care of it now
in the main task.
|
|
Only call this in the main thread; it is NOT thread
safe and not designed to be.
|
|
We only delete directory object in the main thread to
prevent access to individual elements (mainly path).
|
|
It's actually possible to have a traverser accessing a song
while we're freeing it in the main thread, as the songvec
iterators don't lock the individual elements.
|
|
Like the songvec nr_lock, only one lock is used for all
traversals since they're rarely changed. This only
projects traversals, but not the individual structures
themselves.
|
|
This way we can introduce locking to allow safe traversals from
the main thread while we're updating.
|
|
This will make it easier to introduce locking
|
|
We only need to lock sv->nr changes to prevent traversals ( why
it's called "nr_lock"). free(3) is a "slow" function on my
system; so we can avoid unnecessarily holding a lock long for
longer than needed.
|
|
Previously only updates with subdirectories being
specified could be queued. No harm in queueing
full updates.
|
|
If update_task was called with "" as its path argument, that
string would never get freed because it false positived.
Instead, never pass "" to update_task and trip an assertion
if we do.
|
|
down with camelCase!
|
|
There is only one music_root and we can just compare
addresses.
|
|
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>.
|
|
This way we avoid unnecessary heap allocations.
|
|
Not all compilers support struct packing, and those that don't
shouldn't be punished for it.
|
|
This can potentially save a few bytes on 64-bit
architectures and makes it more obvious what
we're doing.
|
|
This can save a few bytes here on newer gcc and there and will
hopefully make it more obvious what we're doing with
that last struct element
|
|
Duplicated tokens in close proximity takes too long for my head
to parse; and "dir" is an easy and common abbreviation for
"directory".
|
|
There is only once update thread at a time. Make the "modified" flag
global and remove the return values of most functions. Propagating an
error is only useful for updateDirectory(), since updateInDirectory()
will delete failed subdirectories.
|
|
|
|
When a song file was not modified, MPD printed the debug message "not
a directory or music", because the first "if" branch did not return.
|
|
When the update queue is full, directory_update_init() did not free
the path argument.
|
|
Since the return value cannot be -1 anymore, we can make it unsigned.
|
|
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().
|
|
When the update task is idle, there is no need to check for deleted
songs. Return early from reap_update_task().
|
|
pthread_join() expects a "pointer to a pointer" parameter, but it got
a "pointer to an enum". On AMD64, an enum is smaller than a pointer,
leading to a buffer overflow.
|
|
Removed the local variable "was_empty": don't remember if the
directory is new. Always call removeDeletedFromDirectory().
|
|
In updateInDirectory(), add new directories immediately and
delete them when they turn out to be empty. This simplifies the code
and allows us to eliminate addSubDirectoryToDirectory().
|
|
|
|
The recursive checks were performed in several functions, and
sometimes a directory was checked twice.
|
|
When reading a new directory, copy the stat data (which we have
anyway) to the directory struct. This may save a stat() in the
future.
|
|
Pass a pointer to the stat struct to more functions.
|
|
updatePath() duplicated a lot of code from the more generic
updateInDirectory(). Eliminate most of updatePath() and call
updateInDirectory().
|
|
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().
|
|
The stat struct isn't going to be modified, make it const.
|
|
update_task() already checks if it has got a root path. Extend this
check and in turn remove a check in the inner function updatePath().
|
|
The algorithm in addDirectoryPathToDB() can be simplified further if
it is combined with the function addParentPathToDB(). Since there is
no other caller of addDirectoryPathToDB(), we can do that. This saves
another large stack buffer.
|
|
This recursive function is very dangerous because it allocates a large
buffer on the stack in every iteration. That may be misused to
generate a stack overflow.
|
|
When a directory cannot be updated, there must be something wrong with
it, and the database contains stale data. Remove it.
|
|
The branching looks a bit complicated in addDirectoryPathToDB() -
improve its readability by moving code to a simplified separate
function.
|
|
When the root directory fails to update, its contents are invalid.
Clear it then.
|
|
When a directory failed to update, it was removed from the database,
without freeing all children and songs (memory leak), and without
locking (race condition). Introduce the functions clear_directory()
and delete_directory(), which do both.
|
|
|
|
Use updateInDirectory() instead of addToDirectory(). Eliminate a
duplicate stat() in updateInDirectory() by calling song_file_update()
directly.
|
|
Don't use db_get_directory() and traverse the full path with every
directory being loaded. Just see if the current parent contains the
entry. Everything else would be invalid anyway..
|
|
A manipulated database could trigger an assertion failure, because the
parent didn't match. Do a proper check if the new directory is within
the parent's. This uses FATAL() to bail out, so MPD still dies, but
it doesn't crash.
|
|
Some tiny utilities... wrappers like these may become helpful when we
introduce locking.
|
|
dirvec_find() does not modify the object, thus it should get a const
pointer.
|
|
No idea why it was created in directory.h, but it should be in
dirvec.h.
|