X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Flib_internal%2Funify-copy.c;h=d39057a63348b19d54ded3d4aa19a9ca66d498aa;hb=f18514439f42894c270febfcc1e2a4da4d3711c2;hp=554c0771f1f43d3e26a0d5541dbbd5e077a76bee;hpb=35f92ae82ef67ab372f8953346f11ea911e4e901;p=util-vserver.git diff --git a/util-vserver/lib_internal/unify-copy.c b/util-vserver/lib_internal/unify-copy.c index 554c077..d39057a 100644 --- a/util-vserver/lib_internal/unify-copy.c +++ b/util-vserver/lib_internal/unify-copy.c @@ -21,14 +21,25 @@ #endif #include "unify.h" -#include +#include "util.h" + #include #include #include +#include +#include +#include +#include #define ENSC_WRAPPERS_IO 1 #include +#define MMAP_BLOCKSIZE (16 * 1024*1024) + +#ifndef TESTSUITE_COPY_CODE +# define TESTSUITE_COPY_CODE do { } while (false) +#endif + static inline bool verifySource(int fd, struct stat const *exp_stat) { @@ -58,6 +69,98 @@ copyLnk(char const *src, char const *dst) } } +static sigjmp_buf bus_error_restore; +static volatile sig_atomic_t bus_error; + +static void +handlerSIGBUS(int UNUSED num) +{ + bus_error = 1; + siglongjmp(bus_error_restore, 1); +} + +static void +copyMem(void *dst_v, void const *src_v, size_t len_v) +{ +#if 1 + int *dst = dst_v; + int const *src = src_v; + size_t len = len_v / sizeof(int); + size_t rest = len_v - sizeof(int)*len; + size_t i=0; + + for (; i0 && + (lseek(out_fd, in_len-1, SEEK_SET)==-1 || + write(out_fd, "\0", 1)!=1)) // create sparse file + return false; + + bus_error = 0; + if (sigsetjmp(bus_error_restore, 1)==0) { + off_t offset = 0; + + while (offset < in_len) { + in_size = in_len - offset; + if (in_size > MMAP_BLOCKSIZE) in_size = MMAP_BLOCKSIZE; + + in_buf = mmap(0, in_size, PROT_READ, MAP_SHARED, in_fd, offset); + if (in_buf==0) goto out; + + out_size = in_size; + out_buf = mmap(0, out_size, PROT_WRITE, MAP_SHARED, out_fd, offset); + if (out_buf==0) goto out; + + offset += in_size; + madvise(const_cast(void *)(in_buf), in_size, MADV_SEQUENTIAL); + madvise((void *)out_buf, out_size, MADV_SEQUENTIAL); + + TESTSUITE_COPY_CODE; + copyMem((void *)out_buf, (void *)in_buf, in_size); + + munmap(const_cast(void *)(in_buf), in_size); in_buf = 0; + munmap((void*)out_buf, out_size); out_buf = 0; + } + + res = true; + } + + out: + if (in_buf!=0) munmap(const_cast(void *)(in_buf), in_size); + if (out_buf!=0) munmap((void *)out_buf, out_size); + + return res; +} + static inline bool copyReg(char const *src, struct stat const *src_stat, char const *dst) @@ -69,6 +172,7 @@ copyReg(char const *src, struct stat const *src_stat, if (in_fd==-1 || out_fd==-1 || !verifySource(in_fd, src_stat)) goto err; +#if 0 for (;;) { char buf[2048]; ssize_t l = read(in_fd, buf, sizeof buf); @@ -78,7 +182,14 @@ copyReg(char const *src, struct stat const *src_stat, } res = true; - +#else + void (*old_handler)(int) = signal(SIGBUS, handlerSIGBUS); + + res = copyMMap(in_fd, out_fd); + + signal(SIGBUS, old_handler); +#endif + err: if (out_fd!=-1 && close(out_fd)==-1) res=false; if (in_fd!=-1 && close(in_fd)==-1) res=false;