aboutsummaryrefslogtreecommitdiffstats
path: root/src/directory.c (follow)
Commit message (Collapse)AuthorAgeFilesLines
* directory: don't use identical struct and variable namesEric Wong2008-10-111-22/+22
| | | | | | Duplicated tokens in close proximity takes too long for my head to parse; and "dir" is an easy and common abbreviation for "directory".
* directory: added inline wrappers for accessing childrenMax Kellermann2008-10-111-1/+1
| | | | | Some tiny utilities... wrappers like these may become helpful when we introduce locking.
* diretory: moved code to directory_save.c, directory_print.cMax Kellermann2008-10-111-116/+0
| | | | | | 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.
* directory: path must not be NULLMax Kellermann2008-10-111-7/+7
| | | | | For the root directory, let's set path to an empty string. This saves a few checks.
* directory: eliminate CamelCaseMax Kellermann2008-10-111-20/+20
| | | | | | | | CamelCase is ugly, rename the functions. [ew: "directory_get_directory" was too confusing, using "directory_get_subdir" instead (old function was named "getSubDirectory")]
* database: renamed functions, "db_" prefix and no CamelCaseMax Kellermann2008-10-111-1/+1
| | | | Yet another CamelCase removal patch.
* directory: moved code to database.cMax Kellermann2008-10-111-312/+12
| | | | | | 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.
* directory: converted isRootDirectory() to an inline functionMax Kellermann2008-10-111-5/+5
| | | | | The function isRootDirectory() is tiny and can be converted to an inline function. Don't allow name==NULL.
* song: removed CamelCaseMax Kellermann2008-10-111-1/+1
| | | | CamelCase is ugly... rename all functions.
* song: converted typedef Song to struct songMax Kellermann2008-10-111-6/+6
| | | | | | | | | | | | | | | 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 ]
* directory: converted typedef Directory to struct directoryMax Kellermann2008-10-111-27/+30
| | | | | The struct can be forward-declared by other headers, which relaxes the header dependencies.
* update: merged exploreDirectory() into updateDirectory()Max Kellermann2008-10-111-1/+1
| | | | | | 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: added directory_is_empty()Max Kellermann2008-10-111-1/+1
| | | | | directory_is_empty() is a tiny inline function which determine if a directory has any child objects (sub directories or songs).
* directory: moved code to update.cMax Kellermann2008-10-111-560/+10
| | | | | | 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.
* directory: fix return value in removeDeletedFromDirectoryEric Wong2008-10-071-1/+1
| | | | oops :x
* directory: serialize song deletes from playlist during updateEric Wong2008-10-071-3/+27
| | | | | | | | | | | | | | | | 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.
* directory: use songvec_for_each for iteratorsEric Wong2008-10-071-30/+56
| | | | Get rid of songvec_write so we can enforce proper locking
* dbUtils/directory: traverseAllIn forEachSong returns -1 on errorEric Wong2008-10-071-12/+9
| | | | Being consistent with most UNIX functions...
* Assert if we don't have song or song->url setEric Wong2008-10-051-2/+2
| | | | song objects cannot exist without a path or URL
* song: stop storing song_typeEric Wong2008-10-051-1/+1
| | | | | | | 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).
* song: use flex arrays to store song->urlEric Wong2008-10-051-1/+1
| | | | | | 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.
* directory: fix writeDirectoryDBEric Wong2008-10-051-2/+4
| | | | Wow, I must have been halfway asleep when I did that...
* Merge commit 'box/song-locks' into ew/song-locksEric Wong2008-10-041-4/+9
|\ | | | | | | | | | | | | | | * commit 'box/song-locks-wip': directory: reuse existing directory if found on update song: better handling of existing songs when rereading DB tag: merge clearMpdTag into tag_free song: start avoiding race in updateSongInfo
| * directory: reuse existing directory if found on updateEric Wong2008-10-041-4/+9
| | | | | | | | | | | | | | | | | | 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"
* | directory: simplify list update handling logicEric Wong2008-10-031-59/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | directory: streamline deletesEric Wong2008-10-031-17/+15
|/ | | | | Instead of relying on the shortname, just pass the song pointer to prevent redundant lookups during deletes.
* directory: remove redundant sanitizePathDupEric Wong2008-09-291-15/+7
| | | | | | | 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.
* update: move path sanitation up the stack to avoid extra copiesEric Wong2008-09-291-12/+26
| | | | | | | | | | | | | | 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).
* clean up updateInit calling and error handlingEric Wong2008-09-281-8/+4
| | | | | Move error reporting to command.c so directory.c does not deal with client error handling any more.
* directory: isRootDirectory() is a one-linerEric Wong2008-09-281-4/+1
| | | | Improving the signal to noise ratio...
* directory: writeDirectoryInfo propagates errorsEric Wong2008-09-281-28/+19
| | | | | If a write failed, it's a good sign subsequent writes will fail, too, so propgate errors all the way up the stack.
* directory: make it clear that DIRECTORY_MTIME is deprecatedEric Wong2008-09-281-1/+1
| | | | A long time ago in an mpd far away...
* directory: remove "Mp3" referencesEric Wong2008-09-281-17/+17
| | | | | MPD has supported more audio formats than just MP3 for over five years...
* directory: remove shortname arguments everywhereEric Wong2008-09-281-79/+40
| | | | | | 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.
* directory: replace DirectoryList with dirvecEric Wong2008-09-281-195/+96
| | | | | Small memory reduction compared to songvec since most users have much fewer dirs than songs, but still nice to have.
* directory: remove unused CPP definesEric Wong2008-09-281-4/+0
| | | | We no longer for for updates
* songvec_free => songvec_destroyEric Wong2008-09-281-1/+1
| | | | | "free" implies the songvec structure itself is freed, which is not the case.
* directory.c: kill unnecessary includesEric Wong2008-09-281-4/+0
|
* directory: update playlist version if updatedEric Wong2008-09-281-1/+6
| | | | | | | | | | | | 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.
* Revert "directory: serialize freeSong() within the main thread"Eric Wong2008-09-231-9/+1
| | | | | | | | This reverts commit efefaee1f9535012be2fbfea8f0f870904daad5d. Conflicts: src/directory.c
* directory: use songvec_free to prevent memory leaks.Eric Wong2008-09-231-2/+1
|
* directory: fix leak introduced with threaded updateEric Wong2008-09-231-1/+1
| | | | | Use freeList() instead of free() to free all elements in the list.
* directory: serialize freeSong() within the main threadEric Wong2008-09-231-1/+10
| | | | | | | | | | | | | | | | | | 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.
* Remove EINTR checking for open(2)Eric Wong2008-09-221-2/+1
| | | | open(2) should only interrupt on "slow" devices, afaik...
* directory: don't leak file handles if we get a corrupt dbEric Wong2008-09-221-1/+1
|
* Merge branch 'ew/directory'Eric Wong2008-09-221-177/+96
|\ | | | | | | | | | | | | * ew/directory: songvec: remove songvec_prune directory: update do its work inside a thread directory: use enum update_return for return values
| * directory: update do its work inside a threadEric Wong2008-09-221-108/+50
| | | | | | | | | | | | | | | | | | A lot of the preparation was needed (and done in previous months) in making update thread-safe, but here it is. This was the first thing I made work inside a thread when I started mpd-uclinux many years ago, and also the last thing I've done in mainline mpd to work inside a thread, go figure.
| * directory: use enum update_return for return valuesEric Wong2008-09-221-72/+49
| | | | | | | | This way we avoid having to document -1, 0, 1
* | Merge branch 'ew/directory'Eric Wong2008-09-201-119/+105
|\| | | | | | | | | | | | | | | | | | | * ew/directory: Don't try to prune unless we're updating workaround race condition on updates with broken signal blocking Replace SongList with struct songvec directory: remove unused updateMp3Directory() function start using prefixcmp() Add prefixcmp() (stol^H^H^H^Hborrowed from git)
| * workaround race condition on updates with broken signal blockingEric Wong2008-09-201-39/+50
| | | | | | | | | | | | | | | | | | pthreads with our existing signal blocking/handling is broken, for now just sleep a bit in the child to prevent the CHLD handler from being called too early. Also, improve error reporting when handling SIGCHLD by storing the status to be called in the main task (which can be logged, since we can't do logging inside the sig handler).
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 15:53:53 +0000