2009-03-13 18:43:16 +01:00
|
|
|
/*
|
2011-01-29 10:13:54 +01:00
|
|
|
* Copyright (C) 2003-2011 The Music Player Daemon Project
|
2009-03-13 18:43:16 +01:00
|
|
|
* http://www.musicpd.org
|
2004-02-24 00:41:20 +01:00
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
|
|
* (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
2009-03-13 18:43:16 +01:00
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License along
|
|
|
|
* with this program; if not, write to the Free Software Foundation, Inc.,
|
|
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
2004-02-24 00:41:20 +01:00
|
|
|
*/
|
|
|
|
|
2008-10-31 09:19:53 +01:00
|
|
|
#ifndef MPD_TAG_H
|
|
|
|
#define MPD_TAG_H
|
2004-02-24 00:41:20 +01:00
|
|
|
|
tag: added a pool for tag items
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-08-29 09:38:37 +02:00
|
|
|
#include "gcc.h"
|
2004-11-10 22:58:27 +01:00
|
|
|
|
2008-10-08 10:49:29 +02:00
|
|
|
#include <stdint.h>
|
|
|
|
#include <stddef.h>
|
2008-11-03 18:24:00 +01:00
|
|
|
#include <stdbool.h>
|
2008-10-08 10:49:29 +02:00
|
|
|
#include <string.h>
|
|
|
|
|
2009-03-01 00:55:20 +01:00
|
|
|
/**
|
|
|
|
* Codes for the type of a tag item.
|
|
|
|
*/
|
2008-08-26 08:27:09 +02:00
|
|
|
enum tag_type {
|
2009-10-13 16:12:45 +02:00
|
|
|
TAG_ARTIST,
|
2009-07-09 14:28:08 +02:00
|
|
|
TAG_ARTIST_SORT,
|
2009-10-13 16:12:45 +02:00
|
|
|
TAG_ALBUM,
|
|
|
|
TAG_ALBUM_ARTIST,
|
2009-07-07 07:36:25 +02:00
|
|
|
TAG_ALBUM_ARTIST_SORT,
|
2009-10-13 16:12:45 +02:00
|
|
|
TAG_TITLE,
|
|
|
|
TAG_TRACK,
|
|
|
|
TAG_NAME,
|
|
|
|
TAG_GENRE,
|
|
|
|
TAG_DATE,
|
|
|
|
TAG_COMPOSER,
|
|
|
|
TAG_PERFORMER,
|
|
|
|
TAG_COMMENT,
|
|
|
|
TAG_DISC,
|
2009-01-24 20:02:55 +01:00
|
|
|
|
|
|
|
TAG_MUSICBRAINZ_ARTISTID,
|
|
|
|
TAG_MUSICBRAINZ_ALBUMID,
|
|
|
|
TAG_MUSICBRAINZ_ALBUMARTISTID,
|
|
|
|
TAG_MUSICBRAINZ_TRACKID,
|
|
|
|
|
2008-08-26 08:27:09 +02:00
|
|
|
TAG_NUM_OF_ITEM_TYPES
|
|
|
|
};
|
2004-11-10 22:58:27 +01:00
|
|
|
|
2009-03-01 00:55:20 +01:00
|
|
|
/**
|
|
|
|
* An array of strings, which map the #tag_type to its machine
|
|
|
|
* readable name (specific to the MPD protocol).
|
|
|
|
*/
|
2009-02-27 09:01:55 +01:00
|
|
|
extern const char *tag_item_names[];
|
2004-11-10 22:58:27 +01:00
|
|
|
|
2009-03-01 00:55:20 +01:00
|
|
|
/**
|
|
|
|
* One tag value. It is a mapping of #tag_type to am arbitrary string
|
|
|
|
* value. Each tag can have multiple items of one tag type (although
|
|
|
|
* few clients support that).
|
|
|
|
*/
|
2008-08-29 09:38:11 +02:00
|
|
|
struct tag_item {
|
2009-03-01 00:55:20 +01:00
|
|
|
/** the type of this item */
|
2008-08-26 08:27:09 +02:00
|
|
|
enum tag_type type;
|
2009-03-01 00:55:20 +01:00
|
|
|
|
|
|
|
/**
|
|
|
|
* the value of this tag; this is a variable length string
|
|
|
|
*/
|
2008-10-13 09:40:14 +02:00
|
|
|
char value[sizeof(long)];
|
tag: added a pool for tag items
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-08-29 09:38:37 +02:00
|
|
|
} mpd_packed;
|
2004-11-10 22:58:27 +01:00
|
|
|
|
2009-03-01 00:55:20 +01:00
|
|
|
/**
|
|
|
|
* The meta information about a song file. It is a MPD specific
|
|
|
|
* subset of tags (e.g. from ID3, vorbis comments, ...).
|
|
|
|
*/
|
2008-08-29 09:38:11 +02:00
|
|
|
struct tag {
|
2009-03-01 00:55:20 +01:00
|
|
|
/**
|
|
|
|
* The duration of the song (in seconds). A value of zero
|
|
|
|
* means that the length is unknown. If the duration is
|
|
|
|
* really between zero and one second, you should round up to
|
|
|
|
* 1.
|
|
|
|
*/
|
2004-03-11 01:16:49 +01:00
|
|
|
int time;
|
2009-03-01 00:55:20 +01:00
|
|
|
|
|
|
|
/** an array of tag items */
|
2008-08-29 09:38:29 +02:00
|
|
|
struct tag_item **items;
|
2009-03-01 00:55:20 +01:00
|
|
|
|
|
|
|
/** the total number of tag items in the #items array */
|
2009-02-27 09:02:13 +01:00
|
|
|
unsigned num_items;
|
2008-08-29 09:38:11 +02:00
|
|
|
};
|
2004-02-24 00:41:20 +01:00
|
|
|
|
2009-11-04 18:47:42 +01:00
|
|
|
/**
|
|
|
|
* Parse the string, and convert it into a #tag_type. Returns
|
|
|
|
* #TAG_NUM_OF_ITEM_TYPES if the string could not be recognized.
|
|
|
|
*/
|
|
|
|
enum tag_type
|
|
|
|
tag_name_parse(const char *name);
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Parse the string, and convert it into a #tag_type. Returns
|
|
|
|
* #TAG_NUM_OF_ITEM_TYPES if the string could not be recognized.
|
|
|
|
*
|
|
|
|
* Case does not matter.
|
|
|
|
*/
|
|
|
|
enum tag_type
|
|
|
|
tag_name_parse_i(const char *name);
|
|
|
|
|
2009-03-01 00:55:20 +01:00
|
|
|
/**
|
|
|
|
* Creates an empty #tag.
|
|
|
|
*/
|
2008-08-29 09:38:21 +02:00
|
|
|
struct tag *tag_new(void);
|
2004-02-24 00:41:20 +01:00
|
|
|
|
2009-03-01 00:55:20 +01:00
|
|
|
/**
|
|
|
|
* Initializes the tag library.
|
|
|
|
*/
|
2008-08-29 09:38:21 +02:00
|
|
|
void tag_lib_init(void);
|
2004-11-10 22:58:27 +01:00
|
|
|
|
2009-03-01 00:55:20 +01:00
|
|
|
/**
|
|
|
|
* Clear all tag items with the specified type.
|
|
|
|
*/
|
2009-03-01 00:52:02 +01:00
|
|
|
void tag_clear_items_by_type(struct tag *tag, enum tag_type type);
|
2004-11-10 22:58:27 +01:00
|
|
|
|
2009-03-01 00:55:20 +01:00
|
|
|
/**
|
|
|
|
* Frees a #tag object and all its items.
|
|
|
|
*/
|
2008-08-29 09:38:21 +02:00
|
|
|
void tag_free(struct tag *tag);
|
2004-02-24 00:41:20 +01:00
|
|
|
|
tag: try not to reallocate tag.items in every add() call
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-08-29 09:39:08 +02:00
|
|
|
/**
|
|
|
|
* Gives an optional hint to the tag library that we will now add
|
|
|
|
* several tag items; this is used by the library to optimize memory
|
|
|
|
* allocation. Only one tag may be in this state, and this tag must
|
|
|
|
* not have any items yet. You must call tag_end_add() when you are
|
|
|
|
* done.
|
|
|
|
*/
|
|
|
|
void tag_begin_add(struct tag *tag);
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Finishes the operation started with tag_begin_add().
|
|
|
|
*/
|
|
|
|
void tag_end_add(struct tag *tag);
|
|
|
|
|
2009-03-01 00:55:20 +01:00
|
|
|
/**
|
|
|
|
* Appends a new tag item.
|
|
|
|
*
|
|
|
|
* @param tag the #tag object
|
|
|
|
* @param type the type of the new tag item
|
|
|
|
* @param value the value of the tag item (not null-terminated)
|
|
|
|
* @param len the length of #value
|
|
|
|
*/
|
2009-03-01 00:52:02 +01:00
|
|
|
void tag_add_item_n(struct tag *tag, enum tag_type type,
|
tag: try not to reallocate tag.items in every add() call
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-08-29 09:39:08 +02:00
|
|
|
const char *value, size_t len);
|
2004-11-10 22:58:27 +01:00
|
|
|
|
2009-03-01 00:55:20 +01:00
|
|
|
/**
|
|
|
|
* Appends a new tag item.
|
|
|
|
*
|
|
|
|
* @param tag the #tag object
|
|
|
|
* @param type the type of the new tag item
|
|
|
|
* @param value the value of the tag item (null-terminated)
|
|
|
|
*/
|
2009-03-01 00:52:02 +01:00
|
|
|
static inline void
|
|
|
|
tag_add_item(struct tag *tag, enum tag_type type, const char *value)
|
2008-08-29 09:38:24 +02:00
|
|
|
{
|
2009-03-01 00:52:02 +01:00
|
|
|
tag_add_item_n(tag, type, value, strlen(value));
|
2008-08-29 09:38:24 +02:00
|
|
|
}
|
2004-11-10 22:58:27 +01:00
|
|
|
|
2009-03-01 00:55:20 +01:00
|
|
|
/**
|
|
|
|
* Duplicates a #tag object.
|
|
|
|
*/
|
2008-08-29 14:48:39 +02:00
|
|
|
struct tag *tag_dup(const struct tag *tag);
|
2004-02-24 00:41:20 +01:00
|
|
|
|
2009-01-03 23:28:51 +01:00
|
|
|
/**
|
|
|
|
* Merges the data from two tags. If both tags share data for the
|
|
|
|
* same tag_type, only data from "add" is used.
|
|
|
|
*
|
|
|
|
* @return a newly allocated tag, which must be freed with tag_free()
|
|
|
|
*/
|
|
|
|
struct tag *
|
|
|
|
tag_merge(const struct tag *base, const struct tag *add);
|
|
|
|
|
2010-03-17 23:12:21 +01:00
|
|
|
/**
|
|
|
|
* Merges the data from two tags. Any of the two may be NULL. Both
|
|
|
|
* are freed by this function.
|
|
|
|
*
|
|
|
|
* @return a newly allocated tag, which must be freed with tag_free()
|
|
|
|
*/
|
|
|
|
struct tag *
|
|
|
|
tag_merge_replace(struct tag *base, struct tag *add);
|
|
|
|
|
2008-11-04 16:55:11 +01:00
|
|
|
/**
|
|
|
|
* Returns true if the tag contains no items. This ignores the "time"
|
|
|
|
* attribute.
|
|
|
|
*/
|
|
|
|
static inline bool
|
|
|
|
tag_is_empty(const struct tag *tag)
|
|
|
|
{
|
2009-02-27 09:01:55 +01:00
|
|
|
return tag->num_items == 0;
|
2008-11-04 16:55:11 +01:00
|
|
|
}
|
|
|
|
|
2009-01-15 22:00:26 +01:00
|
|
|
/**
|
|
|
|
* Returns true if the tag contains any information.
|
|
|
|
*/
|
|
|
|
static inline bool
|
|
|
|
tag_is_defined(const struct tag *tag)
|
|
|
|
{
|
|
|
|
return !tag_is_empty(tag) || tag->time >= 0;
|
|
|
|
}
|
|
|
|
|
2009-01-15 00:21:08 +01:00
|
|
|
/**
|
|
|
|
* Returns the first value of the specified tag type, or NULL if none
|
|
|
|
* is present in this tag object.
|
|
|
|
*/
|
|
|
|
const char *
|
|
|
|
tag_get_value(const struct tag *tag, enum tag_type type);
|
|
|
|
|
2008-11-03 18:24:00 +01:00
|
|
|
/**
|
|
|
|
* Checks whether the tag contains one or more items with
|
|
|
|
* the specified type.
|
|
|
|
*/
|
|
|
|
bool tag_has_type(const struct tag *tag, enum tag_type type);
|
|
|
|
|
2009-03-01 00:55:20 +01:00
|
|
|
/**
|
|
|
|
* Compares two tags, including the duration and all tag items. The
|
|
|
|
* order of the tag items matters.
|
|
|
|
*/
|
2009-02-27 08:06:59 +01:00
|
|
|
bool tag_equal(const struct tag *tag1, const struct tag *tag2);
|
2004-06-01 12:28:06 +02:00
|
|
|
|
2004-02-24 00:41:20 +01:00
|
|
|
#endif
|