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

posix_madvise and posix_fadvise aren't present on all systems.

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1783 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Pierre Ossman 2007-09-10 11:35:30 +00:00
parent 9630e8df57
commit d9b3c0eef2
4 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
configure.ac
View file

@ -247,8 +247,8 @@ AC_FUNC_FORK
AC_FUNC_GETGROUPS
AC_FUNC_SELECT_ARGTYPES
AC_CHECK_FUNCS([chmod chown getaddrinfo getgrgid_r getpwuid_r gettimeofday \
getuid inet_ntop inet_pton nanosleep pipe posix_memalign setpgid setsid \
shm_open sigaction sleep sysconf])
getuid inet_ntop inet_pton nanosleep pipe posix_fadvise posix_madvise \
posix_memalign setpgid setsid shm_open sigaction sleep sysconf])
AC_CHECK_FUNCS([mkfifo], [HAVE_MKFIFO=1], [HAVE_MKFIFO=0])
AM_CONDITIONAL(HAVE_MKFIFO, test "x$HAVE_MKFIFO" = "x1")

8
src/pulsecore/core-util.c
View file

@ -1262,11 +1262,13 @@ void *pa_will_need(const void *p, size_t l) {
a = PA_PAGE_ALIGN_PTR(p);
size = (const uint8_t*) p + l - (const uint8_t*) a;
#ifdef HAVE_POSIX_MADVISE
if ((r = posix_madvise((void*) a, size, POSIX_MADV_WILLNEED)) == 0) {
pa_log_debug("posix_madvise() worked fine!");
return (void*) p;
}
#endif
/* Most likely the memory was not mmap()ed from a file and thus
* madvise() didn't work, so let's misuse mlock() do page this
@ -1279,7 +1281,7 @@ void *pa_will_need(const void *p, size_t l) {
pa_assert_se(getrlimit(RLIMIT_MEMLOCK, &rlim) == 0);
if (rlim.rlim_cur < PA_PAGE_SIZE) {
pa_log_debug("posix_madvise() failed, resource limits don't allow mlock(), can't page in data: %s", pa_cstrerror(r));
pa_log_debug("posix_madvise() failed (or doesn't exist), resource limits don't allow mlock(), can't page in data: %s", pa_cstrerror(r));
return (void*) p;
}
@ -1288,7 +1290,7 @@ void *pa_will_need(const void *p, size_t l) {
bs = PA_PAGE_SIZE*4;
#endif
pa_log_debug("posix_madvise() failed, trying mlock(): %s", pa_cstrerror(r));
pa_log_debug("posix_madvise() failed (or doesn't exist), trying mlock(): %s", pa_cstrerror(r));
while (size > 0 && bs > 0) {

2
src/pulsecore/sound-file-stream.c
View file

@ -255,6 +255,7 @@ int pa_play_file(
* file reader into the main event loop and pass the data over the
* asyncmsgq. */
#ifdef HAVE_POSIX_FADVISE
if (posix_fadvise(fd, 0, 0, POSIX_FADV_SEQUENTIAL) < 0) {
pa_log_warn("POSIX_FADV_SEQUENTIAL failed: %s", pa_cstrerror(errno));
goto fail;
@ -266,6 +267,7 @@ int pa_play_file(
goto fail;
} else
pa_log_debug("POSIX_FADV_WILLNEED succeeded.");
#endif
if (!(u->sndfile = sf_open_fd(fd, SFM_READ, &sfinfo, 1))) {
pa_log("Failed to open file %s", fname);

2
src/pulsecore/sound-file.c
View file

@ -67,11 +67,13 @@ int pa_sound_file_load(
goto finish;
}
#ifdef HAVE_POSIX_FADVISE
if (posix_fadvise(fd, 0, 0, POSIX_FADV_SEQUENTIAL) < 0) {
pa_log_warn("POSIX_FADV_SEQUENTIAL failed: %s", pa_cstrerror(errno));
goto finish;
} else
pa_log_debug("POSIX_FADV_SEQUENTIAL succeeded.");
#endif
if (!(sf = sf_open_fd(fd, SFM_READ, &sfinfo, 1))) {
pa_log("Failed to open file %s", fname);