aboutsummaryrefslogtreecommitdiffstats
path: root/src (unfollow)
Commit message (Collapse)AuthorFilesLines
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.
2008-09-17client: check expired after client_process_line()Max Kellermann1-1/+2
The assertion on "!client_is_expired(client)" was wrong, because writing the command response may cause the client to become expired. Replace that assertion with a check.
2008-09-12mp4: fix potential integer overflow bug in the mp4_decode() functionTerry1-0/+7
A crafted mp4 file could cause an integer overflow in mp4_decode function in src/inputPlugins/mp4_plugin.c. mp4ff_num_samples() function returns some tainted value. sizeof(float) * numSamples is an integer overflow operation if numSamples is too huge, so xmalloc will allocate a small memory region. I constructe a mp4 file, and use faad2 to open the file. mp4ff_num_samples() returns -1. So I think mpd bears from the same problem.
2008-09-12client: shorten names of the struct client variablesEric Wong1-210/+209
Seeing the token "client" repeatedly in the same blocks of code adds to mental fatigue and makes it harder to follow code because there's fewer unique tokens to distinguish. "cl" is unique within mpd and conveys enough information to be useful to anybody reading the code.
2008-09-10client: simplified client_read()Max Kellermann1-3/+5
Remove one comparison by changing branch order.
2008-09-10client: client_input_received() returns 0Max Kellermann1-4/+2
Since the caller chain doesn't care about the return value (except for COMMAND_RETURN_KILL, COMMAND_RETURN_CLOSE), just return 0 if there is nothing special. This saves one local variable initialization, and one access to it. Also remove one unreachable "return 1" from client_read().
2008-09-10client: check for COMMAND_RETURN_CLOSEMax Kellermann1-15/+14
Don't close the client within client_process_line(), return COMMAND_RETURN_CLOSE instead. This is the signal for the caller chain to actually close it. This makes dealing with the client pointer a lot safer, since the caller always knows whether it is still valid.
2008-09-10client: renamed local variable "selret" to "ret"Max Kellermann1-4/+5
It's easier to reuse the variable if it has a more generic name.
2008-09-10client: moved CLOSE/KILL check after client_process_line()Max Kellermann1-4/+3
Don't update client data if it is going to be closed anyway.
2008-09-10alsa: re-enable-nonblocking, but sleep if busyEric Wong1-7/+9
Instead of letting ALSA block for us (and potentially allowing something stupid on certain hardware or drivers), we do the sleeping ourselves. We calculate the sleep to be a fraction of period_time to avoid oversleeping (and thus audible skipping).
2008-09-09metadata_pipe: kill "writer is ahead of reader" messageEric Wong1-4/+1
The writer can be far ahead of the reader during HTTP stalls; so stop spamming the logs with this message.
2008-09-09client: don't check FD_ISSET(client->fd) on expired clientMax Kellermann1-1/+2
client->fd becomes -1 when the client expires. Don't use FD_ISSET() with this expired client; doing so would cause a crash due to SIGBUS.
2008-09-09client: removed assert(client->fd)>=0Max Kellermann1-4/+2
Since client->fd==-1 has become our "expired" flag, it may already be -1 when client_close() is called. Don't assert that it is still non-negative, and call client_set_expired() instead.
2008-09-09fix -Wcast-qual -Wwrite-strings warningsMax Kellermann5-27/+42
The previous patch enabled these warnings. In Eric's branch, they were worked around with a generic deconst_ptr() function. There are several places where we can add "const" to pointers, and in others, libraries want non-const strings. In the latter, convert string literals to "static char[]" variables - this takes the same space, and seems safer than deconsting a string literal.
2008-09-09playlist: return -1 after assert(0)Max Kellermann1-0/+1
print_playlist_result() had an assert(0) at the end, in case there was an invalid result value. With NDEBUG, this resulted in a function not returning a value - add a dummy "return -1" at the end to keep gcc quiet.
2008-09-09command: concatenate strings at compile timeMax Kellermann1-27/+33
String literals (including those defined in CPP macros) can be concatenated at compile time. This saves some CPU cycles in vsnprintf() at run time.
2008-09-09audio: don't pass "fd" to {en,dis}ableAudioDevice()Max Kellermann3-18/+21
No protocol code in the audio output library.
2008-09-09volume: don't pass "fd" to changeVolumeLevel()Max Kellermann3-21/+26
The "volume" library shouldn't talk to the client. Move error handling to command.c.
2008-09-09directory: printDirectoryInfo() does not call commandError()Max Kellermann2-4/+4
Move another ocurrence of error handling over to command.c.