aboutsummaryrefslogtreecommitdiffstats
path: root/src (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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.
| * client: return early in client_new()Max Kellermann2008-09-011-30/+31
| | | | | | | | This saves one level of indent.
| * client: renamed all public functionsMax Kellermann2008-09-016-19/+19
| | | | | | | | | | | | Functions which operate on the whole client list are prefixed with "client_manager_", and functions which handle just one client just get "client_".
| * client: renamed internal functions and variablesMax Kellermann2008-09-011-297/+296
| | | | | | | | | | Rename all static functions, variables and macros which have "interface" in their name to something nicer prefixed with "client_".
| * client: renamed Interface to struct clientMax Kellermann2008-09-011-19/+19
| | | | | | | | | | | | | | Second patch: rename the internal struct name. We will eventually export this type as an opaque forward-declared struct later, so we can pass a struct pointer instead of a file descriptor, which would save us an expensive linear lookup.
| * renamed interface.c to client.cMax Kellermann2008-09-017-7/+7
| | | | | | | | | | | | | | I don't believe "interface" is a good name for something like "connection by a client to MPD", let's call it "client". This is the first patch in the series which changes the name, beginning with the file name.
| * imported list.h from the Linux kernel sourcesMax Kellermann2008-09-012-0/+485
| | | | | | | | | | | | | | linux/list.h is a nice doubly linked list library - it is lightweight and powerful at the same time. It will be useful later, when we begin to allocate client structures dynamically. Import it, and strip out all the stuff which we are not going to use.
* | Merge branch 'mk/strset' into mk/playlistEric Wong2008-09-097-151/+245
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * mk/strset: use strset.h instead of tagTracker.h strset: fix duplicate values added string set library Conflicts: src/dbUtils.c src/tagTracker.c
| * | use strset.h instead of tagTracker.hMax Kellermann2008-09-096-173/+84
| | | | | | | | | | | | | | | | | | | | | With a large music database, the linear string collection in tagTracker.c becomes very slow. We implemented that in a quick'n'dirty fashion when we removed tree.c, and now we rewrite it using the fast hashed string set.
| * | strset: fix duplicate valuesMax Kellermann2008-09-091-1/+1
| | | | | | | | | | | | | | | Due to a minor typo, the string set had duplicate values, because strset_add() didn't check the base slot properly.
| * | added string set libraryMax Kellermann2008-09-093-0/+195
| | | | | | | | | | | | | | | | | | | | | | | | "struct strset" is a hashed string set: you can add strings to this library, and it stores them as a set of unique strings. You can get the size of the set, and you can enumerate through all values. This will be used to replace the linear tagTracker library.
* | | fix -Wcast-qual -Wwrite-strings warningsMax Kellermann2008-09-095-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.
* | | playlist: return -1 after assert(0)Max Kellermann2008-09-091-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.
* | | command: concatenate strings at compile timeMax Kellermann2008-09-091-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.
* | | audio: don't pass "fd" to {en,dis}ableAudioDevice()Max Kellermann2008-09-093-18/+21
| | | | | | | | | | | | No protocol code in the audio output library.
* | | volume: don't pass "fd" to changeVolumeLevel()Max Kellermann2008-09-093-21/+26
| | | | | | | | | | | | | | | The "volume" library shouldn't talk to the client. Move error handling to command.c.
* | | directory: printDirectoryInfo() does not call commandError()Max Kellermann2008-09-092-4/+4
| | | | | | | | | | | | Move another ocurrence of error handling over to command.c.
* | | directory: don't pass fd to traverseAllIn()Max Kellermann2008-09-096-32/+69
| | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | directory: don't pass fd to traverseAllIn() callbacksMax Kellermann2008-09-094-51/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | playlist: PlaylistInfo() does not call commandError()Max Kellermann2008-09-092-6/+15
| | | | | | | | | | | | | | | | | | Continuing the effort of removing protocol specific calls from the core libraries: let the command.c code call commandError() based on PlaylistInfo's return value.
* | | playlist: don't pass "fd" to storedPlaylist.c functionsMax Kellermann2008-09-096-150/+126
| | | | | | | | | | | | | | | Return an "enum playlist_result" value instead of calling commandError() in storedPlaylist.c.
* | | playlist: don't pass "fd" to playlist.c functionsMax Kellermann2008-09-094-185/+245
| | | | | | | | | | | | | | | | | | The playlist library shouldn't talk to the client if possible. Introduce the "enum playlist_result" type which the caller (i.e. command.c) may use to generate an error message.
* | | playlist: showPlaylist() and shufflePlaylist() cannot failMax Kellermann2008-09-093-10/+8
| | | | | | | | | | | | Make them both return void.
* | | playlist: moved "repeat" and "random" value checks to command.cMax Kellermann2008-09-093-24/+26
| | | | | | | | | | | | | | | | | | | | | | | | Client's input values should be validated by the command implementation, and the core libraries shouldn't talk to the client directly if possible. Thus, setPlaylistRepeatStatus() and setPlaylistRandomStatus() don't get the file descriptor, and cannot fail (return void).
* | | playlist: fix FILE* leak in appendSongToStoredPlaylistByPath()Max Kellermann2008-09-091-0/+2
| | | | | | | | | | | | | | | When an error occurs after the file has been opened, the function will never close the FILE object.
* | | playlist: replaced run-time check with assertionMax Kellermann2008-09-091-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | The "fspath" argument of writeStoredPlaylistToPath() must never be NULL. There should be an assertion on that, instead of a run-time check. [ew: fspath => utf8path]
* | | playlist: added is_valid_playlist_name()Max Kellermann2008-09-092-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | The function valid_playlist_name() checks the name, but it insists on reporting an eventual error to the client. The new function is_valid_playlist_name() is more generic: it just returns a boolean, and does not care what the caller will use it for. The old function valid_playlist_name() will be removed later.
* | | dbUtils, playlist, directory: pass constant pointersMax Kellermann2008-09-096-37/+38
|/ / | | | | | | The usual bunch of const pointer conversions.
* | alsa: use blocking instead of non-blocking writeEric Wong2008-09-081-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | The way we used non-blocking mode was HORRIBLE. It was non-blocking to ALSA, but we end up blocking in a busy loop that does absolutely NOTHING but retry. We don't check for playback cancellation (like we do in decoders) or anything. This is seriously broken and I can imagine it affects people on fast CPUs more because we do asynchronous output buffering and our ALSA device will always have data ready.
* | alsa: show more debugging informationEric Wong2008-09-081-10/+14
| | | | | | | | | | | | | | | | | | Print out {buffer,period}_{size,time}. Not sure if this is going to help. I've been searching everywhere looking for a possible clue as to what's causing the high CPU usage problems... Also, add device information to some messages I missed earlier.
* | alsa: cleanup the mmap logic a bitEric Wong2008-09-081-8/+6
| |
* | alsa: snd_pcm_sw_params_set_xfer_align is deprecatedEric Wong2008-09-081-3/+0
| | | | | | | | | | Lets not use deprecated functions. It's apparently possible to not care about the sw_params stuff at all!