oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

tag: added buffered versions of the tag_print.c code

Browse Source 
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.
This commit is contained in:
Max Kellermann 2008-09-07 13:36:05 +02:00
parent 75aa8dad4c
commit 59efed3e8e
4 changed files with 85 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Makefile.am
View File

@ -88,6 +88,7 @@ mpd_headers = \
tag_pool.h \
tag_id3.h \
tag_print.h \
tag_save.h \
tagTracker.h \
utf8.h \
utils.h \
@ -154,6 +155,7 @@ mpd_SOURCES = \
tag_pool.c \
tag_id3.c \
tag_print.c \
tag_save.c \
tagTracker.c \
utils.c \
volume.c \

23
src/song_save.c
View File

@ -17,7 +17,7 @@
*/
#include "song_save.h"
#include "song_print.h"
#include "tag_save.h"
#include "directory.h"
#include "path.h"
#include "utils.h"
@ -27,6 +27,24 @@
#define SONG_KEY "key: "
#define SONG_MTIME "mtime: "
static void song_save_url(FILE *fp, Song * song)
{
if (song->parentDir != NULL && song->parentDir->path != NULL)
fprintf(fp, SONG_FILE "%s/%s\n",
getDirectoryPath(song->parentDir), song->url);
else
fprintf(fp, SONG_FILE "%s\n",
song->url);
}
static void song_save(FILE *fp, Song * song)
{
song_save_url(fp, song);
if (song->tag != NULL)
tag_save(fp, song->tag);
}
void writeSongInfoFromList(FILE * fp, SongList * list)
{
ListNode *tempNode = list->firstNode;
@ -35,8 +53,7 @@ void writeSongInfoFromList(FILE * fp, SongList * list)
while (tempNode != NULL) {
fprintf(fp, "%s%s\n", SONG_KEY, tempNode->key);
fflush(fp);
printSongInfo(fileno(fp), (Song *) tempNode->data);
song_save(fp, (Song *) tempNode->data);
fprintf(fp, "%s%li\n", SONG_MTIME,
(long)((Song *) tempNode->data)->mtime);
tempNode = tempNode->nextNode;

35
src/tag_save.c Normal file
View File

@ -0,0 +1,35 @@
/* the Music Player Daemon (MPD)
* Copyright (C) 2003-2007 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* 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.
* 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "tag_save.h"
#include "tag.h"
#include "tag_internal.h"
#include "song.h"
void tag_save(FILE *file, const struct tag *tag)
{
int i;
if (tag->time >= 0)
fprintf(file, SONG_TIME "%i\n", tag->time);
for (i = 0; i < tag->numOfItems; i++)
fprintf(file, "%s: %s\n",
mpdTagItemKeys[tag->items[i]->type],
tag->items[i]->value);
}

28
src/tag_save.h Normal file
View File

@ -0,0 +1,28 @@
/* the Music Player Daemon (MPD)
* Copyright (C) 2003-2007 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* 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.
* 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifndef TAG_SAVE_H
#define TAG_SAVE_H
#include "os_compat.h"
struct tag;
void tag_save(FILE *file, const struct tag *tag);
#endif