aboutsummaryrefslogtreecommitdiffstats
path: root/src (unfollow)
Commit message (Collapse)AuthorFilesLines
2008-09-07alsa: add reasoning for the non-portable macroEric Wong1-0/+2
2008-09-07alsa: capitalize "ALSA" consistently in messagesEric Wong1-16/+9
That's the name of this project.
2008-09-07alsa: optimistically try resuming from suspendEric Wong1-11/+12
Apparently snd_pcm_hw_params_can_resume() can return false even though my hardware does in fact support resuming. So stop carrying that value in the canResume flag and just try to resume when we're in the suspended state; falling back to snd_pcm_prepare only if resuming fails. libao does something similar on resume, too. While we're at it, use the E() macro which will enable us to have better error reporting.
2008-09-07alsa: extra debugging outputs to fix suspend/hibernateEric Wong1-3/+9
Hibernating my laptop while MPD is playing results in ugliness about "alsa device foo was suspend" constantly printed to the logs.
2008-09-07alsa: cleanup debug assignment of the "cmd" variableEric Wong1-66/+50
Given the length of the ALSA command names, I only want to see them once per-section of code, if at all...
2008-09-07playlist: re-randomize when explicitly playing a new songEric Wong1-0/+1
When random is enabled and a user explicitly specifies a certain song on the playlist should be played; we need to re-randomize the internal ordering. To reproduce this, assuming a four song playlist: play <song_a> next => <song_b> next => <song_c> next => <song_d> play <song_a> next => <song_b> next => <song_c> next => <song_d> ... That is, the "next" command restarts song_{b,c,d} the second time "play" starts playing song_a. Thus, the second time "play" is called, the ordering of song_{b,c,d} needs to be reshuffled. Reported-by: Qball
2008-09-05tag: oops, of course items is now ** and not *Eric Wong1-2/+2
Gah, it seems like doing sizeof here either way is error prone. Too easy to leave out a '*' character we can forget.
2008-09-05audio_format: volatile removalEric Wong1-3/+3
volatile provides absolutely no guarantee thread-safety in SMP environments. volatile was designed to access memory locations in peripheral hardware directly; not for SMP. If volatile is needed to work properly on SMP, then it is only hiding subtle bugs. volatile only prevents the /compiler/ from making optimizations when accessing variables. CPUs do their own optimizations at runtime so it cannot guarantee registers of CPUs are flushed to memory cache-coherent access on different CPUs. Furthermore, the thread-communication via condition variables between threads sharing audio formats already results in memory barriers.
2008-09-05tag: lock all accesses to tag_poolEric Wong3-6/+15
The tag pool is a shared global resource that is infrequently modified. However, it can occasionally be modified by several threads, especially by the metadata_pipe for streaming metadata (both reading/writing). The bulk tag_item pool is NOT locked as currently only the update thread uses it.
2008-09-05tag: introduce handy items_size() functionEric Wong1-11/+12
Trying to read or remember "tag->numOfItems * sizeof(*tag->items)" requires too much thinking and mental effort on my part. Also, favor "sizeof(struct mpd_tag)" over "sizeof(*tag->items)" because the former is easier to read and follow, even though the latter is easier to modify if the items member changes to a different type.
2008-09-03tag: fix segfault on updateEric Wong2-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.
2008-09-02ob_send: avoid void pointer arithmetic warningEric Wong1-1/+1
2008-09-02volume: include outputBuffer.h for ob_set_sw_volumeEric Wong1-0/+1
2008-09-02Add missing function prototypesEric Wong4-4/+7
2008-09-02utf8.h: Fix build (broken os_compat.h #include)Eric Wong1-1/+1
This is not a system header
2008-09-02tag: optimize tag_dup(), copy item referencesMax Kellermann3-7/+42
Don't call tag_pool_get_item() for duplicating tags, just increase the item's reference counter instead.
2008-09-02tag: fix the shout and oggflac pluginsMax Kellermann2-6/+8
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.
2008-09-02const pointersMax Kellermann4-10/+10
Yet another patch which converts pointer arguments to "const".
2008-09-02tag: static directory nameMax Kellermann1-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%.
2008-09-02tag: try not to reallocate tag.items in every add() callMax Kellermann3-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%.
2008-09-02song: don't export newNullSong()Max Kellermann2-3/+1
The function newNullSong() is only used internally in song.c.
2008-09-02tag: try not to duplicate the input stringMax Kellermann1-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.
2008-09-02tag: pass length to fix_utf8()Max Kellermann1-3/+4
Same as the previous patch, prepare the function fix_utf8() this time.
2008-09-02added "length" parameter to validUtf8String()Max Kellermann4-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.
2008-09-02assert value!=NULL in fix_utf8()Max Kellermann1-1/+3
We must never pass value==NULL to fix_utf(). Replace the run-time check with an assertion.
2008-09-02tag: converted macro fixUtf8() to an inline functionMax Kellermann1-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.
2008-09-02tag: added a pool for tag itemsMax Kellermann5-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.
2008-09-02tag: converted tag_item.value to a char arrayMax Kellermann4-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.
2008-09-02removed tree.cMax Kellermann4-857/+67
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.
2008-09-02tag: converted MpdTag.items to a pointer listMax Kellermann4-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.
2008-09-02tag: moved code to tag_id3.cMax Kellermann5-352/+402
The ID3 code uses only the public tag API, but is otherwise unrelated. Move it to a separate source file.
2008-09-02wavpack: tag_new() cannot failMax Kellermann1-5/+0
Since tag_new() uses xmalloc(), it cannot fail - if we're really out of memory, the process will abort.
2008-09-02tag: converted tag_add_item() to an inline functionMax Kellermann1-2/+5
2008-09-02tag: renamed functions, no CamelCaseMax Kellermann19-121/+120
2008-09-02tag: renamed MpdTag and MpdTagItem to struct mpd_tag, struct tag_itemMax Kellermann26-109/+112
Getting rid of CamelCase; not having typedefs also allows us to forward-declare the structures.
2008-09-01use deconst_ptr instead of duplicating deconst logicEric Wong5-55/+15
2008-09-01provide a generic deconst_ptr functionEric Wong1-0/+11
This is generic enough to be used for various purposes. It will only deconst their argument to work around various braindead APIs without having to write a new wrapper each time we use one of those braindead APIs. It does not cast nor do do anything other than quietly remove the const qualifier for those braindead APIs.
2008-09-01playlist: fix shuffle/random distributionEric Wong1-6/+19
Previously we were using a naive randomization algorithm that could shuffle already shuffled songs. Now we attempt to correctly[1] implement the Fisher-Yates shuffle. [1] Note: I absolutely suck at basic arithmetic, so there could be off-by-one errors in here, too. I've added assertions in swapSongs and swapOrder functions to more quickly detect them.
2008-09-01storedPlaylist: correctly expand path when writingEric Wong1-6/+7
Otherwise we'd be writing to whatever directory that mpd is running in.
2008-09-01Fix shadow warningsEric Wong2-4/+4
2008-08-31pass constant pointersMax Kellermann10-16/+17
And again, convert arguments to const.
2008-08-31const pointersMax Kellermann6-16/+16
The usual bunch of pointer arguments which should be const.
2008-08-31unsigned integers and size_tMax Kellermann3-11/+11
Use "unsigned int" whenever negative values are not meaningful. Use size_t whenever we are going to describe buffer sizes.
2008-08-31oggflac: fix GCC warningsMax Kellermann1-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.
2008-08-31include cleanupMax Kellermann4-2/+3
Only include headers which are really needed.
2008-08-31protect locate.h from double inclusionMax Kellermann1-0/+5
2008-08-31playlist: eliminate unused fd parametersMax Kellermann3-34/+34
Again, remove file descriptor parameters, which are not actually used. These functions can also be converted to return void.
2008-08-31jack: made "sample_size" static constMax Kellermann1-1/+1
sample_size is a variable which is computed at compile time. Declare it "static const", so the compiler can optimize it away.
2008-08-31moved jack configuration to the JackData structMax Kellermann1-49/+64
Storing local configuration in global (static) variables is obviously a bad idea. Move all those variables into the JackData struct, including the locks.
2008-08-31jack: removed unused macrosMax Kellermann1-10/+0