Skip to content

V
vlc-2-2
Commit 3b657dc9 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

Remove the mmap access plugin 

It cannot work properly due to SIGBUS when a file gets truncated.
In fact, this plugin had been disabled by default for as long as it had
been in VLC.
parent 7e1b4d53
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 324 deletions
configure.ac
View file @ 3b657dc9
......@@ -546,7 +546,7 @@ dnl Check for system libs needed
need_libc=false
dnl Check for usual libc functions
AC_CHECK_FUNCS([daemon fcntl fdopendir fstatvfs fork getenv getpwuid_r gettimeofday isatty lstat memalign openat posix_fadvise posix_madvise posix_memalign setenv setlocale stricmp strnicmp tdestroy uselocale])
AC_CHECK_FUNCS([daemon fcntl fdopendir fstatvfs fork getenv getpwuid_r gettimeofday isatty lstat memalign mmap openat posix_fadvise posix_madvise posix_memalign setenv setlocale stricmp strnicmp tdestroy uselocale])
AC_REPLACE_FUNCS([asprintf atof atoll getcwd getdelim getpid gmtime_r lldiv localtime_r nrand48 rewind strcasecmp strcasestr strdup strlcpy strncasecmp strndup strnlen strsep strtof strtok_r strtoll swab vasprintf])
AC_CHECK_FUNCS(fdatasync,,
[AC_DEFINE(fdatasync, fsync, [Alias fdatasync() to fsync() if missing.])
......@@ -560,8 +560,6 @@ AC_CHECK_FUNCS([accept4 dup3 eventfd vmsplice sched_getaffinity])
AH_BOTTOM([#include <vlc_fixups.h>])
AC_CHECK_FUNCS(mmap, [VLC_ADD_PLUGIN([access_mmap])])
SOCKET_LIBS=""
AC_CHECK_FUNCS(connect,,[
AC_CHECK_LIB(socket,connect,[
......
modules/LIST
View file @ 3b657dc9
......@@ -16,7 +16,6 @@ $Id$
* access_http: HTTP Network access module
* access_imem: memory input access module
* access_jack: JACK audio input module
* access_mmap: mmap file access
* access_mms: MMS over TCP, UDP and HTTP access module
* access_mtp: MTP access module
* access_oss: OSS access module
......
modules/access/Modules.am
View file @ 3b657dc9
......@@ -26,7 +26,6 @@ libsdp_plugin_la_CFLAGS = $(AM_CFLAGS)
libsdp_plugin_la_LIBADD = $(AM_LIBADD)
libsdp_plugin_la_DEPENDENCIES =
SOURCES_access_mmap = mmap.c
SOURCES_access_directory = directory.c
SOURCES_access_dv = dv.c
SOURCES_access_udp = udp.c
......
modules/access/mmap.c deleted 100644 → 0
View file @ 7e1b4d53
/*****************************************************************************
* mmap.c: memory-mapped file input
*****************************************************************************
* Copyright © 2007-2008 Rémi Denis-Courmont
* $Id$
*
* 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., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_access.h>
#include <vlc_input.h>
#include <vlc_fs.h>
#include <vlc_dialog.h>
#include <assert.h>
#include <sys/types.h>
#include <unistd.h>
#include <fcntl.h>
#include <sys/stat.h>
#include <sys/mman.h>
#define FILE_MMAP_TEXT N_("Use file memory mapping")
#define FILE_MMAP_LONGTEXT N_( \
"Try to use memory mapping to read files and block devices." )
#ifndef NDEBUG
/*# define MMAP_DEBUG 1*/
#endif
static int Open (vlc_object_t *);
static void Close (vlc_object_t *);
vlc_module_begin ()
set_shortname (N_("MMap"))
set_description (N_("Memory-mapped file input"))
set_category (CAT_INPUT)
set_subcategory (SUBCAT_INPUT_ACCESS)
set_capability ("access", 52)
add_shortcut ("file")
set_callbacks (Open, Close)
#ifdef __APPLE__
add_bool ("file-mmap", true,
FILE_MMAP_TEXT, FILE_MMAP_LONGTEXT, true)
#else
add_bool ("file-mmap", false,
FILE_MMAP_TEXT, FILE_MMAP_LONGTEXT, true)
#endif
vlc_module_end ()
static block_t *Block (access_t *);
static int Seek (access_t *, uint64_t);
static int Control (access_t *, int, va_list);
struct access_sys_t
{
size_t page_size;
size_t mtu;
int fd;
};
#define MMAP_SIZE (1 << 20)
static int Open (vlc_object_t *p_this)
{
access_t *p_access = (access_t *)p_this;
access_sys_t *p_sys;
const char *path = p_access->psz_filepath;
int fd;
assert ((INT64_C(1) << 63) == ((off_t)(INT64_C(1) << 63)));
if (!var_InheritBool (p_this, "file-mmap"))
return VLC_EGENERIC; /* disabled */
STANDARD_BLOCK_ACCESS_INIT;
msg_Dbg (p_access, "opening file %s", path);
fd = vlc_open (path, O_RDONLY | O_NOCTTY);
if (fd == -1)
{
msg_Warn (p_access, "cannot open %s: %m", path);
goto error;
}
/* mmap() is only safe for regular and block special files.
* For other types, it may be some idiosyncrasic interface (e.g. packet
* sockets are a good example), if it works at all. */
struct stat st;
if (fstat (fd, &st))
{
msg_Err (p_access, "cannot stat %s: %m", path);
goto error;
}
if (!S_ISREG (st.st_mode) && !S_ISBLK (st.st_mode))
{
msg_Dbg (p_access, "skipping non-regular file %s", path);
goto error;
}
#if defined(HAVE_FCNTL_H)
/* We'd rather use any available memory for reading ahead
* than for caching what we've already mmap'ed */
# if defined(F_RDAHEAD)
fcntl (fd, F_RDAHEAD, 1);
# endif
# if defined(F_NOCACHE)
fcntl (fd, F_NOCACHE, 1);
# endif
#endif
/* Autodetect mmap() support */
if (st.st_size > 0)
{
void *addr = mmap (NULL, 1, PROT_READ|PROT_WRITE, MAP_PRIVATE, fd, 0);
if (addr != MAP_FAILED)
munmap (addr, 1);
else
goto error;
}
p_sys->page_size = sysconf (_SC_PAGE_SIZE);
p_sys->mtu = MMAP_SIZE;
if (p_sys->mtu < p_sys->page_size)
p_sys->mtu = p_sys->page_size;
p_sys->fd = fd;
p_access->info.i_size = st.st_size;
#ifdef HAVE_POSIX_FADVISE
posix_fadvise (fd, 0, 0, POSIX_FADV_SEQUENTIAL);
#endif
return VLC_SUCCESS;
error:
if (fd != -1)
close (fd);
free (p_sys);
return VLC_EGENERIC;
}
static void Close (vlc_object_t * p_this)
{
access_t *p_access = (access_t *)p_this;
access_sys_t *p_sys = p_access->p_sys;
close (p_sys->fd); /* don't care about error when only reading */
free (p_sys);
}
static block_t *Block (access_t *p_access)
{
access_sys_t *p_sys = p_access->p_sys;
/* Check if file size changed... */
struct stat st;
if ((fstat (p_sys->fd, &st) == 0)
&& (st.st_size != p_access->info.i_size))
{
p_access->info.i_size = st.st_size;
p_access->info.i_update |= INPUT_UPDATE_SIZE;
}
if (p_access->info.i_pos >= p_access->info.i_size)
{
/* We are at end of file */
p_access->info.b_eof = true;
msg_Dbg (p_access, "at end of memory mapped file");
return NULL;
}
#ifdef MMAP_DEBUG
uint64_t dbgpos = lseek (p_sys->fd, 0, SEEK_CUR);
if (dbgpos != p_access->info.i_pos)
msg_Err (p_access, "position: 0x%016"PRIx64" instead of 0x%016"PRIx64,
p_access->info.i_pos, dbgpos);
#endif
const uintptr_t page_mask = p_sys->page_size - 1;
/* Start the mapping on a page boundary: */
off_t outer_offset = p_access->info.i_pos & ~(off_t)page_mask;
/* Skip useless bytes at the beginning of the first page: */
size_t inner_offset = p_access->info.i_pos & page_mask;
/* Map no more bytes than remain: */
size_t length = p_sys->mtu;
if (outer_offset + length > p_access->info.i_size)
length = p_access->info.i_size - outer_offset;
assert (outer_offset <= p_access->info.i_pos); /* and */
assert (p_access->info.i_pos < p_access->info.i_size); /* imply */
assert (outer_offset < p_access->info.i_size); /* imply */
assert (length > 0);
/* NOTE: We use PROT_WRITE and MAP_PRIVATE so that the block can be
* modified down the chain, without messing up with the underlying
* original file. This does NOT need open write permission. */
void *addr = mmap (NULL, length, PROT_READ|PROT_WRITE, MAP_PRIVATE
#ifdef MAP_NO_CACHE
| MAP_NOCACHE
#endif
, p_sys->fd, outer_offset);
if (addr == MAP_FAILED)
{
msg_Err (p_access, "memory mapping failed (%m)");
dialog_Fatal (p_access, _("File reading failed"), "%s",
_("VLC could not read the file."));
goto fatal;
}
#ifdef HAVE_POSIX_MADVISE
posix_madvise (addr, length, POSIX_MADV_SEQUENTIAL);
#endif
block_t *block = block_mmap_Alloc (addr, length);
if (block == NULL)
goto fatal;
block->p_buffer += inner_offset;
block->i_buffer -= inner_offset;
#ifdef MMAP_DEBUG
msg_Dbg (p_access, "mapped 0x%zx bytes at %p from offset 0x%"PRIx64,
length, addr, (uint64_t)outer_offset);
/* Compare normal I/O with memory mapping */
char *buf = malloc (block->i_buffer);
ssize_t i_read = read (p_sys->fd, buf, block->i_buffer);
if (i_read != (ssize_t)block->i_buffer)
msg_Err (p_access, "read %zd instead of %zu bytes", i_read,
block->i_buffer);
if (memcmp (buf, block->p_buffer, block->i_buffer))
msg_Err (p_access, "inconsistent data buffer");
free (buf);
#endif
p_access->info.i_pos = outer_offset + length;
return block;
fatal:
p_access->info.b_eof = true;
return NULL;
}
static int Seek (access_t *p_access, uint64_t i_pos)
{
#ifdef MMAP_DEBUG
lseek (p_access->p_sys->fd, i_pos, SEEK_SET);
#endif
p_access->info.i_pos = i_pos;
p_access->info.b_eof = false;
return VLC_SUCCESS;
}
static int Control (access_t *p_access, int query, va_list args)
{
switch (query)
{
case ACCESS_CAN_SEEK:
case ACCESS_CAN_FASTSEEK:
case ACCESS_CAN_PAUSE:
case ACCESS_CAN_CONTROL_PACE:
*va_arg(args, bool *) = true;
return VLC_SUCCESS;
case ACCESS_GET_PTS_DELAY:
{
int64_t delay_ms = var_CreateGetInteger (p_access, "file-caching");
*va_arg(args, int64_t *) = delay_ms * INT64_C (1000);
return VLC_SUCCESS;
}
case ACCESS_GET_TITLE_INFO:
case ACCESS_GET_META:
break;
case ACCESS_SET_PAUSE_STATE:
return VLC_SUCCESS;
case ACCESS_SET_TITLE:
case ACCESS_SET_SEEKPOINT:
case ACCESS_SET_PRIVATE_ID_STATE:
case ACCESS_SET_PRIVATE_ID_CA:
case ACCESS_GET_PRIVATE_ID_STATE:
case ACCESS_GET_CONTENT_TYPE:
break;
default:
msg_Warn (p_access, "unimplemented query %d in control", query);
}
return VLC_EGENERIC;
}
po/POTFILES.in
View file @ 3b657dc9
......@@ -228,7 +228,6 @@ modules/access/gnomevfs.c
modules/access/http.c
modules/access/imem.c
modules/access/jack.c
modules/access/mmap.c
modules/access/mms/asf.c
modules/access/mms/asf.h
modules/access/mms/buffer.c
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment