From 1d123cd496bd9c01586dcb8d75f48fc3c5e74532 Mon Sep 17 00:00:00 2001 From: Warren Dukes Date: Thu, 11 Nov 2004 05:25:05 +0000 Subject: better saved memmory display git-svn-id: https://svn.musicpd.org/mpd/trunk@2607 09075e82-0dd4-0310-85a5-a0d7c8717e4f --- src/dbUtils.c | 37 +++++++++++++++++++++++++++---------- 1 file changed, 27 insertions(+), 10 deletions(-) (limited to 'src/dbUtils.c') diff --git a/src/dbUtils.c b/src/dbUtils.c index 51e991130..60344a291 100644 --- a/src/dbUtils.c +++ b/src/dbUtils.c @@ -270,7 +270,7 @@ int listAllUniqueTags(FILE * fp, int type, int numConditionals, return ret; } -int sumSavedMemoryInDirectory(FILE * fp, Directory * dir, void * data) { +int sumSavedFilenameMemoryInDirectory(FILE * fp, Directory * dir, void * data) { int * sum = data; if(!dir->name) return 0; @@ -278,15 +278,10 @@ int sumSavedMemoryInDirectory(FILE * fp, Directory * dir, void * data) { *sum += (strlen(getDirectoryPath(dir))+1-sizeof(Directory *))* dir->songs->numberOfNodes; - *sum += (strlen(getDirectoryPath(dir))+1)* - dir->subDirectories->numberOfNodes; - - *sum += strlen(dir->name)+1; - return 0; } -int sumSavedMemoryInSong(FILE * fp, Song * song, void * data) { +int sumSavedFilenameMemoryInSong(FILE * fp, Song * song, void * data) { int * sum = data; *sum += strlen(song->url)+1; @@ -295,10 +290,32 @@ int sumSavedMemoryInSong(FILE * fp, Song * song, void * data) { } void printSavedMemoryFromFilenames() { - int sum; + int sum = 0; - traverseAllIn(stderr, NULL, sumSavedMemoryInSong, - sumSavedMemoryInDirectory, (void *)&sum); + traverseAllIn(stderr, NULL, sumSavedFilenameMemoryInSong, + sumSavedFilenameMemoryInDirectory, (void *)&sum); DEBUG("saved memory from filenames: %i\n", sum); } + +int sumSavedDirectoryNameMemoryInDirectory(FILE * fp, Directory * dir, void * data) { + int * sum = data; + + if(!dir->name) return 0; + + *sum += (strlen(getDirectoryPath(dir))+1)* + dir->subDirectories->numberOfNodes; + + *sum += strlen(dir->name)+1; + + return 0; +} + +void printSavedMemoryFromDirectoryNames() { + int sum = 0; + + traverseAllIn(stderr, NULL, NULL, + sumSavedDirectoryNameMemoryInDirectory, (void *)&sum); + + DEBUG("saved memory from directory names: %i\n", sum); +} -- cgit v1.2.3