X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Ffile.c;h=9d3de77498297f693d078b00e793adbb3f5ceab2;hb=e06d5fd0dd06e5dbd4456974d0225c386b083569;hp=3991fb062e697cbd1ae7155a0bb2b6db75efcaaf;hpb=0df1578e9158d0afbb231c4de64db28cfc78187d;p=vlc diff --git a/modules/access/file.c b/modules/access/file.c index 3991fb062e..9d3de77498 100644 --- a/modules/access/file.c +++ b/modules/access/file.c @@ -23,39 +23,45 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -/***************************************************************************** - * Preamble - *****************************************************************************/ #ifdef HAVE_CONFIG_H # include "config.h" #endif -#include +#include +#include "fs.h" #include #include -#include +#include #include #include -#ifdef HAVE_SYS_TYPES_H -# include -#endif +#include #ifdef HAVE_SYS_STAT_H # include #endif #ifdef HAVE_FCNTL_H # include #endif +#ifdef HAVE_FSTATVFS +# include +# if defined (HAVE_SYS_MOUNT_H) +# include +# include +# endif +#endif +#ifdef HAVE_LINUX_MAGIC_H +# include +# include +#endif -#if defined( WIN32 ) && !defined( UNDER_CE ) +#if defined( WIN32 ) # include +# include +# include #else # include -# include -#endif -#ifdef HAVE_MMAP -# include #endif +#include #if defined( WIN32 ) && !defined( UNDER_CE ) # ifdef lseek @@ -63,251 +69,226 @@ # endif # define lseek _lseeki64 #elif defined( UNDER_CE ) -# ifdef read -# undef read -# endif -# define read(a,b,c) fread(b,1,c,a) -# define close(a) fclose(a) -# ifdef lseek -# undef lseek -# endif -# define lseek fseek +/* FIXME the commandline on wince is a mess */ +# define PathIsNetworkPathW(wpath) (! wcsncmp(wpath, L"\\\\", 2)) #endif -#include - -/***************************************************************************** - * Module descriptor - *****************************************************************************/ -static int Open ( vlc_object_t * ); -static void Close( vlc_object_t * ); - -#define CACHING_TEXT N_("Caching value in ms") -#define CACHING_LONGTEXT N_( \ - "Caching value for files. This " \ - "value should be set in milliseconds." ) -#define CAT_TEXT N_("Concatenate with additional files") -#define CAT_LONGTEXT N_( \ - "Play split files as if they were part of a unique file. " \ - "You need to specify a comma-separated list of files." ) - -vlc_module_begin(); - set_description( _("File input") ); - set_shortname( _("File") ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_ACCESS ); - add_integer( "file-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE ); - add_obsolete_string( "file-cat" ); - set_capability( "access2", 50 ); - add_shortcut( "file" ); - add_shortcut( "stream" ); - add_shortcut( "kfir" ); - set_callbacks( Open, Close ); -vlc_module_end(); - - -/***************************************************************************** - * Exported prototypes - *****************************************************************************/ -static int Seek( access_t *, int64_t ); -static ssize_t Read( access_t *, uint8_t *, size_t ); -static int Control( access_t *, int, va_list ); -#ifdef HAVE_MMAP -static block_t *mmapBlock( access_t * ); -#endif - -static int open_file( access_t *, const char * ); +#include +#include struct access_sys_t { - uint64_t pagemask; unsigned int i_nb_reads; - vlc_bool_t b_kfir; int fd; /* */ - vlc_bool_t b_seekable; - vlc_bool_t b_pace_control; + unsigned caching; + bool b_pace_control; }; -/***************************************************************************** - * Open: open the file - *****************************************************************************/ -static int Open( vlc_object_t *p_this ) +#ifndef WIN32 +static bool IsRemote (int fd) { - access_t *p_access = (access_t*)p_this; - access_sys_t *p_sys; +#if defined (HAVE_FSTATVFS) && defined (MNT_LOCAL) + struct statvfs stf; - vlc_bool_t b_stdin = !strcmp (p_access->psz_path, "-"); + if (fstatvfs (fd, &stf)) + return false; + /* fstatvfs() is in POSIX, but MNT_LOCAL is not */ + return !(stf.f_flag & MNT_LOCAL); - /* Update default_pts to a suitable value for file access */ - var_Create( p_access, "file-caching", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); +#elif defined (HAVE_LINUX_MAGIC_H) + struct statfs stf; - STANDARD_READ_ACCESS_INIT; - p_sys->i_nb_reads = 0; - p_sys->b_kfir = VLC_FALSE; - int fd = p_sys->fd = -1; + if (fstatfs (fd, &stf)) + return false; - if (!strcasecmp (p_access->psz_access, "stream")) - { - p_sys->b_seekable = VLC_FALSE; - p_sys->b_pace_control = VLC_FALSE; - } - else if (!strcasecmp (p_access->psz_access, "kfir")) - { - p_sys->b_seekable = VLC_FALSE; - p_sys->b_pace_control = VLC_FALSE; - p_sys->b_kfir = VLC_TRUE; - } - else + switch (stf.f_type) { - p_sys->b_seekable = VLC_TRUE; - p_sys->b_pace_control = VLC_TRUE; + case AFS_SUPER_MAGIC: + case CODA_SUPER_MAGIC: + case NCP_SUPER_MAGIC: + case NFS_SUPER_MAGIC: + case SMB_SUPER_MAGIC: + case 0xFF534D42 /*CIFS_MAGIC_NUMBER*/: + return true; } + return false; - /* Open file */ - msg_Dbg (p_access, "opening file `%s'", p_access->psz_path); - - if (b_stdin) - fd = dup (0); - else - fd = open_file (p_access, p_access->psz_path); - -#ifdef HAVE_SYS_STAT_H - struct stat st; +#else + (void)fd; + return false; - while (fd != -1) - { - if (fstat (fd, &st)) - msg_Err (p_access, "fstat(%d): %m", fd); - else - if (S_ISDIR (st.st_mode)) - /* The directory plugin takes care of that */ - msg_Dbg (p_access, "file is a directory, aborting"); - else - break; // success - - close (fd); - fd = -1; - } +#endif +} #endif - if (fd == -1) - { - free (p_sys); - return VLC_EGENERIC; - } - p_sys->fd = fd; +#ifndef HAVE_POSIX_FADVISE +# define posix_fadvise(fd, off, len, adv) +#endif -#ifdef HAVE_SYS_STAT_H - p_access->info.i_size = st.st_size; - if (!S_ISREG (st.st_mode) && !S_ISBLK (st.st_mode) - && (!S_ISCHR (st.st_mode) || (st.st_size == 0))) - p_sys->b_seekable = VLC_FALSE; +/***************************************************************************** + * Open: open the file + *****************************************************************************/ +int Open( vlc_object_t *p_this ) +{ + access_t *p_access = (access_t*)p_this; + const char *path = p_access->psz_filepath; +#ifdef WIN32 + bool is_remote = false; +#endif -# ifdef HAVE_MMAP - p_sys->pagemask = sysconf (_SC_PAGE_SIZE) - 1; + /* Open file */ + int fd = -1; - /* Autodetect mmap() support */ - if (p_sys->b_pace_control && S_ISREG (st.st_mode) && (st.st_size > 0)) + if (!strcasecmp (p_access->psz_access, "fd")) { - /* TODO: Do not allow PROT_WRITE, we should not need it. - * However, this far, "block" ownership seems such that whoever - * "receives" a block can freely modify its content. Hence we _may_ - * need PROT_WRITE not to default memory protection. - * NOTE: With MAP_PRIVATE, changes are not committed to the underlying - * file, write open permission is not required. - */ - void *addr = mmap (NULL, 1, PROT_READ|PROT_WRITE, MAP_PRIVATE, fd, 0); - if (addr != MAP_FAILED) + char *end; + int oldfd = strtol (path, &end, 10); + + if (*end == '\0') + fd = vlc_dup (oldfd); + else if (*end == '/' && end > path) { - /* Does the file system support mmap? */ - munmap (addr, 1); - p_access->pf_read = NULL; - p_access->pf_block = mmapBlock; - msg_Dbg (p_this, "mmap enabled"); + char *name = decode_URI_duplicate (end - 1); + if (name != NULL) + { + name[0] = '.'; + fd = vlc_openat (oldfd, name, O_RDONLY | O_NONBLOCK); + free (name); + } } - else - msg_Dbg (p_this, "mmap disabled (%m)"); } else - msg_Dbg (p_this, "mmap disabled (non regular file)"); -# endif + { + msg_Dbg (p_access, "opening file `%s'", path); + fd = vlc_open (path, O_RDONLY | O_NONBLOCK); + if (fd == -1) + { + msg_Err (p_access, "cannot open file %s (%m)", path); + dialog_Fatal (p_access, _("File reading failed"), + _("VLC could not open the file \"%s\"."), path); + } + +#ifdef WIN32 + wchar_t wpath[MAX_PATH+1]; + if (MultiByteToWideChar (CP_UTF8, 0, path, -1, + wpath, MAX_PATH) + && PathIsNetworkPathW (wpath)) + is_remote = true; +# define IsRemote( fd ) ((void)fd, is_remote) +#endif + } + if (fd == -1) + return VLC_EGENERIC; + + struct stat st; + if (fstat (fd, &st)) + { + msg_Err (p_access, "failed to read (%m)"); + goto error; + } + /* Directories can be opened and read from, but only readdir() knows + * how to parse the data. The directory plugin will do it. */ + if (S_ISDIR (st.st_mode)) + { +#ifdef HAVE_FDOPENDIR + DIR *handle = fdopendir (fd); + if (handle == NULL) + goto error; /* Uh? */ + return DirInit (p_access, handle); #else - p_sys->b_seekable = !b_stdin; -# warning File size not known! + msg_Dbg (p_access, "ignoring directory"); + goto error; #endif + } - if (p_sys->b_seekable && (p_access->info.i_size == 0)) + access_sys_t *p_sys = malloc (sizeof (*p_sys)); + if (unlikely(p_sys == NULL)) + goto error; + access_InitFields (p_access); + p_access->pf_read = FileRead; + p_access->pf_block = NULL; + p_access->pf_control = FileControl; + p_access->pf_seek = FileSeek; + p_access->p_sys = p_sys; + p_sys->i_nb_reads = 0; + p_sys->fd = fd; + p_sys->caching = var_CreateGetInteger (p_access, "file-caching"); + if (IsRemote(fd)) + p_sys->caching += var_CreateGetInteger (p_access, "network-caching"); + p_sys->b_pace_control = true; + + if (S_ISREG (st.st_mode)) + p_access->info.i_size = st.st_size; + else if (!S_ISBLK (st.st_mode)) { - /* FIXME that's bad because all others access will be probed */ - msg_Err (p_access, "file is empty, aborting"); - Close (p_this); - return VLC_EGENERIC; + p_access->pf_seek = NoSeek; + p_sys->b_pace_control = strcasecmp (p_access->psz_access, "stream"); } + if (p_access->pf_seek != NoSeek) + { + /* Demuxers will need the beginning of the file for probing. */ + posix_fadvise (fd, 0, 4096, POSIX_FADV_WILLNEED); + /* In most cases, we only read the file once. */ + posix_fadvise (fd, 0, 0, POSIX_FADV_NOREUSE); +#if defined(HAVE_FCNTL) + /* We'd rather use any available memory for reading ahead + * than for caching what we've already seen/heard */ +# if defined(F_RDAHEAD) + fcntl (fd, F_RDAHEAD, 1); +# endif +# if defined(F_NOCACHE) + fcntl (fd, F_NOCACHE, 1); +# endif +#endif + } return VLC_SUCCESS; + +error: + close (fd); + return VLC_EGENERIC; } /***************************************************************************** * Close: close the target *****************************************************************************/ -static void Close (vlc_object_t * p_this) +void Close (vlc_object_t * p_this) { access_t *p_access = (access_t*)p_this; + + if (p_access->pf_read == NULL) + { + DirClose (p_this); + return; + } + access_sys_t *p_sys = p_access->p_sys; close (p_sys->fd); free (p_sys); } + +#include + /***************************************************************************** * Read: standard read on a file descriptor. *****************************************************************************/ -static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len ) +ssize_t FileRead( access_t *p_access, uint8_t *p_buffer, size_t i_len ) { access_sys_t *p_sys = p_access->p_sys; - ssize_t i_ret; int fd = p_sys->fd; + ssize_t i_ret; -#if !defined(WIN32) && !defined(UNDER_CE) - if( !p_sys->b_pace_control ) - { - if( !p_sys->b_kfir ) - { - /* Find if some data is available. This won't work under Windows. */ - do - { - struct pollfd ufd; - - if( p_access->b_die ) - return 0; - - memset (&ufd, 0, sizeof (ufd)); - ufd.fd = fd; - ufd.events = POLLIN; - - i_ret = poll (&ufd, 1, 500); - } - while (i_ret <= 0); - - i_ret = read (fd, p_buffer, i_len); - } - else - { - /* b_kfir ; work around a buggy poll() driver implementation */ - while (((i_ret = read (fd, p_buffer, i_len)) == 0) - && !p_access->b_die) - { - msleep( INPUT_ERROR_SLEEP ); - } - } - } +#ifndef WIN32 + if (p_access->pf_seek == NoSeek) + i_ret = net_Read (p_access, fd, NULL, p_buffer, i_len, false); else -#endif /* WIN32 || UNDER_CE */ - /* b_pace_control || WIN32 */ - i_ret = read( fd, p_buffer, i_len ); +#endif + i_ret = read (fd, p_buffer, i_len); if( i_ret < 0 ) { @@ -318,189 +299,85 @@ static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len ) break; default: - msg_Err (p_access, "read failed (%m)"); - intf_UserFatal (p_access, VLC_FALSE, _("File reading failed"), - _("VLC could not read the file.")); + msg_Err (p_access, "failed to read (%m)"); + dialog_Fatal (p_access, _("File reading failed"), "%s", + _("VLC could not read the file.")); + p_access->info.b_eof = true; + return 0; } - - /* Delay a bit to avoid consuming all the CPU. This is particularly - * useful when reading from an unconnected FIFO. */ - msleep( INPUT_ERROR_SLEEP ); } + else if( i_ret > 0 ) + p_access->info.i_pos += i_ret; + else + p_access->info.b_eof = true; p_sys->i_nb_reads++; -#ifdef HAVE_SYS_STAT_H - if( p_access->info.i_size != 0 && - (p_sys->i_nb_reads % INPUT_FSTAT_NB_READS) == 0 ) + if ((p_access->info.i_size && !(p_sys->i_nb_reads % INPUT_FSTAT_NB_READS)) + || (p_access->info.i_pos > p_access->info.i_size)) { +#ifdef HAVE_SYS_STAT_H struct stat st; if ((fstat (fd, &st) == 0) - && (p_access->info.i_size != st.st_size)) + && (p_access->info.i_size != (uint64_t)st.st_size)) { p_access->info.i_size = st.st_size; p_access->info.i_update |= INPUT_UPDATE_SIZE; } - } #endif - - if( i_ret > 0 ) - p_access->info.i_pos += i_ret; - else if( i_ret == 0 ) - p_access->info.b_eof = VLC_TRUE; - + } return i_ret; } -#ifdef HAVE_MMAP -# define MMAP_SIZE (1 << 20) - -static block_t *mmapBlock (access_t *p_access) -{ - access_sys_t *p_sys = p_access->p_sys; - - const int flags = MAP_SHARED; - off_t offset = p_access->info.i_pos & ~p_sys->pagemask; - size_t align = p_access->info.i_pos & p_sys->pagemask; - size_t length = (MMAP_SIZE > p_sys->pagemask) ? MMAP_SIZE : (p_sys->pagemask + 1); - void *addr; - -#ifndef NDEBUG - 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", - p_access->info.i_pos, dbgpos); -#endif - - if (p_access->info.i_pos >= p_access->info.i_size) - { - /* End of file - 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; - } - - /* Really at end of file then */ - if (p_access->info.i_pos >= p_access->info.i_size) - { - p_access->info.b_eof = VLC_TRUE; - msg_Dbg (p_access, "at end of memory mapped file"); - return NULL; - } - } - - if (offset + length > p_access->info.i_size) - /* Don't mmap beyond end of file */ - length = p_access->info.i_size - offset; - - assert (offset <= p_access->info.i_pos); /* and */ - assert (p_access->info.i_pos < p_access->info.i_size); /* imply */ - assert (offset < p_access->info.i_size); /* imply */ - assert (length > 0); - - addr = mmap (NULL, length, PROT_READ, flags, p_sys->fd, offset); - if (addr == MAP_FAILED) - { - msg_Err (p_access, "memory mapping failed (%m)"); - intf_UserFatal (p_access, VLC_FALSE, _("File reading failed"), - _("VLC could not read the file.")); - msleep( INPUT_ERROR_SLEEP ); - return NULL; - } - - p_access->info.i_pos = offset + length; - - block_t *block = block_mmap_Alloc (addr, length); - if (block == NULL) - return NULL; - - block->p_buffer += align; - block->i_buffer -= align; - -#ifndef NDEBUG - msg_Dbg (p_access, "mapped 0x%lx bytes at %p from offset 0x%lx", - (unsigned long)length, addr, (unsigned long)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); - if (memcmp (buf, block->p_buffer, block->i_buffer)) - msg_Err (p_access, "inconsistent data buffer"); - free (buf); -#endif - - return block; -} -#endif /***************************************************************************** * Seek: seek to a specific location in a file *****************************************************************************/ -static int Seek (access_t *p_access, int64_t i_pos) +int FileSeek (access_t *p_access, uint64_t i_pos) { - /* FIXME: i_size should really be unsigned */ - if ((uint64_t)i_pos > (uint64_t)p_access->info.i_size) - { - /* This should only happen with corrupted files. - * But it also seems to happen with buggy demuxes (ASF) */ - msg_Err (p_access, "seeking too far (0x"I64Fx" / 0x"I64Fx")", - i_pos, p_access->info.i_size); - i_pos = p_access->info.i_size; - } - p_access->info.i_pos = i_pos; - p_access->info.b_eof = VLC_FALSE; + p_access->info.b_eof = false; -#if defined (HAVE_MMAP) && defined (NDEBUG) - if (p_access->pf_block == NULL) -#endif - lseek (p_access->p_sys->fd, i_pos, SEEK_SET); + lseek (p_access->p_sys->fd, i_pos, SEEK_SET); return VLC_SUCCESS; } +int NoSeek (access_t *p_access, uint64_t i_pos) +{ + /* assert(0); ?? */ + (void) p_access; (void) i_pos; + return VLC_EGENERIC; +} + /***************************************************************************** * Control: *****************************************************************************/ -static int Control( access_t *p_access, int i_query, va_list args ) +int FileControl( access_t *p_access, int i_query, va_list args ) { access_sys_t *p_sys = p_access->p_sys; - vlc_bool_t *pb_bool; - int *pi_int; - int64_t *pi_64; + bool *pb_bool; + int64_t *pi_64; switch( i_query ) { /* */ case ACCESS_CAN_SEEK: case ACCESS_CAN_FASTSEEK: - pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t* ); - *pb_bool = p_sys->b_seekable; + pb_bool = (bool*)va_arg( args, bool* ); + *pb_bool = (p_access->pf_seek != NoSeek); break; case ACCESS_CAN_PAUSE: case ACCESS_CAN_CONTROL_PACE: - pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t* ); + pb_bool = (bool*)va_arg( args, bool* ); *pb_bool = p_sys->b_pace_control; break; /* */ - case ACCESS_GET_MTU: - pi_int = (int*)va_arg( args, int * ); - *pi_int = 0; - break; - case ACCESS_GET_PTS_DELAY: pi_64 = (int64_t*)va_arg( args, int64_t * ); - *pi_64 = var_GetInteger( p_access, "file-caching" ) * I64C(1000); + *pi_64 = p_sys->caching * INT64_C(1000); break; /* */ @@ -524,72 +401,3 @@ static int Control( access_t *p_access, int i_query, va_list args ) } return VLC_SUCCESS; } - - -static char *expand_path (const access_t *p_access, const char *path) -{ - if (strncmp (path, "~/", 2) == 0) - { - char *res; - - // TODO: we should also support the ~cmassiot/ syntax - if (asprintf (&res, "%s/%s", p_access->p_libvlc->psz_homedir, path + 2) == -1) - return NULL; - return res; - } - -#if defined(WIN32) - if (!strcasecmp (p_access->psz_access, "file") - && ('/' == path[0]) && path[1] && (':' == path[2]) && ('/' == path[3])) - // Explorer can open path such as file:/C:/ or file:///C:/ - // hence remove leading / if found - return strdup (path + 1); -#endif - - return strdup (path); -} - - -/***************************************************************************** - * open_file: Opens a specific file - *****************************************************************************/ -static int open_file (access_t *p_access, const char *psz_name) -{ - char *path = expand_path (p_access, psz_name); - -#ifdef UNDER_CE - p_sys->fd = utf8_fopen( path, "rb" ); - if ( !p_sys->fd ) - { - msg_Err( p_access, "cannot open file %s", psz_name ); - intf_UserFatal( p_access, VLC_FALSE, _("File reading failed"), - _("VLC could not open the file \"%s\"."), psz_name ); - free (path); - return VLC_EGENERIC; - } - - fseek( p_sys->fd, 0, SEEK_END ); - p_access->info.i_size = ftell( p_sys->fd ); - p_access->info.i_update |= INPUT_UPDATE_SIZE; - fseek( p_sys->fd, 0, SEEK_SET ); -#else - int fd = utf8_open (path, O_RDONLY | O_NONBLOCK /* O_LARGEFILE*/, 0666); - free (path); - if (fd == -1) - { - msg_Err (p_access, "cannot open file %s (%m)", psz_name); - intf_UserFatal (p_access, VLC_FALSE, _("File reading failed"), - _("VLC could not open the file \"%s\"."), psz_name); - return -1; - } - -# if defined(HAVE_FCNTL_H) && defined(F_FDAHEAD) && defined(F_NOCACHE) - /* We'd rather use any available memory for reading ahead - * than for caching what we've already seen/heard */ - fcntl (fd, F_RDAHEAD, 1); - fcntl (fd, F_NOCACHE, 1); -# endif -#endif - - return fd; -}