aboutsummaryrefslogtreecommitdiffstats
path: root/src (follow)
Commit message (Collapse)AuthorAgeFilesLines
* update: never pass root path to updatePath()Max Kellermann2008-10-111-6/+1
| | | | | update_task() already checks if it has got a root path. Extend this check and in turn remove a check in the inner function updatePath().
* update: merged addDirectoryPathToDB() into addParentPathToDB()Max Kellermann2008-10-111-23/+3
| | | | | | | The algorithm in addDirectoryPathToDB() can be simplified further if it is combined with the function addParentPathToDB(). Since there is no other caller of addDirectoryPathToDB(), we can do that. This saves another large stack buffer.
* update: make addDirectoryPathToDB() non-recursiveMax Kellermann2008-10-111-11/+13
| | | | | | This recursive function is very dangerous because it allocates a large buffer on the stack in every iteration. That may be misused to generate a stack overflow.
* update: delete directory after failed updateMax Kellermann2008-10-111-1/+8
| | | | | When a directory cannot be updated, there must be something wrong with it, and the database contains stale data. Remove it.
* update: moved code to directory_make_child_checked()Max Kellermann2008-10-111-22/+25
| | | | | | The branching looks a bit complicated in addDirectoryPathToDB() - improve its readability by moving code to a simplified separate function.
* update: clear root after errorMax Kellermann2008-10-111-0/+1
| | | | | When the root directory fails to update, its contents are invalid. Clear it then.
* update: locked delete after update errorMax Kellermann2008-10-111-1/+37
| | | | | | | When a directory failed to update, it was removed from the database, without freeing all children and songs (memory leak), and without locking (race condition). Introduce the functions clear_directory() and delete_directory(), which do both.
* dirvec: added dirvec_clear()Max Kellermann2008-10-111-0/+5
|
* update: removed addToDirectory()Max Kellermann2008-10-111-38/+10
| | | | | | Use updateInDirectory() instead of addToDirectory(). Eliminate a duplicate stat() in updateInDirectory() by calling song_file_update() directly.
* directory: don't query database during loadMax Kellermann2008-10-111-2/+1
| | | | | | Don't use db_get_directory() and traverse the full path with every directory being loaded. Just see if the current parent contains the entry. Everything else would be invalid anyway..
* directory: check the absolute path of a subdirectory while loadingMax Kellermann2008-10-111-0/+4
| | | | | | | A manipulated database could trigger an assertion failure, because the parent didn't match. Do a proper check if the new directory is within the parent's. This uses FATAL() to bail out, so MPD still dies, but it doesn't crash.
* directory: added inline wrappers for accessing childrenMax Kellermann2008-10-113-7/+19
| | | | | Some tiny utilities... wrappers like these may become helpful when we introduce locking.
* dirvec: constant pointers in dirvec_find()Max Kellermann2008-10-112-2/+2
| | | | | dirvec_find() does not modify the object, thus it should get a const pointer.
* directory: moved dirvec struct declaration to dirvec.hMax Kellermann2008-10-113-7/+7
| | | | | No idea why it was created in directory.h, but it should be in dirvec.h.
* diretory: moved code to directory_save.c, directory_print.cMax Kellermann2008-10-118-116/+226
| | | | | | Remove clutter from directory.c. Everything which saves or loads to/from the hard disk goes to directory_save.c, and code which sends directory information to the client is moved into directory_print.c.
* database: removed local variable bufferSizeMax Kellermann2008-10-111-3/+2
| | | | Use sizeof(buffer) instead.
* database: simplify db_load()Max Kellermann2008-10-111-47/+42
| | | | Removed a superfluous closure.
* directory: fix update in root directoryMax Kellermann2008-10-112-4/+3
| | | | | | | Commit 0bfe7802 broke update for new files in the root directory, because music_root->path was an empty string and not NULL. There were some NULL tests missing. Change them to !isRootDirectory(path) instead of path!=NULL.
* directory: path must not be NULLMax Kellermann2008-10-113-10/+10
| | | | | For the root directory, let's set path to an empty string. This saves a few checks.
* directory: directory_get_path(NULL) is not allowedMax Kellermann2008-10-111-3/+4
| | | | | Also convert directory_get_path() to an inline function, which returns a constant string.
* songvec: pass const pointersMax Kellermann2008-10-112-2/+2
| | | | | | Pass const songvec pointers to songvec_find() and songvec_for_each(). [ew: already merged songvec_for_each() cosntification somewhere...]
* directory: eliminate CamelCaseMax Kellermann2008-10-117-50/+50
| | | | | | | | CamelCase is ugly, rename the functions. [ew: "directory_get_directory" was too confusing, using "directory_get_subdir" instead (old function was named "getSubDirectory")]
* database: renamed functions, "db_" prefix and no CamelCaseMax Kellermann2008-10-1112-62/+62
| | | | Yet another CamelCase removal patch.
* database: removed printDirectoryInfo()Max Kellermann2008-10-113-12/+4
| | | | The same can be achieved with directory_print(db_get_directory()).
* directory: moved code to database.cMax Kellermann2008-10-1115-335/+418
| | | | | | Taming the directory.c monster, part II: move the database management stuff to database. directory.c should only contain code which works on directory objects.
* directory: converted isRootDirectory() to an inline functionMax Kellermann2008-10-112-6/+10
| | | | | The function isRootDirectory() is tiny and can be converted to an inline function. Don't allow name==NULL.
* song: use song_file_update() in song_file_load()Max Kellermann2008-10-111-11/+1
| | | | Eliminate duplicated code.
* song: song_file_update() returns booleanMax Kellermann2008-10-112-5/+3
| | | | | | | | | | | | | | Instead of returning 0 or -1, return true on success and false on failure. This seems more natural, and when the C library was designed, there was no "bool" data type. [ew: changing to bool semantics but sticking with integer type since bool is C99 and I don't require a C99 compiler, and I don't feel like writing compatibility wrappers to support it. _Bool is usually (always?) a signed int anyways. ]
* song: don't check song_is_file() in song_file_update()Max Kellermann2008-10-111-24/+24
| | | | | This function was never used on remote songs. Replace the runtime check with an assertion.
* song: removed CamelCaseMax Kellermann2008-10-117-45/+44
| | | | CamelCase is ugly... rename all functions.
* song: replaced all song constructorsMax Kellermann2008-10-114-27/+46
| | | | | | Provide separate constructors for creating a remote song, a local song, and one for loading data from a song file. This way, we can add more assertions.
* playlist: simplified setPlaylistRandomStatus()Max Kellermann2008-10-111-5/+1
| | | | | Check the old status before assigning. This saves a temporary variable.
* CPP include cleanupMax Kellermann2008-10-114-4/+3
| | | | | | Include only headers which are really used. [ew: this is totally different from Max's branch]
* song: converted typedef Song to struct songMax Kellermann2008-10-1115-90/+99
| | | | | | | | | | | | | | | 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 ]
* directory: converted typedef Directory to struct directoryMax Kellermann2008-10-119-84/+89
| | | | | The struct can be forward-declared by other headers, which relaxes the header dependencies.
* update: merged exploreDirectory() into updateDirectory()Max Kellermann2008-10-113-49/+15
| | | | | | 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: added directory_is_empty()Max Kellermann2008-10-112-1/+6
| | | | | directory_is_empty() is a tiny inline function which determine if a directory has any child objects (sub directories or songs).
* directory: moved code to update.cMax Kellermann2008-10-118-571/+629
| | | | | | 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.
* dirvec: moved code to dirvec.cMax Kellermann2008-10-113-62/+75
| | | | | | | | 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.
* song: really make the song struct non-packedMax Kellermann2008-10-111-1/+1
| | | | Somehow I must have missed this in commit 22e40b61.
* song: don't make the struct packedMax Kellermann2008-10-112-2/+2
| | | | | | 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.
* directory: fix return value in removeDeletedFromDirectoryEric Wong2008-10-071-1/+1
| | | | oops :x
* Merge branch 'ew/update-thrsafe'Eric Wong2008-10-077-114/+167
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | * ew/update-thrsafe: directory: serialize song deletes from playlist during update directory: use songvec_for_each for iterators dbUtils: more cleanups song: Add song_print_url_x dbUtils/directory: traverseAllIn forEachSong returns -1 on error songvec: lock traversals for thread-safe updates/reads song: add print_song_info_x for iterators tha pass void * songvec: add songvec_for_each iterator song: replace printSong* with song_print_* Assert if we don't have song or song->url set
| * directory: serialize song deletes from playlist during updateEric Wong2008-10-073-11/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * directory: use songvec_for_each for iteratorsEric Wong2008-10-073-63/+56
| | | | | | | | Get rid of songvec_write so we can enforce proper locking
| * dbUtils: more cleanupsEric Wong2008-10-071-11/+3
| | | | | | | | | | | | | | 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.
| * song: Add song_print_url_xEric Wong2008-10-072-0/+8
| | | | | | | | | | It'll be handy for passing throug songvec_for_each like song_print_info_x.
| * dbUtils/directory: traverseAllIn forEachSong returns -1 on errorEric Wong2008-10-072-22/+14
| | | | | | | | Being consistent with most UNIX functions...
| * songvec: lock traversals for thread-safe updates/readsEric Wong2008-10-071-10/+34
| | | | | | | | | | | | | | | | | | | | 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.
| * song: add print_song_info_x for iterators tha pass void *Eric Wong2008-10-062-0/+8
| | | | | | | | | | traverseAllIn will be modified to take < 0 as errors instead of non-zero...
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 19:32:01 +0000