| Commit message (Collapse) | Author | Files | Lines |
|---|
|
Check the old status before assigning. This saves a temporary
variable.
|
|
Include only headers which are really used.
[ew: this is totally different from Max's branch]
|
|
Again, a data type which can be forward-declared.
[ew:
* used "struct mpd_song" instead to avoid token duplication
(like I did with "struct mpd_tag") as there's no good
abbreviation for "song" and identical tokens on the same
line don't read well
* rewritten using
perl -i -p -e 's/\bSong\b/struct mpd_song/g' src/*.[ch]
since it was too hard to merge
* also, I don't care much for forward declarations
]
|
|
The struct can be forward-declared by other headers, which relaxes the
header dependencies.
|
|
exploreDirectory() duplicates some code in updateDirectory(). Merge
both functions, and use directory_is_empty() to determine whether
update or explore mode should be used.
|
|
directory_is_empty() is a tiny inline function which determine if a
directory has any child objects (sub directories or songs).
|
|
The source directory.c mixes several libraries: directory object
management, database management and database update, resulting in a
1000+ line monster. Move the whole database update code to update.c.
|
|
Having all functions as static (non-inline) functions generates GCC
warnings, and duplicates binary code across several object files.
Most of dirvec's methods are too complex for becoming inline
functions. Move them all to dirvec.c and publish the prototypes in
dirvec.h.
|
|
Somehow I must have missed this in commit 22e40b61.
|
|
The "packed" attribute may have negative side effects on performance.
Remove the "packed" attribute, and increase the size of "song.url" to
a multiple of the machine word size.
|
|
> From: Igor Vagulin <hidden@address.private.email>
> To: warren.dukes@gmail.com
> Date: Wed, 08 Oct 2008 03:09:15 +0400
> CC: jat@spatialrift.net, normalperson@yhbt.net
> Subject: mpd bug: create-db with fs locale differ from latin1 and utf8
>
> Hi Warren,
>
> I discover a bug in mpd from trunk. I make a patch and decide to send to
> maintainer in hope it may be useful.
>
> Bug triggers folowing steps:
> - Set filesystem_charset to something not latin1 and utf8.(For me
> fs-charset was KOI8-R)
> - Put some music in music directory with non ascii characters in path.
> - run mpg with --create-db option, so mpd will try to find all music
> files in music directory.
>
> Result: music files with non latin characters in path don't added to db.
>
> Bug happen because function newSong don't translate path into fs charset
> before send it to plugin tagDupFuntion. On my machine tagDupFunction
> can't find file when it was. Small patch in attach fix problem.
Signed-off-by: Eric Wong <normalperson@yhbt.net>
|
|
With commit 6dcd7fea (if I am not mistaken) the error returned when
you try to save to an existing playlist is wrong. Instead of
MPD_ACK_ERROR_EXIST, MPD_ACK_ERROR_NO_EXIST is returned. This is
obviously wrong and breaks gmpc.
|
|
oops :x
|
|
This makes the update code thread-safe and doesn't penalize
the playlist code by complicating it with complicated and
error-prone locks (and the associated overhead, not everybody
has a thread-implementation as good as NPTL).
The update task blocks during the delete; but the update task is
a slow task anyways so we can block w/o people caring too much.
This was also our only freeSong call site, so remove that
function.
Note that deleting entire directories is not fully thread-safe,
yet; as their traversals are not yet locked.
|
|
Get rid of songvec_write so we can enforce proper locking
|
|
Remove unnecessary wrapper function now that we have
song_print_url_x and also return the results directly
since we'll know the song_print_* functions will all
return -1 on error.
|
|
It'll be handy for passing throug songvec_for_each like
song_print_info_x.
|
|
Being consistent with most UNIX functions...
|
|
Only one lock is used for all songvec traversals since
they're rarely changed. Also, minimize lock time and
release it before calling iterator functions since they
may block (updateSongInfo => stat/open/seek/read).
This lock only protects songvecs (and all of them) during
traversals; not the individual song structures themselves.
|
|
traverseAllIn will be modified to take < 0 as errors instead of
non-zero...
|
|
This is so we can more consistently deal with locking
needed for thread-safety in iterator functions.
|
|
This make argument order more consistent for iterators.
Additionally, these now return ssize_t results for error
checking.
|
|
More power to those who can't afford newer computers
capable of installing/building/running newer toolchains.
|
|
Upgrading a toolchain is still a nasty operation and they're
never easy to build, so don't force people to upgrade from their
old compilers (especially since some people are still stuck with
Linux 2.4 and gcc 2.95).
|
|
song objects cannot exist without a path or URL
|
|
* Add missing headers in Makefile.am
* remove mp4ff.dsp (Win32 crap)
* Add scripts, m4, bs, autogen.sh to allow for hotfixes by the
SCM-challenged. (downloading the source via git is NOT a
lightweight operation for everybody).
|
|
We already know if a song is a URL or not based on whether it
has parentDir defined or not. Hopefully one day in the future
we can drop HTTP support from MPD entirely when an HTTP
filesystem comes along and we can access streams via open(2).
|
|
Reduce the number of allocations we make, so there's less
pressure on the allocator and less overhead to keep track
of the allocations in.
|
|
Having an enum type is much nicer than an anonymous integer plus CPP
macros. Note that the old code didn't save any space by declaring the
variable 8 bit, due to padding.
|
|
It didn't save us any lines of code nor did it do anything
useful since we would overwrite everything anyways.
|
|
There's no reason to scan the playlist for a song we
just allocated.
|
|
Thanks (again) to unK for the report :x
|
|
Thanks to unK for the report
|
|
Wow, I must have been halfway asleep when I did that...
|
|
This got broken when listHandlerFunc was removed. Since we no
longer need it and it's confusing, remove processCommandInternal
and just use process_command.
|
|
The current song information could get cleared if we got
to the end of the playlist and mpd is not in repeat
mode. This also prevents "currentsong" from returning
information if mpd is not playing.
|
|
Instead of allocating a new one, just reuse an existing
one if one is found when rereading the DB. This is a small
makes the previous commit work on subdirectories
of the root music directory.
[1] "song: better handling of existing songs when rereading DB"
|
|
Don't reallocate existing tags if they haven't changed.
This isn't used as often anymore, but we still take HUP
signals to reread the DB if other processes changed it.
|
|
avoid some redundant clearing logic as well, since the tag is
getting freed.
|
|
This is still not SMP-safe yet, as it needs at least a barrier
before calling tag_free(old_tag).
|
|
commands should really not behave differently if they're issued
inside a command list or not; so stop having special handler
functions to deal with them. "update" was the only command
that used this functionality and I changed that in the last
commit to serialize access.
|
|
Now the "update" command can be issued multiple times regardless
of whether the client is in list mode or not.
We serialize the update tasks to prevent updates from trampling
over each other and will spawn another update task
once the current one is finished updating and reaped.
Right now we cap the queue size to 32 which is probably enough (I
bet most people usually run update with no argument anyways);
but we can make it grow/shrink dynamically if needed. There'll
still be a hard-coded limit to prevent DoS attacks, though.
|
|
It'll be easier to keep track of what code runs in what
task/thread this way.
|
|
Instead of relying on the shortname, just pass the song pointer
to prevent redundant lookups during deletes.
|
|
This is still not SMP-safe yet, as it needs at least a barrier
before calling tag_free(old_tag).
Locks may be simpler to implement and the potential performance
gain of avoiding locks may not be worth it on infrequently
modified data structures...
|
|
Hopefully this makes the code feel less claustrophobic...
|
|
This actually opened us up to making lock dependencies more
difficult than they needed to be now that we have threaded
updates. We would always use the memory anyways, just in
the stack instead of bss.
|
|
Seeing the "mpd_" prefix _everywhere_ is mind-numbing as the
mind needs to retrain itself to skip over the first 4 tokens of
a type to get to its meaning. So avoid having extra characters
on my terminal to make it easier to follow code at 2:30 am in
the morning.
Please report any new issues you may come across on Free
toolchains. I realize how difficult it can be to build/maintain
cross-compiling toolchains and I have no intention of forcing
people to upgrade their toolchains to build mpd.
Tested with gcc 2.95.4 and and gcc 4.3.1 on x86-32.
|
|
tfing wrote:
> I have quite some files with an empty album tag as they do not come
> from a particular album.
>
> If I want to look for those files and browse them, this happens:
> :: nc localhost 6600
> OK MPD 0.12.0
> find album ""
> ACK [2@0] {find} too few arguments for "find"
>
> I'd like to be able to browse those files in a client like gmpc.
> So these 2 items would have to be developed:
> - list album should report that some files have an empty tag
> - it should be possible to search for an empty tag with the find command
Patch-by: Marc Pavot
ref: http://musicpd.org/mantis/view.php?id=464
|
|
We already sanitize and duplicated our paths before calling
updateInit() to get pre-pthread_create() error-checking along
with heap allocation reduction because we don't have to redupe
because our parent stack went away.
|
