aboutsummaryrefslogtreecommitdiffstats
path: root/src (follow)
Commit message (Collapse)AuthorAgeFilesLines
* directory: don't leak file handles if we get a corrupt dbEric Wong2008-09-221-1/+1
|
* Merge branch 'ew/directory'Eric Wong2008-09-228-221/+102
|\ | | | | | | | | | | | | * ew/directory: songvec: remove songvec_prune directory: update do its work inside a thread directory: use enum update_return for return values
| * songvec: remove songvec_pruneEric Wong2008-09-223-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.
| * directory: update do its work inside a threadEric Wong2008-09-225-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.
| * 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-2016-253/+318
|\| | | | | | | | | | | | | | | | | | | * 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)
| * Don't try to prune unless we're updatingEric Wong2008-09-201-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).
| * 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).
| * Replace SongList with struct songvecEric Wong2008-09-208-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).
| * directory: remove unused updateMp3Directory() functionEric Wong2008-09-202-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)
| * start using prefixcmp()Eric Wong2008-09-208-58/+29
| | | | | | | | | | LOC reduction and less noise makes things easier for tired old folks to follow.
| * Add prefixcmp() (stol^H^H^H^Hborrowed from git)Eric Wong2008-09-202-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...
* | Oops, open() with O_CREAT is nicer with a modeEric Wong2008-09-202-2/+2
| | | | | | | | Respect the user's umask (and the number of the beast!)
* | volume: oops, only #include <alloca.h> if OSS is enabledEric Wong2008-09-181-1/+0
| |
* | oss: avoid heap allocations when configuring mixerEric Wong2008-09-181-13/+13
|/ | | | Noticed-by: Courtney Cavin
* Move away from fprintf() when writing DB/state_fileEric Wong2008-09-1810-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...
* fdprintf and vfdprintf get error handlingEric Wong2008-09-182-14/+22
|
* Directory: don't allocate stat information dynamicallyEric Wong2008-09-182-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>
* mp3: fix long line, I can't read past 80 colsEric Wong2008-09-171-1/+2
|
* mp3: fix buffer overflow when max_frames is too largeMax Kellermann2008-09-171-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.
* client: check expired after client_process_line()Max Kellermann2008-09-171-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.
* mp4: fix potential integer overflow bug in the mp4_decode() functionTerry2008-09-121-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.
* Merge branch 'mk/client-merge'Eric Wong2008-09-1227-1363/+1981
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * mk/client-merge: (49 commits) client: shorten names of the struct client variables client: simplified client_read() client: client_input_received() returns 0 client: check for COMMAND_RETURN_CLOSE client: renamed local variable "selret" to "ret" client: moved CLOSE/KILL check after client_process_line() client: don't check FD_ISSET(client->fd) on expired client client: removed assert(client->fd)>=0 fix -Wcast-qual -Wwrite-strings warnings playlist: return -1 after assert(0) command: concatenate strings at compile time audio: don't pass "fd" to {en,dis}ableAudioDevice() volume: don't pass "fd" to changeVolumeLevel() directory: printDirectoryInfo() does not call commandError() directory: don't pass fd to traverseAllIn() directory: don't pass fd to traverseAllIn() callbacks playlist: PlaylistInfo() does not call commandError() playlist: don't pass "fd" to storedPlaylist.c functions playlist: don't pass "fd" to playlist.c functions playlist: showPlaylist() and shufflePlaylist() cannot fail ...
| * client: shorten names of the struct client variablesEric Wong2008-09-121-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.
| * client: simplified client_read()Max Kellermann2008-09-101-3/+5
| | | | | | | | Remove one comparison by changing branch order.
| * client: client_input_received() returns 0Max Kellermann2008-09-101-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().
| * client: check for COMMAND_RETURN_CLOSEMax Kellermann2008-09-101-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.
| * client: renamed local variable "selret" to "ret"Max Kellermann2008-09-101-4/+5
| | | | | | | | It's easier to reuse the variable if it has a more generic name.
| * client: moved CLOSE/KILL check after client_process_line()Max Kellermann2008-09-101-4/+3
| | | | | | | | Don't update client data if it is going to be closed anyway.
| * client: don't check FD_ISSET(client->fd) on expired clientMax Kellermann2008-09-091-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.
| * client: removed assert(client->fd)>=0Max Kellermann2008-09-091-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.
| * Merge branch 'mk/client'Eric Wong2008-09-099-813/+1292
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * mk/client: (24 commits) client: reorder function declarations client: check "expired" after command execution client: added global "expired" flag client: removed superfluous assertion client: more assertions client: moved code to sockaddr_to_tmp_string() client: replace "expired" flag with fd==-1 client: moved "expired" accesses into inline function client: no while loop in client_manager_io() client: select() errors are fatal client: use client_defer_output() in client_write() client: moved code to client_write() client: client_defer_output() can create the first defer buffer client: return early on error in client_defer_output() client: moved code to client_defer_output() client: don't free client resources except in client_close() client: allocate clients dynamically client: added function client_by_fd() client: return early in client_new() client: renamed all public functions ...
| | * client: reorder function declarationsMax Kellermann2008-09-011-3/+4
| | | | | | | | | | | | | | | Change the order of function declarations in client.h, to make it well arranged and readable.
| | * client: check "expired" after command executionMax Kellermann2008-09-011-7/+14
| | | | | | | | | | | | | | | | | | The old code tried to write a response to the client, without even checking if it was already closed. Now that we have added more assertions, these may fail... perform the "expired" check earlier.
| | * client: added global "expired" flagMax Kellermann2008-09-011-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch bdeb8e14 ("client: moved "expired" accesses into inline function") was created under the wrong assumption that processListOfCommands() could modify the expired flag, which is not the case. Although "expired" is a non-const pointer, processListOfCommands() just reads it, using it as the break condition in a "while" loop. I will address this issue with a better overall solution, but for now provide a pointer to a global "expired" flag.
| | * client: removed superfluous assertionMax Kellermann2008-09-011-1/+0
| | | | | | | | | | | | | | | | | | client_defer_output() was modified so that it can create the deferred_send list. With this patch, the assertion on "deferred_send!=NULL" has become invalid. Remove it.
| | * client: more assertionsMax Kellermann2008-09-011-0/+6
| | |
| | * client: moved code to sockaddr_to_tmp_string()Max Kellermann2008-09-011-9/+17
| | | | | | | | | | | | | | | Unclutter the client_new() constructor by moving unrelated complex code into a separate function.
| | * client: replace "expired" flag with fd==-1Max Kellermann2008-09-011-6/+6
| | | | | | | | | | | | Why waste 4 bytes for a flag which we can hide in another variable.
| | * client: moved "expired" accesses into inline functionMax Kellermann2008-09-011-13/+29
| | | | | | | | | | | | Hiding this flag allows us later to remove it easily.
| | * client: no while loop in client_manager_io()Max Kellermann2008-09-011-30/+24
| | | | | | | | | | | | | | | | | | The last patch removed the "continue" directive, and now the while loop is without function. Remove it. Also make client_manager_io() return 0.
| | * client: select() errors are fatalMax Kellermann2008-09-011-30/+6
| | | | | | | | | | | | | | | | | | | | | Previously, when select() failed, we assumed that there was an invalid file descriptor in one of the client structs. Thus we tried select() one by one. This is bogus, because we should never have invalid file descriptors. Remove it, and make select() errors fatal.
| | * client: use client_defer_output() in client_write()Max Kellermann2008-09-011-7/+3
| | | | | | | | | | | | | | | Eliminate duplicated code, call client_defer_output() which we splitted from client_write_output() earlier.
| | * client: moved code to client_write()Max Kellermann2008-09-011-26/+28
| | | | | | | | | | | | | | | Move the second part of client_write_output() into a separate function.
| | * client: client_defer_output() can create the first defer bufferMax Kellermann2008-09-011-5/+5
| | | | | | | | | | | | | | | | | | client_defer_output() was designed to add new buffers to an existing deferred_send buffer. Tweak it and allow it to create a new buffer list.
| | * client: return early on error in client_defer_output()Max Kellermann2008-09-011-5/+7
| | | | | | | | | | | | | | | Exit the function when an error occurs, and move the rest of the following code one indent level left.
| | * client: moved code to client_defer_output()Max Kellermann2008-09-011-20/+27
| | | | | | | | | | | | | | | Split the large function client_write_output() into two parts; this is the first code moving patch.
| | * client: don't free client resources except in client_close()Max Kellermann2008-09-011-15/+0
| | | | | | | | | | | | | | | | | | All of the client's resources are freed in client_close(). It is enough to set the "expired" flag, no need to duplicate lots of destruction code again and again.
| | * client: allocate clients dynamicallyMax Kellermann2008-09-011-90/+76
| | | | | | | | | | | | | | | | | | Due to the large buffers in the client struct, the static client array eats several megabytes of RAM with a maximum of only 10 clients. Stop this waste and allocate each client struct from the heap.
| | * client: added function client_by_fd()Max Kellermann2008-09-011-13/+21
| | | | | | | | | | | | | | | The code becomes less complex and more readable when we move this linear search into a separate mini function.
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-11 04:30:30 +0000