aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* volume: don't pass "fd" to changeVolumeLevel()Max Kellermann2008-09-073-22/+26
| | | | | The "volume" library shouldn't talk to the client. Move error handling to command.c.
* directory: don't pass "fd" to updateInit()Max Kellermann2008-09-073-17/+53
| | | | Again, move error handling to command.c.
* directory: printDirectoryInfo() does not call commandError()Max Kellermann2008-09-072-4/+4
| | | | Move another ocurrence of error handling over to command.c.
* directory: don't pass fd to traverseAllIn()Max Kellermann2008-09-076-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-074-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-072-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-076-150/+124
| | | | | Return an "enum playlist_result" value instead of calling commandError() in storedPlaylist.c.
* playlist: don't pass "fd" to playlist.c functionsMax Kellermann2008-09-074-188/+247
| | | | | | 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-073-10/+8
| | | | Make them both return void.
* playlist: moved "repeat" and "random" value checks to command.cMax Kellermann2008-09-073-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-071-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-071-2/+1
| | | | | | The "fspath" argument of writeStoredPlaylistToPath() must never be NULL. There should be an assertion on that, instead of a run-time check.
* playlist: added is_valid_playlist_name()Max Kellermann2008-09-072-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.
* tag: added buffered versions of the tag_print.c codeMax Kellermann2008-09-074-3/+85
| | | | | | | | | | | Currently, when the tag cache is being serialized to hard disk, the stdio buffer is flushed before every song, because tag_print.c performs unbuffered writes on the raw file descriptor. Unfortunately, the fdprintf() API allows buffered I/O only for a client connection by looking up the client pointer owning the file descriptor - for stdio, this is not possible. To re-enable proper stdio buffering, we have to duplicate the tag_print.c code without fprintf() instead of our custom fdprintf() hack. Add this duplicated code to tag_save.c.
* song: moved code to song_print.c, song_save.cMax Kellermann2008-09-0710-183/+284
| | | | | | | Move everything which dumps song information (via tag_print.c) to a separate source file. song_print.c gets code which writes song data to the client; song_save.c is responsible for serializing songs from the tag cache.
* tag: moved code to tag_print.cMax Kellermann2008-09-078-29/+105
| | | | | Move everything which dumps a tag to a file descriptor to tag_print.c. This relaxes dependencies and splits the code into smaller parts.
* client: added client_printf()Max Kellermann2008-09-072-0/+40
| | | | | | Based on client_puts(), client_printf() is the successor of fdprintf(). As soon as all fdprintf() callers have been rewritten to use client_printf(), we can remove fdprintf().
* client: added client_write() and client_puts()Max Kellermann2008-09-073-26/+45
| | | | | | client_write() writes a buffer to the client and buffers it if required. client_puts() does the same for a C string. The next patch will add more tools which will replace fdprintf() later.
* include cleanupMax Kellermann2008-09-069-7/+9
| | | | As usual, include only headers which are really needed.
* tag: fix segfault on updateEric Wong2008-09-062-14/+22
| | | | | | | | | | | | clearMpdTag could be called on a tag that was still in a tag_begin_add transaction before tag_end_add is called. This was causing free() to attempt to operate on bulk.items; which is un-free()-able. Now instead we unmark the bulk.busy to avoid committing the tags to the heap only to be immediately freed. Additionally, we need to remember to call tag_end_add() when a song is updated before we NULL song->tag to avoid tripping an assertion the next time tag_begin_add() is called.
* client: don't check FD_ISSET(client->fd) on expired clientMax Kellermann2008-09-061-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-061-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.
* dbUtils, playlist, directory: pass constant pointersMax Kellermann2008-09-066-37/+38
| | | | The usual bunch of const pointer conversions.
* tag: optimize tag_dup(), copy item referencesMax Kellermann2008-08-293-7/+42
| | | | | Don't call tag_pool_get_item() for duplicating tags, just increase the item's reference counter instead.
* oggflac: fix GCC warningsMax Kellermann2008-08-291-9/+9
| | | | | | Fix lots of "unused parameter" warnings in the OggFLAC decoder plugin. Not sure if anybody uses it anymore, since newer libflac obsoletes it.
* tag: fix the shout and oggflac pluginsMax Kellermann2008-08-292-10/+12
| | | | | | During the tag library refactoring, the shout plugin was disabled, and I forgot about adapting it to the new API. Apply the same fixes to the oggflac decoder plugin.
* const pointersMax Kellermann2008-08-294-10/+10
| | | | Yet another patch which converts pointer arguments to "const".
* tag: static directory nameMax Kellermann2008-08-291-5/+3
| | | | | | While parsing the tag cache, don't allocate the directory name from the heap, but copy it into a buffer on the stack. This reduces heap fragmentation by 1%.
* tag: try not to reallocate tag.items in every add() callMax Kellermann2008-08-293-7/+91
| | | | | | | | | | | | | | | | If many tag_items are added at once while the tag cache is being loaded, manage these items in a static fixed list, instead of reallocating the list with every newly created item. This reduces heap fragmentation. Massif results again: mk before: total 12,837,632; useful 10,626,383; extra 2,211,249 mk now: total 12,736,720; useful 10,626,383; extra 2,110,337 The "useful" value is the same since this patch only changes the way we allocate the same amount of memory, but heap fragmentation was reduced by 5%.
* song: don't export newNullSong()Max Kellermann2008-08-292-3/+1
| | | | The function newNullSong() is only used internally in song.c.
* tag: try not to duplicate the input stringMax Kellermann2008-08-291-13/+18
| | | | | | Try to detect if the string needs Latin1-UTF8 conversion, or whitespace cleanup. If not, we don't need to allocate temporary memory, leading to decreased heap fragmentation.
* tag: pass length to fix_utf8()Max Kellermann2008-08-291-3/+4
| | | | Same as the previous patch, prepare the function fix_utf8() this time.
* added "length" parameter to validUtf8String()Max Kellermann2008-08-294-10/+16
| | | | | | | At several places, we create temporary copies of non-null-terminated strings, just to use them in functions like validUtf8String(). We can save this temporary allocation and avoid heap fragmentation if we add a length parameter instead of expecting a null-terminated string.
* assert value!=NULL in fix_utf8()Max Kellermann2008-08-291-1/+3
| | | | | We must never pass value==NULL to fix_utf(). Replace the run-time check with an assertion.
* tag: converted macro fixUtf8() to an inline functionMax Kellermann2008-08-291-9/+11
| | | | | | | Since the inline function cannot modify its caller's variables (which is a good thing for code readability), the new string pointer is the return value. The resulting binary should be the same as with the macro.
* tag: added a pool for tag itemsMax Kellermann2008-08-295-6/+147
| | | | | | | | | | | | | | | | | | | The new source tag_pool.c manages a pool of reference counted tag_item objects. This is used to merge tag items of the same type and value, saving lots of memory. Formerly, only the value itself was pooled, wasting memory for all the pointers and tag_item structs. The following results were measured with massif. Started MPD on amd64, typed "mpc", no song being played. My music database contains 35k tagged songs. The results are what massif reports as "peak". 0.13.2: total 14,131,392; useful 11,408,972; extra 2,722,420 eric: total 18,370,696; useful 15,648,182; extra 2,722,514 mk f34f694: total 15,833,952; useful 13,111,470; extra 2,722,482 mk now: total 12,837,632; useful 10,626,383; extra 2,211,249 This patch set saves 20% memory, and does a good job in reducing heap fragmentation.
* tag: converted tag_item.value to a char arrayMax Kellermann2008-08-294-20/+5
| | | | | | | The value is stored in the same memory allocation as the tag_item struct; this saves memory because we do not store the value pointer anymore. Also remove the getTagItemString()/removeTagItemString() dummies.
* removed tree.cMax Kellermann2008-08-294-849/+69
| | | | | | | | | This patch makes MPD consume much more memory because string pooling is disabled, but it prepares the next bunch of patches. Replace the code in tagTracker.c with naive algorithms without the tree code. For now, this should do; later we should find better algorithms, especially for getNumberOfTagItems(), which has become wasteful with temporary memory.
* tag: converted MpdTag.items to a pointer listMax Kellermann2008-08-294-17/+20
| | | | | | This prepares the following patches, which aim to reduce MPD's memory usage: we plan to share tag_item instances, instead of just their values.
* tag: moved code to tag_id3.cMax Kellermann2008-08-296-352/+403
| | | | | The ID3 code uses only the public tag API, but is otherwise unrelated. Move it to a separate source file.
* wavpack: tag_new() cannot failMax Kellermann2008-08-291-5/+0
| | | | | Since tag_new() uses xmalloc(), it cannot fail - if we're really out of memory, the process will abort.
* tag: converted tag_add_item() to an inline functionMax Kellermann2008-08-291-2/+5
|
* tag: renamed functions, no CamelCaseMax Kellermann2008-08-2916-111/+110
|
* tag: renamed MpdTag and MpdTagItem to struct tag, struct mpd_tag_itemMax Kellermann2008-08-2921-90/+93
| | | | | Getting rid of CamelCase; not having typedefs also allows us to forward-declare the structures.
* added xfree() which takes a const pointerMax Kellermann2008-08-291-0/+13
| | | | | | | | Unfortunately, the C standard postulates that the argument to free() must be non-const. This does not makes sense, and virtually prevents every pointer which must be freed at some time to be non-const. Use the deconst hack (sorry for that) to allow us to free constant pointers.
* export the function client_is_expired()Max Kellermann2008-08-294-12/+6
| | | | | | | Instead of passing the pointer to the "expired" flag to processListOfCommands(), this function should use the client API to check this flag. We can now remove the "global_expired" hack introduced recently.
* client: pass the client struct to processCommand()Max Kellermann2008-08-294-9/+34
| | | | | | | | Start exporting the client struct as an opaque struct. For now, pass it only to processCommand() and processListOfCommands(), and provide a function to extract the socket handle. Later, we will propagate the pointer to all command implementations, and of course to client_print() etc.
* client: reorder function declarationsMax Kellermann2008-08-291-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-08-291-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-08-291-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.