mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-07 07:58:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

Better error recovery when the mmap fails.

Browse source 
Original commit message from CVS:
Better error recovery when the mmap fails.
This commit is contained in:
Wim Taymans 2002-11-20 21:31:05 +00:00
parent 647618947f
commit e09a7f841a
2 changed files with 44 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
gst/elements/gstfilesrc.c
View file

@ -355,21 +355,28 @@ gst_filesrc_map_region (GstFileSrc *src, off_t offset, size_t size)
{ {
GstBuffer *buf; GstBuffer *buf;
gint retval; gint retval;
void *mmapregion;
g_return_val_if_fail (offset >= 0, NULL); g_return_val_if_fail (offset >= 0, NULL);
fs_print ("mapping region %08llx+%08x from file into memory\n",offset,size); fs_print ("mapping region %08llx+%08x from file into memory\n",offset,size);
mmapregion = mmap (NULL, size, PROT_READ, MAP_SHARED, src->fd, offset);
if (mmapregion == NULL) {
gst_element_error (GST_ELEMENT (src), "couldn't map file");
return NULL;
}
else if (mmapregion == MAP_FAILED) {
gst_element_error (GST_ELEMENT (src), "mmap (0x%x, %d, 0x%llx) : %s",
size, src->fd, offset, strerror (errno));
return NULL;
}
/* time to allocate a new mapbuf */ /* time to allocate a new mapbuf */
buf = gst_buffer_new(); buf = gst_buffer_new();
/* mmap() the data into this new buffer */ /* mmap() the data into this new buffer */
GST_BUFFER_DATA(buf) = mmap (NULL, size, PROT_READ, MAP_SHARED, src->fd, offset); GST_BUFFER_DATA(buf) = mmapregion;
if (GST_BUFFER_DATA(buf) == NULL) {
gst_element_error (GST_ELEMENT (src), "couldn't map file");
} else if (GST_BUFFER_DATA(buf) == MAP_FAILED) {
gst_element_error (GST_ELEMENT (src), "mmap (0x%x, %d, 0x%llx) : %s",
size, src->fd, offset, strerror (errno));
}
#ifdef MADV_SEQUENTIAL #ifdef MADV_SEQUENTIAL
/* madvise to tell the kernel what to do with it */ /* madvise to tell the kernel what to do with it */
retval = madvise(GST_BUFFER_DATA(buf),GST_BUFFER_SIZE(buf),MADV_SEQUENTIAL); retval = madvise(GST_BUFFER_DATA(buf),GST_BUFFER_SIZE(buf),MADV_SEQUENTIAL);
@ -408,6 +415,9 @@ gst_filesrc_map_small_region (GstFileSrc *src, off_t offset, size_t size)
mapsize = ((size + mod + src->pagesize - 1) / src->pagesize) * src->pagesize; mapsize = ((size + mod + src->pagesize - 1) / src->pagesize) * src->pagesize;
/* printf("not on page boundaries, resizing map to %d+%d\n",mapbase,mapsize);*/ /* printf("not on page boundaries, resizing map to %d+%d\n",mapbase,mapsize);*/
map = gst_filesrc_map_region(src, mapbase, mapsize); map = gst_filesrc_map_region(src, mapbase, mapsize);
if (map == NULL)
return NULL;
ret = gst_buffer_create_sub (map, offset - mapbase, size); ret = gst_buffer_create_sub (map, offset - mapbase, size);
gst_buffer_unref (map); gst_buffer_unref (map);
@ -565,6 +575,9 @@ gst_filesrc_get (GstPad *pad)
} }
/* create a new one */ /* create a new one */
src->mapbuf = gst_filesrc_map_region (src, nextmap, mapsize); src->mapbuf = gst_filesrc_map_region (src, nextmap, mapsize);
if (src->mapbuf == NULL)
return NULL;
/* subbuffer it */ /* subbuffer it */
buf = gst_buffer_create_sub (src->mapbuf, src->curoffset - nextmap, readsize); buf = gst_buffer_create_sub (src->mapbuf, src->curoffset - nextmap, readsize);
} }
@ -616,6 +629,8 @@ gst_filesrc_open_file (GstFileSrc *src)
/* allocate the first mmap'd region */ /* allocate the first mmap'd region */
src->mapbuf = gst_filesrc_map_region (src, 0, src->mapsize); src->mapbuf = gst_filesrc_map_region (src, 0, src->mapsize);
if (src->mapbuf == NULL)
return FALSE;
src->curoffset = 0; src->curoffset = 0;

29
plugins/elements/gstfilesrc.c
View file

@ -355,21 +355,28 @@ gst_filesrc_map_region (GstFileSrc *src, off_t offset, size_t size)
{ {
GstBuffer *buf; GstBuffer *buf;
gint retval; gint retval;
void *mmapregion;
g_return_val_if_fail (offset >= 0, NULL); g_return_val_if_fail (offset >= 0, NULL);
fs_print ("mapping region %08llx+%08x from file into memory\n",offset,size); fs_print ("mapping region %08llx+%08x from file into memory\n",offset,size);
mmapregion = mmap (NULL, size, PROT_READ, MAP_SHARED, src->fd, offset);
if (mmapregion == NULL) {
gst_element_error (GST_ELEMENT (src), "couldn't map file");
return NULL;
}
else if (mmapregion == MAP_FAILED) {
gst_element_error (GST_ELEMENT (src), "mmap (0x%x, %d, 0x%llx) : %s",
size, src->fd, offset, strerror (errno));
return NULL;
}
/* time to allocate a new mapbuf */ /* time to allocate a new mapbuf */
buf = gst_buffer_new(); buf = gst_buffer_new();
/* mmap() the data into this new buffer */ /* mmap() the data into this new buffer */
GST_BUFFER_DATA(buf) = mmap (NULL, size, PROT_READ, MAP_SHARED, src->fd, offset); GST_BUFFER_DATA(buf) = mmapregion;
if (GST_BUFFER_DATA(buf) == NULL) {
gst_element_error (GST_ELEMENT (src), "couldn't map file");
} else if (GST_BUFFER_DATA(buf) == MAP_FAILED) {
gst_element_error (GST_ELEMENT (src), "mmap (0x%x, %d, 0x%llx) : %s",
size, src->fd, offset, strerror (errno));
}
#ifdef MADV_SEQUENTIAL #ifdef MADV_SEQUENTIAL
/* madvise to tell the kernel what to do with it */ /* madvise to tell the kernel what to do with it */
retval = madvise(GST_BUFFER_DATA(buf),GST_BUFFER_SIZE(buf),MADV_SEQUENTIAL); retval = madvise(GST_BUFFER_DATA(buf),GST_BUFFER_SIZE(buf),MADV_SEQUENTIAL);
@ -408,6 +415,9 @@ gst_filesrc_map_small_region (GstFileSrc *src, off_t offset, size_t size)
mapsize = ((size + mod + src->pagesize - 1) / src->pagesize) * src->pagesize; mapsize = ((size + mod + src->pagesize - 1) / src->pagesize) * src->pagesize;
/* printf("not on page boundaries, resizing map to %d+%d\n",mapbase,mapsize);*/ /* printf("not on page boundaries, resizing map to %d+%d\n",mapbase,mapsize);*/
map = gst_filesrc_map_region(src, mapbase, mapsize); map = gst_filesrc_map_region(src, mapbase, mapsize);
if (map == NULL)
return NULL;
ret = gst_buffer_create_sub (map, offset - mapbase, size); ret = gst_buffer_create_sub (map, offset - mapbase, size);
gst_buffer_unref (map); gst_buffer_unref (map);
@ -565,6 +575,9 @@ gst_filesrc_get (GstPad *pad)
} }
/* create a new one */ /* create a new one */
src->mapbuf = gst_filesrc_map_region (src, nextmap, mapsize); src->mapbuf = gst_filesrc_map_region (src, nextmap, mapsize);
if (src->mapbuf == NULL)
return NULL;
/* subbuffer it */ /* subbuffer it */
buf = gst_buffer_create_sub (src->mapbuf, src->curoffset - nextmap, readsize); buf = gst_buffer_create_sub (src->mapbuf, src->curoffset - nextmap, readsize);
} }
@ -616,6 +629,8 @@ gst_filesrc_open_file (GstFileSrc *src)
/* allocate the first mmap'd region */ /* allocate the first mmap'd region */
src->mapbuf = gst_filesrc_map_region (src, 0, src->mapsize); src->mapbuf = gst_filesrc_map_region (src, 0, src->mapsize);
if (src->mapbuf == NULL)
return FALSE;
src->curoffset = 0; src->curoffset = 0;