peter
/
libraw1394
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

lock allocated isochronous packet tracking memory 

git-svn-id: svn://svn.linux1394.org/libraw1394/trunk@163 53a565d1-3bb7-0310-b661-cf11e63c67ab
This commit is contained in:
ddennedy 2006-04-09 02:13:44 +00:00
parent 9c74e4a295
commit 0b0ad6b10e
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/iso.c
View File

@ -105,6 +105,7 @@ static int do_iso_init(raw1394handle_t handle,
int cmd) int cmd)
{ {
unsigned int stride; unsigned int stride;
int result;
/* already initialized? */ /* already initialized? */
if(handle->iso_mode != ISO_INACTIVE) if(handle->iso_mode != ISO_INACTIVE)
@ -159,7 +160,16 @@ static int do_iso_init(raw1394handle_t handle,
ioctl(handle->fd, RAW1394_IOC_ISO_SHUTDOWN, 0); ioctl(handle->fd, RAW1394_IOC_ISO_SHUTDOWN, 0);
return -1; return -1;
} }
#if _POSIX_MEMLOCK > 0
result = mlock(handle->iso_packet_infos, buf_packets * sizeof(struct raw1394_iso_packet_info));
/* Ignore a permission error - app is responsible for that, */
if (result < 0 && result != -EPERM) {
munmap(handle->iso_buffer, handle->iso_status.config.data_buf_size);
handle->iso_buffer = NULL;
ioctl(handle->fd, RAW1394_IOC_ISO_SHUTDOWN, 0);
return -1;
}
#endif
return 0; return 0;
} }
@ -464,6 +474,11 @@ void raw1394_iso_shutdown(raw1394handle_t handle)
} }
if(handle->iso_packet_infos) { if(handle->iso_packet_infos) {
#if _POSIX_MEMLOCK > 0
munlock(handle->iso_packet_infos,
handle->iso_status.config.buf_packets *
sizeof(struct raw1394_iso_packet_info));
#endif
free(handle->iso_packet_infos); free(handle->iso_packet_infos);
handle->iso_packet_infos = NULL; handle->iso_packet_infos = NULL;
} }