aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* pass constant pointersMax Kellermann2008-08-2910-16/+17
| | | | And again, convert arguments to const.
* client: removed superfluous assertionMax Kellermann2008-08-291-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.
* log.c: thread-safety for warning logEric Wong2008-08-281-4/+12
| | | | | | I'm really no fan of the warning log, it's too complex for how little it gets used; but fixing it is another problem.
* Point the contact email to musicpd-dev-teamEric Wong2008-08-281-1/+1
| | | | | | | Warren hasn't been active in development in a while and probably doesn't have much time to answer user questions. So point the mailing contact to the public mailing lists where any developer can see and answer.
* client: more assertionsMax Kellermann2008-08-281-0/+6
|
* client: replace "expired" flag with fd==-1Max Kellermann2008-08-281-6/+6
| | | | Why waste 4 bytes for a flag which we can hide in another variable.
* client: moved "expired" accesses into inline functionMax Kellermann2008-08-281-13/+29
| | | | Hiding this flag allows us later to remove it easily.
* moved code to sockaddr_to_tmp_string()Max Kellermann2008-08-281-9/+17
| | | | | Unclutter the client_new() constructor by moving unrelated complex code into a separate function.
* client: no while loop in client_manager_io()Max Kellermann2008-08-281-32/+26
| | | | | | 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-08-281-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-08-281-7/+3
| | | | | Eliminate duplicated code, call client_defer_output() which we splitted from client_write_output() earlier.
* moved code to client_write()Max Kellermann2008-08-281-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-08-281-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-08-281-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-08-281-20/+27
| | | | | Split the large function client_write_output() into two parts; this is the first code moving patch.
* don't free client resources except in client_close()Max Kellermann2008-08-281-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-08-281-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-08-281-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-08-281-30/+31
| | | | This saves one level of indent.
* client: renamed all public functionsMax Kellermann2008-08-286-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-08-281-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-08-281-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-08-287-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-08-282-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.
* const pointersMax Kellermann2008-08-286-16/+16
| | | | The usual bunch of pointer arguments which should be const.
* unsigned integers and size_tMax Kellermann2008-08-283-11/+11
| | | | | Use "unsigned int" whenever negative values are not meaningful. Use size_t whenever we are going to describe buffer sizes.
* include cleanupMax Kellermann2008-08-284-2/+3
| | | | Only include headers which are really needed.
* protect locate.h from double inclusionMax Kellermann2008-08-281-0/+5
|