X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fmmap.c;h=8a36040aad316eb673e62d5e9efda5c65f322080;hb=f7a8bc79b12a3f2a673d0b6a2a6bf4ef4b5e1d2d;hp=10324b9582254224980e522c9001a99e21901b3f;hpb=449fd28aaf007c6411251dae9d0dbfdc65b135d1;p=vlc diff --git a/modules/access/mmap.c b/modules/access/mmap.c index 10324b9582..8a36040aad 100644 --- a/modules/access/mmap.c +++ b/modules/access/mmap.c @@ -23,11 +23,12 @@ # include #endif -#include +#include +#include #include #include #include -#include +#include #include @@ -49,18 +50,17 @@ static int Open (vlc_object_t *); static void Close (vlc_object_t *); -vlc_module_begin(); - set_shortname (_("MMap")); - set_description (_("Memory-mapped file input")); - set_category (CAT_INPUT); - set_subcategory (SUBCAT_INPUT_ACCESS); - set_capability ("access2", 52); - add_shortcut ("file"); - set_callbacks (Open, Close); - - add_bool ("file-mmap", true, NULL, - FILE_MMAP_TEXT, FILE_MMAP_LONGTEXT, true); -vlc_module_end(); +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) + add_bool ("file-mmap", false, NULL, + FILE_MMAP_TEXT, FILE_MMAP_LONGTEXT, true) +vlc_module_end () static block_t *Block (access_t *); static int Seek (access_t *, int64_t); @@ -82,6 +82,8 @@ static int Open (vlc_object_t *p_this) const char *path = p_access->psz_path; int fd; + assert ((INT64_C(1) << 63) == ((off_t)(INT64_C(1) << 63))); + if (!var_CreateGetBool (p_this, "file-mmap")) return VLC_EGENERIC; /* disabled */ @@ -114,10 +116,21 @@ static int Open (vlc_object_t *p_this) if (!S_ISREG (st.st_mode) && !S_ISBLK (st.st_mode)) { - msg_Dbg (p_access, "skipping non regular file %s", path); + 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) { @@ -162,37 +175,34 @@ static block_t *Block (access_t *p_access) { access_sys_t *p_sys = p_access->p_sys; - if ((uint64_t)p_access->info.i_pos >= (uint64_t)p_access->info.i_size) - { - /* End of file - check if file size changed... */ - struct stat st; + /* 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 ((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; + } - /* Really at end of file then */ - if ((uint64_t)p_access->info.i_pos >= (uint64_t)p_access->info.i_size) - { - p_access->info.b_eof = true; - msg_Dbg (p_access, "at end of memory mapped file"); - return NULL; - } + if ((uint64_t)p_access->info.i_pos >= (uint64_t)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 int64_t dbgpos = lseek (p_sys->fd, 0, SEEK_CUR); if (dbgpos != p_access->info.i_pos) - msg_Err (p_access, "position: 0x%08llx instead of 0x%08llx", + 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 & ~page_mask; + 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: */ @@ -208,15 +218,17 @@ static block_t *Block (access_t *p_access) /* 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, - p_sys->fd, outer_offset); + 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)"); - intf_UserFatal (p_access, false, _("File reading failed"), + dialog_Fatal (p_access, _("File reading failed"), "%s", _("VLC could not read the file.")); - msleep (INPUT_ERROR_SLEEP); - return NULL; + goto fatal; } #ifdef HAVE_POSIX_MADVISE posix_madvise (addr, length, POSIX_MADV_SEQUENTIAL); @@ -224,22 +236,22 @@ static block_t *Block (access_t *p_access) block_t *block = block_mmap_Alloc (addr, length); if (block == NULL) - return NULL; + goto fatal; block->p_buffer += inner_offset; block->i_buffer -= inner_offset; #ifdef MMAP_DEBUG - msg_Dbg (p_access, "mapped 0x%lx bytes at %p from offset 0x%lx", - (unsigned long)length, addr, (unsigned long)outer_offset); + 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 %u instead of %u bytes", (unsigned)i_read, - (unsigned)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); @@ -247,6 +259,10 @@ static block_t *Block (access_t *p_access) p_access->info.i_pos = outer_offset + length; return block; + +fatal: + p_access->info.b_eof = true; + return NULL; } @@ -264,8 +280,6 @@ static int Seek (access_t *p_access, int64_t i_pos) static int Control (access_t *p_access, int query, va_list args) { - access_sys_t *p_sys = p_access->p_sys; - switch (query) { case ACCESS_CAN_SEEK: @@ -275,13 +289,12 @@ static int Control (access_t *p_access, int query, va_list args) *((bool *)va_arg (args, bool *)) = true; return VLC_SUCCESS; - case ACCESS_GET_MTU: - *((int *)va_arg (args, int *)) = p_sys->mtu; - return VLC_SUCCESS; - case ACCESS_GET_PTS_DELAY: - *((int64_t *)va_arg (args, int64_t *)) = DEFAULT_PTS_DELAY; + { + int delay_ms = var_CreateGetInteger (p_access, "file-caching"); + *((int64_t *)va_arg (args, int64_t *)) = delay_ms * INT64_C (1000); return VLC_SUCCESS; + } case ACCESS_GET_TITLE_INFO: case ACCESS_GET_META: