X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fmmap.c;h=2c7dfbfc3544cb931e1eb32af33893f85cfb2c25;hb=bc09c365ab435fda0185e60a423f69d6dfa348c8;hp=cbec77022d0b4f4f17374b0e1de49a3d4ceb0f63;hpb=05492281965ed211badf7e1f4c2220be720d3356;p=vlc diff --git a/modules/access/mmap.c b/modules/access/mmap.c index cbec77022d..2c7dfbfc35 100644 --- a/modules/access/mmap.c +++ b/modules/access/mmap.c @@ -27,12 +27,11 @@ #include #include #include -#include -#include +#include +#include #include -#include #include #include #include @@ -58,12 +57,17 @@ vlc_module_begin () set_capability ("access", 52) add_shortcut ("file") set_callbacks (Open, Close) +#ifdef __APPLE__ + add_bool ("file-mmap", true, NULL, + FILE_MMAP_TEXT, FILE_MMAP_LONGTEXT, true) +#else add_bool ("file-mmap", false, NULL, - FILE_MMAP_TEXT, FILE_MMAP_LONGTEXT, true); + FILE_MMAP_TEXT, FILE_MMAP_LONGTEXT, true) +#endif vlc_module_end () static block_t *Block (access_t *); -static int Seek (access_t *, int64_t); +static int Seek (access_t *, uint64_t); static int Control (access_t *, int, va_list); struct access_sys_t @@ -79,30 +83,24 @@ 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_path; + const char *path = p_access->psz_filepath; int fd; assert ((INT64_C(1) << 63) == ((off_t)(INT64_C(1) << 63))); - if (!var_CreateGetBool (p_this, "file-mmap")) + if (!var_InheritBool (p_this, "file-mmap")) return VLC_EGENERIC; /* disabled */ STANDARD_BLOCK_ACCESS_INIT; - if (!strcmp (p_access->psz_path, "-")) - fd = dup (0); - else - { - msg_Dbg (p_access, "opening file %s", path); - fd = utf8_open (path, O_RDONLY | O_NOCTTY, 0666); - } + 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; } - fcntl (fd, F_SETFD, fcntl (fd, F_GETFD) | FD_CLOEXEC); /* mmap() is only safe for regular and block special files. * For other types, it may be some idiosyncrasic interface (e.g. packet @@ -117,7 +115,7 @@ 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; } @@ -186,7 +184,7 @@ static block_t *Block (access_t *p_access) p_access->info.i_update |= INPUT_UPDATE_SIZE; } - if ((uint64_t)p_access->info.i_pos >= (uint64_t)p_access->info.i_size) + if (p_access->info.i_pos >= p_access->info.i_size) { /* We are at end of file */ p_access->info.b_eof = true; @@ -195,15 +193,15 @@ static block_t *Block (access_t *p_access) } #ifdef MMAP_DEBUG - int64_t dbgpos = lseek (p_sys->fd, 0, SEEK_CUR); + uint64_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: */ @@ -227,7 +225,7 @@ static block_t *Block (access_t *p_access) 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.")); goto fatal; } @@ -243,16 +241,16 @@ static block_t *Block (access_t *p_access) 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); @@ -267,7 +265,7 @@ fatal: } -static int Seek (access_t *p_access, int64_t i_pos) +static int Seek (access_t *p_access, uint64_t i_pos) { #ifdef MMAP_DEBUG lseek (p_access->p_sys->fd, i_pos, SEEK_SET); @@ -281,25 +279,19 @@ 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: case ACCESS_CAN_FASTSEEK: case ACCESS_CAN_PAUSE: case ACCESS_CAN_CONTROL_PACE: - *((bool *)va_arg (args, bool *)) = true; - return VLC_SUCCESS; - - case ACCESS_GET_MTU: - *((int *)va_arg (args, int *)) = p_sys->mtu; + *va_arg(args, bool *) = true; return VLC_SUCCESS; case ACCESS_GET_PTS_DELAY: { - int delay_ms = var_CreateGetInteger (p_access, "file-caching"); - *((int64_t *)va_arg (args, int64_t *)) = delay_ms * INT64_C (1000); + int64_t delay_ms = var_CreateGetInteger (p_access, "file-caching"); + *va_arg(args, int64_t *) = delay_ms * INT64_C (1000); return VLC_SUCCESS; }