libburnia/legacy
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Using mmap() by default for allocating read buffers

Browse Source
This commit is contained in:
Thomas Schmitt 2009-11-28 12:23:20 +00:00
parent 89b20aeec5
commit a42ece0bce
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libburn/trunk/cdrskin/cdrskin_timestamp.h
View File

@ -1 +1 @@
#define Cdrskin_timestamP "2009.11.26.211418" #define Cdrskin_timestamP "2009.11.28.122436"

28
libburn/trunk/libburn/sg-linux.c
View File

@ -108,6 +108,9 @@ Hint: You should also look into sg-freebsd-port.c, which is a younger and
/* for ioctl(BLKGETSIZE) */ /* for ioctl(BLKGETSIZE) */
#include <linux/fs.h> #include <linux/fs.h>
/* for mmap() */
#include <sys/mman.h>
#include <scsi/sg.h> #include <scsi/sg.h>
/* Values within sg_io_hdr_t indicating success after ioctl(SG_IO) : */ /* Values within sg_io_hdr_t indicating success after ioctl(SG_IO) : */
@ -2089,24 +2092,21 @@ int burn_os_stdio_capacity(char *path, off_t *bytes)
/* ts A91122 : an interface to open(O_DIRECT) or similar OS tricks. */ /* ts A91122 : an interface to open(O_DIRECT) or similar OS tricks. */
#ifdef Libburn_read_o_direcT
#include <sys/mman.h>
#ifdef PROT_READ #ifdef PROT_READ
#ifdef PROT_WRITE #ifdef PROT_WRITE
#ifdef MAP_SHARED #ifdef MAP_SHARED
#ifdef MAP_ANONYMOUS #ifdef MAP_ANONYMOUS
#ifdef MAP_FAILED #ifdef MAP_FAILED
#define Libburn_linux_do_mmaP 1
#endif
#endif
#endif
#endif
#endif
#ifdef Libburn_read_o_direcT
#ifdef O_DIRECT #ifdef O_DIRECT
#define Libburn_linux_do_o_direcT 1 #define Libburn_linux_do_o_direcT 1
#endif
#endif
#endif
#endif
#endif
#endif #endif
#endif /* Libburn_read_o_direcT */ #endif /* Libburn_read_o_direcT */
@ -2132,7 +2132,7 @@ void *burn_os_alloc_buffer(size_t amount, int flag)
{ {
void *buf = NULL; void *buf = NULL;
#ifdef Libburn_linux_do_o_direcT #ifdef Libburn_linux_do_mmaP
/* >>> check whether size is suitable */; /* >>> check whether size is suitable */;
@ -2147,7 +2147,7 @@ void *burn_os_alloc_buffer(size_t amount, int flag)
memset(buf, 0, amount); memset(buf, 0, amount);
#else #else
buf = calloc(1, amount); buf = calloc(1, amount);
#endif /* ! Libburn_linux_do_o_direcT */ #endif /* ! Libburn_linux_do_mmaP */
return buf; return buf;
} }
@ -2159,7 +2159,7 @@ int burn_os_free_buffer(void *buffer, size_t amount, int flag)
if (buffer == NULL) if (buffer == NULL)
return 0; return 0;
#ifdef Libburn_linux_do_o_direcT #ifdef Libburn_linux_do_mmaP
ret = munmap(buffer, amount); ret = munmap(buffer, amount);
#else #else
free(buffer); free(buffer);