mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-08 13:29:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

database: use existing database matching same architecture prefix

Browse source 
State database binary file format may depend on system architecture,
for instance gdbm binary format depends on architecture word size,
making x86 and x64 gdbm files incompatible.

If this is the case, it is handled by adding system architecture name to
database file name using automatically configured CANONICAL_HOST string.
Meson build define CANONICAL_HOST to be system architecture name, while
autotools build extends this with vendor and and operating system components.

Switch autotools build to use host_cpu for CANONICAL_HOST to match Meson
configuration. For backwards compatibility always use existing database file
matching CANONICAL_HOST prefix if it exists.

Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/425>
This commit is contained in:
Igor V. Kovalenko 2020-11-29 15:16:26 +03:00 • committed by PulseAudio Marge Bot
parent 0ac6b16787
commit ae9d0cf307
3 changed files with 41 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/pulsecore/database.c
View file

@ -22,6 +22,7 @@
#endif
#include <errno.h>
#include <dirent.h>
#include <pulse/xmalloc.h>
#include <pulsecore/core-util.h>
@ -37,6 +38,9 @@ pa_database* pa_database_open(const char *path, const char *fn, bool prependmid,
char *machine_id = NULL, *filename_prefix, *full_path;
DIR *database_dir = NULL;
struct dirent *de;
pa_database *f;
pa_assert(!arch_suffix || arch_suffix[0]);
@ -53,6 +57,40 @@ pa_database* pa_database_open(const char *path, const char *fn, bool prependmid,
fn,
arch_suffix?".":"", arch_suffix?:"");
/* Search for existing database directory entry name matching architecture suffix and filename suffix. */
database_dir = opendir(path);
if (database_dir) {
for (;;) {
errno = 0;
de = readdir(database_dir);
if (!de) {
if (errno) {
pa_log_warn("Unable to search for compatible database file, readdir() failed: %s", pa_cstrerror(errno));
/* can continue as if there is no matching database file candidate */
}
break;
}
if (pa_startswith(de->d_name, filename_prefix) && pa_endswith(de->d_name + strlen(filename_prefix), filename_suffix)) {
/* candidate filename found, replace filename_prefix with this one if match is not exact */
if (strlen(de->d_name) != strlen(filename_prefix) + strlen(filename_suffix)) {
pa_log_debug("Found compatible database file '%s/%s', using it", path, de->d_name);
pa_xfree(filename_prefix);
filename_prefix = pa_xstrndup(de->d_name, strlen(de->d_name) - strlen(filename_suffix));
}
break;
}
}
closedir(database_dir);
} else {
pa_log_warn("Unable to search for compatible database file, failed to open directory %s: %s", path, pa_cstrerror(errno));
}
full_path = pa_sprintf_malloc("%s" PA_PATH_SEP "%s%s", path, filename_prefix, filename_suffix);
f = pa_database_open_internal(full_path, for_write);