aboutsummaryrefslogtreecommitdiffstats
path: root/src/directory.h (unfollow)
Commit message (Collapse)AuthorFilesLines
2008-10-12directory: always maintain sorted properties vectorsEric Wong1-2/+0
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.
2008-10-12directory: rename isRootDirectory => path_is_music_rootEric Wong1-3/+3
down with camelCase!
2008-10-12directory: make music_root global and avoid runtime initializationEric Wong1-0/+2
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>.
2008-10-12directory: use mpd_sizeof_str_flex_array for path, tooEric Wong1-2/+3
This way we avoid unnecessary heap allocations.
2008-10-11directory: don't use identical struct and variable namesEric Wong1-15/+15
Duplicated tokens in close proximity takes too long for my head to parse; and "dir" is an easy and common abbreviation for "directory".
2008-10-11directory: added inline wrappers for accessing childrenMax Kellermann1-0/+14
Some tiny utilities... wrappers like these may become helpful when we introduce locking.
2008-10-11directory: moved dirvec struct declaration to dirvec.hMax Kellermann1-5/+1
No idea why it was created in directory.h, but it should be in dirvec.h.
2008-10-11directory: path must not be NULLMax Kellermann1-1/+1
For the root directory, let's set path to an empty string. This saves a few checks.
2008-10-11directory: directory_get_path(NULL) is not allowedMax Kellermann1-3/+4
Also convert directory_get_path() to an inline function, which returns a constant string.
2008-10-11directory: eliminate CamelCaseMax Kellermann1-9/+9
CamelCase is ugly, rename the functions. [ew: "directory_get_directory" was too confusing, using "directory_get_subdir" instead (old function was named "getSubDirectory")]
2008-10-11database: renamed functions, "db_" prefix and no CamelCaseMax Kellermann1-2/+2
Yet another CamelCase removal patch.
2008-10-11directory: moved code to database.cMax Kellermann1-14/+22
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.
2008-10-11directory: converted isRootDirectory() to an inline functionMax Kellermann1-1/+5
The function isRootDirectory() is tiny and can be converted to an inline function. Don't allow name==NULL.
2008-10-11song: converted typedef Song to struct songMax Kellermann1-2/+2
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 ]
2008-10-11directory: converted typedef Directory to struct directoryMax Kellermann1-11/+11
The struct can be forward-declared by other headers, which relaxes the header dependencies.
2008-10-11directory: added directory_is_empty()Max Kellermann1-0/+5
directory_is_empty() is a tiny inline function which determine if a directory has any child objects (sub directories or songs).
2008-10-11directory: moved code to update.cMax Kellermann1-11/+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.
2008-10-03directory: simplify list update handling logicEric Wong1-4/+3
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.
2008-09-29update: move path sanitation up the stack to avoid extra copiesEric Wong1-3/+7
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).
2008-09-28clean up updateInit calling and error handlingEric Wong1-1/+2
Move error reporting to command.c so directory.c does not deal with client error handling any more.
2008-09-28directory: remove "Mp3" referencesEric Wong1-2/+2
MPD has supported more audio formats than just MP3 for over five years...
2008-09-28directory.h: remove directory_sigChldHandler declEric Wong1-2/+0
We no longer fork for directory updates, so we no longer have children to reap.
2008-09-28directory: replace DirectoryList with dirvecEric Wong1-2/+5
Small memory reduction compared to songvec since most users have much fewer dirs than songs, but still nice to have.
2008-09-26song: removed type SongListMax Kellermann1-0/+1
SongList has been superseded by struct songvec.
2008-09-22directory: update do its work inside a threadEric Wong1-1/+1
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.
2008-09-20Replace SongList with struct songvecEric Wong1-1/+2
Our linked-list implementation is wasteful and the SongList isn't modified enough to benefit from being a linked list. So use a more compact array of song pointers which saves ~200K on a library with ~9K songs (on x86-32).
2008-09-20directory: remove unused updateMp3Directory() functionEric Wong1-2/+0
It hasn't been used in many years commit 3a89afdd80f228139554372a83a9d74486acf691 Author: Warren Dukes <warren.dukes@gmail.com> Date: Sat Nov 20 20:28:32 2004 +0000 remove --update-db option (SVN r2719)
2008-09-18Directory: don't allocate stat information dynamicallyEric Wong1-6/+3
This should save a few thousand ops. Not worth it to malloc for such a small (3-words on 32-bit ARM and x86) structures. Signed-off-by: Eric Wong <normalperson@yhbt.net>
2008-09-09directory: don't pass fd to traverseAllIn()Max Kellermann1-1/+1
This patch continues the work of the previous patch: don't pass a file descriptor at all to traverseAllIn(). Since this fd was only used to report "directory not found" errors, we can easily move that check to the caller. This is a great relief, since it removes the dependency on a client connection from a lot of enumeration functions.
2008-09-09directory: don't pass fd to traverseAllIn() callbacksMax Kellermann1-2/+2
Database traversal should be generic, and not bound to a client connection. This is the first step: no file descriptor for the callback functions forEachSong() and forEachDir(). If a callback needs the file descriptor, it has to be passed in the void*data pointer somehow; some callbacks might need a new struct for passing more than one parameter. This might look a bit cumbersome right now, but our goal is to have a clean API.
2008-09-09dbUtils, playlist, directory: pass constant pointersMax Kellermann1-2/+2
The usual bunch of const pointer conversions.
2008-04-12clean up CPP includesMax Kellermann1-3/+0
Try to only include headers which are really needed. We should particularly check all "headers including other headers". The long-term goal is to have a manageable, small API for plugins (decoders, output) without so many mpd internals cluttering the namespace. git-svn-id: https://svn.musicpd.org/mpd/trunk@7319 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2008-02-05fix -Wconst warningsMax Kellermann1-2/+2
[ew: cleaned up the dirty union hack a bit] Signed-off-by: Eric Wong <normalperson@yhbt.net> git-svn-id: https://svn.musicpd.org/mpd/trunk@7180 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2007-05-24Don't list playlists in lsinfo if the path isn't the root directory (theyJ. Alexander Treuman1-0/+2
can't be loaded anyway). git-svn-id: https://svn.musicpd.org/mpd/trunk@6244 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2007-04-05The massive copyright updateAvuton Olrich1-1/+1
git-svn-id: https://svn.musicpd.org/mpd/trunk@5834 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2006-08-20Fix warnings for -Wmissing-prototypesAvuton Olrich1-9/+9
Add -Wmissing-prototypes if compiling with gcc Static where possible git-svn-id: https://svn.musicpd.org/mpd/trunk@4657 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2006-07-30interface/connection malloc reductions from mpd-keEric Wong1-5/+5
This patch massively reduces the amount of heap allocations at the interface/command layer. Most commands with minimal output should not allocate memory from the heap at all. Things like repeatedly polling status, currentsong, and volume changes should be faster as a result, and more importantly, not a source of memory fragmentation. These changes should be safe in that there's no way for a remote-client to corrupt memory or otherwise do bad stuff to MPD, but an extra set of eyes to review would be good. Of course there's never any warranty :) No longer do we use FILE * structures in the interface, which means we don't have to allocate any new memory for most connections. Now, before you go on about losing the buffering that FILE * +implies+, remember that myfprintf() never took advantage of any of the stdio buffering features. To reduce the diff and make bugs easier to spot in the diff, I've kept myfprintf in places where we write to files (and not network interfaces). Expect myfprintf to go away entirely soon (we'll use fprintf for writing regular files). git-svn-id: https://svn.musicpd.org/mpd/trunk@4483 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2006-07-20Add mpd-indent.shAvuton Olrich1-11/+10
Indent the entire tree, hopefully we can keep it indented. git-svn-id: https://svn.musicpd.org/mpd/trunk@4410 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2006-07-14Change shank's email addressJ. Alexander Treuman1-1/+1
git-svn-id: https://svn.musicpd.org/mpd/trunk@4333 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2006-07-14[CLEANUP] Remove unused functions from the headerAvuton Olrich1-10/+0
Convert some spaces to tabs Static what makes sense Remove unused includes git-svn-id: https://svn.musicpd.org/mpd/trunk@4328 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2006-07-13Huge header update, update the copyright and addAvuton Olrich1-1/+1
the GPL header where necessary git-svn-id: https://svn.musicpd.org/mpd/trunk@4317 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2006-05-08Jat/Q patch for checking permission on database before creating itQball Cow1-0/+2
git-svn-id: https://svn.musicpd.org/mpd/trunk@4140 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2005-03-06config file change! now 'port' is optional and 'db_file' is required!Warren Dukes1-2/+0
also, should have better error reporting when failing to open playlist or music directory's, or writing the db, etc git-svn-id: https://svn.musicpd.org/mpd/trunk@3027 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2004-11-12don't store only relative paths in the directory structure, its probably notWarren Dukes1-2/+3
worth the savings in memory for the extra cpu it requires git-svn-id: https://svn.musicpd.org/mpd/trunk@2630 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2004-11-11ok, optimize memory sage of directorys, by iteratively creating the directories,Warren Dukes1-1/+4
this code needs some serious testing: Note: The song name optimization i think is worth it, saves about 200k of ram on my syste, however, having to create directory names iteratively each time we print probably isn't worth the cpu. We only save about 10k of ram for the computer todo alot more work, and the code maybe a little messier git-svn-id: https://svn.musicpd.org/mpd/trunk@2604 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2004-11-11implement saved memory by not storing full pathWarren Dukes1-0/+4
git-svn-id: https://svn.musicpd.org/mpd/trunk@2601 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2004-11-10merge changes from metadata-rewrite branchWarren Dukes1-14/+19
git-svn-id: https://svn.musicpd.org/mpd/trunk@2589 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2004-11-03remove vim &*(@Warren Dukes1-1/+0
git-svn-id: https://svn.musicpd.org/mpd/trunk@2500 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2004-06-04finish ack error codesWarren Dukes1-1/+1
git-svn-id: https://svn.musicpd.org/mpd/trunk@1325 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2004-05-13redimentary addition of url's to playlistWarren Dukes1-1/+1
git-svn-id: https://svn.musicpd.org/mpd/trunk@1000 09075e82-0dd4-0310-85a5-a0d7c8717e4f