aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Revert "directory: avoid magic in directory_walk"ericEric Wong2008-10-131-20/+13
| | | | | | | | | | | This reverts commit 65688ec9e8841fb11c166d3e480dbada01d99746. That change introduced a new bug that I'm too sleepy to fix at the moment. I got too giddy after making e5c604feac962f654ba2cb7739ef33b9242cb072 that I immediately broke it differently again :) Perhaps I should start sleeping more than 3 hours a night...
* playlist: fix setting of randomEric Wong2008-10-131-1/+1
| | | | | | | | Noticed-by: Qball I mismerged 4a510a26744a78696f0c69713bf3b05881175fef in commit 5f15ba96cf5fa641d34d4e98ae8e0972fa6fef0c "playlist: simplified setPlaylistRandomStatus()
* directory: avoid magic in directory_walkEric Wong2008-10-131-13/+20
| | | | | magically changing what directory_walk does based on a particular function pointer it got passed is bad.
* {dir,song}vec: remove unused *_destroy routinesEric Wong2008-10-134-31/+0
| | | | | | | Blindly destroying these without freeing the underlying elements was a bad idea, always. Our iterators suck less nowadays and we can traverse them and free() each element safely.
* directory: fix directory_free() braindamageEric Wong2008-10-131-13/+19
| | | | | | | | Recursively calling directory_walk leads to double-free()s causing nasty assertion errors and segfaults when directories are deleted or at exit. This is now Valgrind clean.
* {dir,song}vec: fix off-by-one errors in {dir,song}vec_deleteEric Wong2008-10-122-16/+18
| | | | | | | Found by Valgrind while looking for another bug... Hmm.. I should really just make this code generic since they're duplicated...
* {dir,song}vec: these structs are constEric Wong2008-10-122-2/+2
| | | | We definitely don't modify them here.
* Merge branch 'ew/directory'Eric Wong2008-10-1217-179/+230
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ew/directory: (21 commits) update: fix multiple deletes from *vec iterators directory: children leave parents before being free()ed directory: always maintain sorted properties vectors update: simplify the serialized_delete usage a bit update: remove delete_each_song and clear_directory directory: directory_free kills all that it contains update: serialize directory deletions update: serialize song_free in main thread dirvec: introduce locking for all iterators dirvec: use dirvec_for_each where it makes sense dirvec: add dirvec_for_each iterator songvec: avoid holding nr_lock during free(3) update: allow music_root updates to be queued update: validate in command.c and fix small memory leak directory: rename isRootDirectory => path_is_music_root Avoid calling isRootDirectory when we have a directory object directory: make music_root global and avoid runtime initialization directory: use mpd_sizeof_str_flex_array for path, too tag_item: avoid wasting space when struct is unpackable song: use mpd_sizeof_str_flex_array for song.url ... [ew: fixed up merge errors with myself when isRootDirectory went away]
| * update: fix multiple deletes from *vec iteratorsEric Wong2008-10-122-2/+10
| | | | | | | | | | | | | | | | | | | | | | {song,dir}vec_for_each each failed to gracefully handle deleted files when iterating through. While we were thread-safe, we were not safe within the calling thread. If a callback we passed caused sv->nr to shring, our index would still increment; causing files to stay in the database. A way to test this is to remove 10 or so contiguous songs from a >10 song directory.
| * directory: children leave parents before being free()edEric Wong2008-10-121-1/+4
| | | | | | | | | | This prevents double-free()s when doing teardown of a directory.
| * directory: always maintain sorted properties vectorsEric Wong2008-10-127-41/+12
| | | | | | | | | | | | | | | | | | 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.
| * update: simplify the serialized_delete usage a bitEric Wong2008-10-121-20/+17
| | | | | | | | | | Pass a callback and argument to it instead of requiring explicit type.
| * update: remove delete_each_song and clear_directoryEric Wong2008-10-121-21/+3
| | | | | | | | | | Our beefier directory_free takes care of it now in the main task.
| * directory: directory_free kills all that it containsEric Wong2008-10-121-0/+14
| | | | | | | | | | Only call this in the main thread; it is NOT thread safe and not designed to be.
| * update: serialize directory deletionsEric Wong2008-10-121-11/+28
| | | | | | | | | | We only delete directory object in the main thread to prevent access to individual elements (mainly path).
| * update: serialize song_free in main threadEric Wong2008-10-121-3/+1
| | | | | | | | | | | | 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.
| * dirvec: introduce locking for all iteratorsEric Wong2008-10-121-7/+29
| | | | | | | | | | | | | | 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.
| * dirvec: use dirvec_for_each where it makes senseEric Wong2008-10-123-52/+65
| | | | | | | | | | This way we can introduce locking to allow safe traversals from the main thread while we're updating.
| * dirvec: add dirvec_for_each iteratorEric Wong2008-10-122-0/+19
| | | | | | | | This will make it easier to introduce locking
| * songvec: avoid holding nr_lock during free(3)Eric Wong2008-10-121-3/+5
| | | | | | | | | | | | | | 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.
| * update: allow music_root updates to be queuedEric Wong2008-10-121-3/+2
| | | | | | | | | | | | Previously only updates with subdirectories being specified could be queued. No harm in queueing full updates.
| * update: validate in command.c and fix small memory leakEric Wong2008-10-122-6/+17
| | | | | | | | | | | | | | | | 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.
| * directory: rename isRootDirectory => path_is_music_rootEric Wong2008-10-123-6/+6
| | | | | | | | down with camelCase!
| * Avoid calling isRootDirectory when we have a directory objectEric Wong2008-10-124-6/+6
| | | | | | | | | | There is only one music_root and we can just compare addresses.
| * directory: make music_root global and avoid runtime initializationEric Wong2008-10-124-34/+21
| | | | | | | | | | | | | | | | | | | | 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>.
| * directory: use mpd_sizeof_str_flex_array for path, tooEric Wong2008-10-122-8/+9
| | | | | | | | This way we avoid unnecessary heap allocations.
| * tag_item: avoid wasting space when struct is unpackableEric Wong2008-10-122-2/+4
| | | | | | | | | | Not all compilers support struct packing, and those that don't shouldn't be punished for it.
| * song: use mpd_sizeof_str_flex_array for song.urlEric Wong2008-10-121-2/+2
| | | | | | | | | | | | This can potentially save a few bytes on 64-bit architectures and makes it more obvious what we're doing.
| * gcc: define mpd_sizeof_str_flex_arrayEric Wong2008-10-121-0/+5
| | | | | | | | | | | | 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
* | song: song_get_url: fix "/" prefix for songs in music_rootEric Wong2008-10-121-1/+1
| |
* | song: fix up mismerge that broke songs in music_rootEric Wong2008-10-121-1/+1
|/
* Merge branch 'mk/directory'Eric Wong2008-10-1131-1298/+1471
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * mk/directory: (59 commits) directory: don't use identical struct and variable names update: replaced update_return with global "modified" flag update: make the variable "progress" static update: don't print debug message when song was not modified update: fix memory leak in directory_update_init() update: make the job id unsigned update: job ID must be positive update: check progress!=IDLE in reap_update_task() update: fixed stack corruption due to pthread_join() call updated: always call removeDeletedFromDirectory() update: eliminated addSubDirectoryToDirectory() update: make the "song" variable more local update: do the recursive directory check only once update: copy stat to new directory update: avoid duplicate stat() calls update: rewrote updatePath() using updateInDirectory() update: don't export updateDirectory() update: pass const pointer to addSubDirectoryToDirectory() update: never pass root path to updatePath() update: merged addDirectoryPathToDB() into addParentPathToDB() ... Conflicts: src/song.c
| * directory: don't use identical struct and variable namesEric Wong2008-10-1110-130/+128
| | | | | | | | | | | | Duplicated tokens in close proximity takes too long for my head to parse; and "dir" is an easy and common abbreviation for "directory".
| * update: replaced update_return with global "modified" flagMax Kellermann2008-10-111-68/+39
| | | | | | | | | | | | | | 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.
| * update: make the variable "progress" staticMax Kellermann2008-10-111-1/+1
| |
| * update: don't print debug message when song was not modifiedMax Kellermann2008-10-111-4/+5
| | | | | | | | | | 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.
| * update: fix memory leak in directory_update_init()Max Kellermann2008-10-111-1/+4
| | | | | | | | | | When the update queue is full, directory_update_init() did not free the path argument.
| * update: make the job id unsignedMax Kellermann2008-10-112-7/+7
| | | | | | | | Since the return value cannot be -1 anymore, we can make it unsigned.
| * update: job ID must be positiveMax Kellermann2008-10-114-10/+8
| | | | | | | | | | | | | | 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().
| * update: check progress!=IDLE in reap_update_task()Max Kellermann2008-10-111-0/+3
| | | | | | | | | | When the update task is idle, there is no need to check for deleted songs. Return early from reap_update_task().
| * update: fixed stack corruption due to pthread_join() callMax Kellermann2008-10-111-1/+3
| | | | | | | | | | | | 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.
| * updated: always call removeDeletedFromDirectory()Max Kellermann2008-10-111-3/+1
| | | | | | | | | | Removed the local variable "was_empty": don't remember if the directory is new. Always call removeDeletedFromDirectory().
| * update: eliminated addSubDirectoryToDirectory()Max Kellermann2008-10-111-27/+8
| | | | | | | | | | | | 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().
| * update: make the "song" variable more localMax Kellermann2008-10-111-2/+1
| |
| * update: do the recursive directory check only onceMax Kellermann2008-10-111-9/+6
| | | | | | | | | | The recursive checks were performed in several functions, and sometimes a directory was checked twice.
| * update: copy stat to new directoryMax Kellermann2008-10-111-1/+3
| | | | | | | | | | | | 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.
| * update: avoid duplicate stat() callsMax Kellermann2008-10-111-28/+38
| | | | | | | | Pass a pointer to the stat struct to more functions.
| * update: rewrote updatePath() using updateInDirectory()Max Kellermann2008-10-111-70/+19
| | | | | | | | | | | | updatePath() duplicated a lot of code from the more generic updateInDirectory(). Eliminate most of updatePath() and call updateInDirectory().
| * update: don't export updateDirectory()Max Kellermann2008-10-114-13/+20
| | | | | | | | | | | | | | | | 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().
| * update: pass const pointer to addSubDirectoryToDirectory()Max Kellermann2008-10-111-1/+1
| | | | | | | | The stat struct isn't going to be modified, make it const.
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-18 20:43:49 +0000