aboutsummaryrefslogtreecommitdiffstats
path: root/src (unfollow)
Commit message (Collapse)AuthorFilesLines
2008-10-03directory: simplify list update handling logicEric Wong3-100/+71
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-10-03main_notify: define main_task so we can use it for assertionsEric Wong2-0/+7
It'll be easier to keep track of what code runs in what task/thread this way.
2008-10-03directory: streamline deletesEric Wong1-17/+15
Instead of relying on the shortname, just pass the song pointer to prevent redundant lookups during deletes.
2008-09-29directory: remove redundant sanitizePathDupEric Wong1-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.
2008-09-29update: move path sanitation up the stack to avoid extra copiesEric Wong3-30/+58
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 Wong3-13/+22
Move error reporting to command.c so directory.c does not deal with client error handling any more.
2008-09-28directory: isRootDirectory() is a one-linerEric Wong1-4/+1
Improving the signal to noise ratio...
2008-09-28directory: writeDirectoryInfo propagates errorsEric Wong1-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.
2008-09-28directory: make it clear that DIRECTORY_MTIME is deprecatedEric Wong1-1/+1
A long time ago in an mpd far away...
2008-09-28directory: remove "Mp3" referencesEric Wong3-22/+22
MPD has supported more audio formats than just MP3 for over five years...
2008-09-28playlist: deleteASongFromPlaylist takes a const Song *Eric Wong2-2/+2
We don't change the song pointer there, either.
2008-09-28songvec: songvec_delete takes a const Song pointerEric Wong2-2/+2
We don't modify the Song when we delete it
2008-09-28directory: remove shortname arguments everywhereEric Wong1-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.
2008-09-28path: add mpd_basename() functionEric Wong2-0/+20
This is like basename(3) but with predictable semantics independent of C library or build options used. This is also much more strict and does not account for trailing slashes (mpd should never deal with trailing slashes on internal functions).
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 Wong4-197/+175
Small memory reduction compared to songvec since most users have much fewer dirs than songs, but still nice to have.
2008-09-28directory: remove unused CPP definesEric Wong1-4/+0
We no longer for for updates
2008-09-28songvec_free => songvec_destroyEric Wong3-3/+3
"free" implies the songvec structure itself is freed, which is not the case.
2008-09-28directory.c: kill unnecessary includesEric Wong1-4/+0
2008-09-28directory: update playlist version if updatedEric Wong1-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.
2008-09-28playlist: fix currentsong info after swapping songsEric Wong1-0/+4
We forgot to update the playlist.queued marker if playlist.current changed. Additionally, if the queue cleared in any other mode, attempt to requeue (as it's a harmless no-op otherwise). Thanks to stonecrest for the bug report.
2008-09-28playlist: reset after we've hit the endEric Wong1-0/+6
If repeat is off, we reset (and reshuffle in random mode) the playlist.
2008-09-28advance to the next song on decoder errorsEric Wong3-6/+17
Fix this regression introduced in the core rewrite so that we now skip to the next song when we encounter an error with the song we tried to decode.
2008-09-26song: removed type SongListMax Kellermann4-45/+2
SongList has been superseded by struct songvec.
2008-09-26command: fix command "addid"Max Kellermann1-1/+1
With patch 8d2830b3, I broke "addid": it did not return the id of the new song, because of a typo in the return condition (== instead of !=).
2008-09-23Revert "directory: serialize freeSong() within the main thread"Eric Wong1-9/+1
This reverts commit efefaee1f9535012be2fbfea8f0f870904daad5d. Conflicts: src/directory.c
2008-09-23songvec: avoid free(NULL)Eric Wong1-2/+4
Potentially broken free() implementations don't like it
2008-09-23directory: use songvec_free to prevent memory leaks.Eric Wong1-2/+1
2008-09-23directory: fix leak introduced with threaded updateEric Wong1-1/+1
Use freeList() instead of free() to free all elements in the list.
2008-09-23directory: serialize freeSong() within the main threadEric Wong1-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.
2008-09-22log: remove umask() calls, just change open(2) argsEric Wong1-8/+2
The umask calls were remants of when we used fopen().
2008-09-22Remove EINTR checking for open(2)Eric Wong2-4/+2
open(2) should only interrupt on "slow" devices, afaik...
2008-09-22directory: don't leak file handles if we get a corrupt dbEric Wong1-1/+1
2008-09-22songvec: remove songvec_pruneEric Wong3-27/+0
Any pruned files will be noticed during update and pruned from the live database, so this inefficient function can go away and never come back.
2008-09-22directory: update do its work inside a threadEric Wong5-125/+56
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-22directory: use enum update_return for return valuesEric Wong1-72/+49
This way we avoid having to document -1, 0, 1
2008-09-20Don't try to prune unless we're updatingEric Wong1-1/+2
Pruning is very expensive and we won't need it in the future anyways. This brings startup back to previous speeds (before songvec changes).
2008-09-20workaround race condition on updates with broken signal blockingEric Wong1-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).
2008-09-20Replace SongList with struct songvecEric Wong8-136/+226
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 Wong2-20/+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-20start using prefixcmp()Eric Wong8-58/+29
LOC reduction and less noise makes things easier for tired old folks to follow.
2008-09-20Add prefixcmp() (stol^H^H^H^Hborrowed from git)Eric Wong2-0/+12
This allows us to avoid the nasty repetition in strncmp(foo, bar, strlen(foo)). We'll miss out on the compiler optimizing strlen() into sizeof() - 1 for string literals for this; but we don't use this it for performance-critical functions anyways...
2008-09-20Oops, open() with O_CREAT is nicer with a modeEric Wong2-2/+2
Respect the user's umask (and the number of the beast!)
2008-09-18volume: oops, only #include <alloca.h> if OSS is enabledEric Wong1-1/+0
2008-09-18oss: avoid heap allocations when configuring mixerEric Wong1-13/+13
Noticed-by: Courtney Cavin
2008-09-18Move away from fprintf() when writing DB/state_fileEric Wong10-55/+60
I have serious trust issues when using stdio to write to the FS. So it's best to clean this code out so I can start figuring out what's wrong with Rasi's box not updating... None of these writes take place in a performance-critical setting anyways...
2008-09-18fdprintf and vfdprintf get error handlingEric Wong2-14/+22
2008-09-18Directory: don't allocate stat information dynamicallyEric Wong2-50/+22
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-17mp3: fix long line, I can't read past 80 colsEric Wong1-1/+2
2008-09-17mp3: fix buffer overflow when max_frames is too largeMax Kellermann1-0/+5
The function decodeFirstFrame() allocates memory based on data from the mp3 header. This can make the buffer size allocation overflow, or lead to a DoS attack with a very large buffer. Cap this buffer at 8 million frames, which should really be enough for reasonable files.