mirror of
https://github.com/jart/cosmopolitan.git
synced 2025-05-23 22:02:27 +00:00
Fix more things
- Update a couple unicode data files - Disable strace during logger calls - SQLite now uses pread() / pwrite() - pread() past EOF on NT now returns 0 - Make the NT mmap() and fork() code elegant - Give NT a big performance boost with memory - Add many more mmap() tests to prove it works
This commit is contained in:
Justine Tunney
parent
b90fa996b4
commit
98909b1391
36 changed files with 1034 additions and 318 deletions
|
|
@ -20,8 +20,10 @@
|
|||
#include "libc/bits/xchg.internal.h"
|
||||
#include "libc/calls/calls.h"
|
||||
#include "libc/fmt/fmt.h"
|
||||
#include "libc/intrin/kprintf.h"
|
||||
#include "libc/log/log.h"
|
||||
#include "libc/mem/mem.h"
|
||||
#include "libc/rand/rand.h"
|
||||
#include "libc/runtime/gc.internal.h"
|
||||
#include "libc/runtime/memtrack.internal.h"
|
||||
#include "libc/runtime/runtime.h"
|
||||
|
|
@ -40,7 +42,7 @@ TEST(mmap, testMapFile) {
|
|||
int fd;
|
||||
char *p;
|
||||
char path[PATH_MAX];
|
||||
sprintf(path, "%s%s.%d", kTmpPath, program_invocation_short_name, getpid());
|
||||
sprintf(path, "%s%s.%ld", kTmpPath, program_invocation_short_name, vigna());
|
||||
ASSERT_NE(-1, (fd = open(path, O_CREAT | O_TRUNC | O_RDWR, 0644)));
|
||||
EXPECT_EQ(5, write(fd, "hello", 5));
|
||||
EXPECT_NE(-1, fdatasync(fd));
|
||||
|
|
@ -54,7 +56,7 @@ TEST(mmap, testMapFile) {
|
|||
TEST(mmap, testMapFile_fdGetsClosed_makesNoDifference) {
|
||||
int fd;
|
||||
char *p, buf[16], path[PATH_MAX];
|
||||
sprintf(path, "%s%s.%d", kTmpPath, program_invocation_short_name, getpid());
|
||||
sprintf(path, "%s%s.%ld", kTmpPath, program_invocation_short_name, vigna());
|
||||
ASSERT_NE(-1, (fd = open(path, O_CREAT | O_TRUNC | O_RDWR, 0644)));
|
||||
EXPECT_EQ(5, write(fd, "hello", 5));
|
||||
EXPECT_NE(-1, fdatasync(fd));
|
||||
|
|
@ -113,6 +115,7 @@ TEST(mmap, fileOffset) {
|
|||
EXPECT_NE(-1, ftruncate(fd, FRAMESIZE * 2));
|
||||
EXPECT_NE(-1, pwrite(fd, "hello", 5, FRAMESIZE * 0));
|
||||
EXPECT_NE(-1, pwrite(fd, "there", 5, FRAMESIZE * 1));
|
||||
EXPECT_NE(-1, fdatasync(fd));
|
||||
ASSERT_NE(MAP_FAILED, (map = mmap(NULL, FRAMESIZE, PROT_READ, MAP_PRIVATE, fd,
|
||||
FRAMESIZE)));
|
||||
EXPECT_EQ(0, memcmp(map, "there", 5), "%#.*s", 5, map);
|
||||
|
|
@ -123,7 +126,7 @@ TEST(mmap, fileOffset) {
|
|||
TEST(mmap, mapPrivate_writesDontChangeFile) {
|
||||
int fd;
|
||||
char *map, buf[5];
|
||||
ASSERT_NE(-1, (fd = open("foo", O_CREAT | O_RDWR, 0644)));
|
||||
ASSERT_NE(-1, (fd = open("bar", O_CREAT | O_RDWR, 0644)));
|
||||
EXPECT_NE(-1, ftruncate(fd, FRAMESIZE));
|
||||
EXPECT_NE(-1, pwrite(fd, "hello", 5, 0));
|
||||
ASSERT_NE(MAP_FAILED, (map = mmap(NULL, FRAMESIZE, PROT_READ | PROT_WRITE,
|
||||
|
|
@ -131,7 +134,7 @@ TEST(mmap, mapPrivate_writesDontChangeFile) {
|
|||
memcpy(map, "there", 5);
|
||||
EXPECT_NE(-1, msync(map, FRAMESIZE, MS_SYNC));
|
||||
EXPECT_NE(-1, munmap(map, FRAMESIZE));
|
||||
EXPECT_NE(-1, pread(fd, buf, 5, 0));
|
||||
EXPECT_NE(-1, pread(fd, buf, 6, 0));
|
||||
EXPECT_EQ(0, memcmp(buf, "hello", 5), "%#.*s", 5, buf);
|
||||
EXPECT_NE(-1, close(fd));
|
||||
}
|
||||
|
|
@ -152,3 +155,128 @@ TEST(isheap, mallocOffset) {
|
|||
char *p = gc(malloc(131072));
|
||||
ASSERT_TRUE(_isheap(p + 100000));
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
// NON-SHARED READ-ONLY FILE MEMORY
|
||||
|
||||
TEST(mmap, cow) {
|
||||
int fd;
|
||||
char *p;
|
||||
char path[PATH_MAX];
|
||||
sprintf(path, "%s%s.%ld", kTmpPath, program_invocation_short_name, vigna());
|
||||
ASSERT_NE(-1, (fd = open(path, O_CREAT | O_TRUNC | O_RDWR, 0644)));
|
||||
EXPECT_EQ(5, write(fd, "hello", 5));
|
||||
EXPECT_NE(-1, fdatasync(fd));
|
||||
EXPECT_NE(MAP_FAILED,
|
||||
(p = mmap(NULL, 5, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0)));
|
||||
EXPECT_STREQN("hello", p, 5);
|
||||
EXPECT_NE(-1, munmap(p, 5));
|
||||
EXPECT_NE(-1, close(fd));
|
||||
EXPECT_NE(-1, unlink(path));
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
// NON-SHARED READ-ONLY FILE MEMORY BETWEEN PROCESSES
|
||||
|
||||
TEST(mmap, cowFileMapReadonlyFork) {
|
||||
char *p;
|
||||
int fd, pid, ws;
|
||||
char path[PATH_MAX], lol[6];
|
||||
sprintf(path, "%s%s.%ld", kTmpPath, program_invocation_short_name, vigna());
|
||||
ASSERT_NE(-1, (fd = open(path, O_CREAT | O_TRUNC | O_RDWR, 0644)));
|
||||
EXPECT_EQ(6, write(fd, "hello", 6));
|
||||
EXPECT_NE(-1, close(fd));
|
||||
ASSERT_NE(-1, (fd = open(path, O_RDONLY)));
|
||||
EXPECT_NE(MAP_FAILED, (p = mmap(NULL, 6, PROT_READ, MAP_PRIVATE, fd, 0)));
|
||||
EXPECT_STREQN("hello", p, 5);
|
||||
ASSERT_NE(-1, (ws = xspawn(0)));
|
||||
if (ws == -2) {
|
||||
ASSERT_STREQN("hello", p, 5);
|
||||
_exit(0);
|
||||
}
|
||||
EXPECT_STREQN("hello", p, 5);
|
||||
EXPECT_NE(-1, munmap(p, 6));
|
||||
EXPECT_NE(-1, unlink(path));
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
// NON-SHARED READ/WRITE FILE MEMORY BETWEEN PROCESSES
|
||||
|
||||
TEST(mmap, cowFileMapFork) {
|
||||
char *p;
|
||||
int fd, pid, ws;
|
||||
char path[PATH_MAX], lol[6];
|
||||
sprintf(path, "%s%s.%ld", kTmpPath, program_invocation_short_name, vigna());
|
||||
ASSERT_NE(-1, (fd = open(path, O_CREAT | O_TRUNC | O_RDWR, 0644)));
|
||||
EXPECT_EQ(6, write(fd, "parnt", 6));
|
||||
EXPECT_NE(-1, fdatasync(fd));
|
||||
EXPECT_NE(MAP_FAILED,
|
||||
(p = mmap(NULL, 6, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0)));
|
||||
EXPECT_STREQN("parnt", p, 5);
|
||||
ASSERT_NE(-1, (ws = xspawn(0)));
|
||||
if (ws == -2) {
|
||||
ASSERT_STREQN("parnt", p, 5);
|
||||
strcpy(p, "child");
|
||||
ASSERT_STREQN("child", p, 5);
|
||||
_exit(0);
|
||||
}
|
||||
EXPECT_STREQN("parnt", p, 5); // child changing memory did not change parent
|
||||
EXPECT_EQ(6, pread(fd, lol, 6, 0));
|
||||
EXPECT_STREQN("parnt", lol, 5); // changing memory did not change file
|
||||
EXPECT_NE(-1, munmap(p, 6));
|
||||
EXPECT_NE(-1, close(fd));
|
||||
EXPECT_NE(-1, unlink(path));
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
// SHARED ANONYMOUS MEMORY BETWEEN PROCESSES
|
||||
|
||||
TEST(mmap, sharedAnonMapFork) {
|
||||
char *p;
|
||||
int pid, ws;
|
||||
EXPECT_NE(MAP_FAILED, (p = mmap(NULL, 6, PROT_READ | PROT_WRITE,
|
||||
MAP_SHARED | MAP_ANONYMOUS, -1, 0)));
|
||||
strcpy(p, "parnt");
|
||||
EXPECT_STREQN("parnt", p, 5);
|
||||
ASSERT_NE(-1, (ws = xspawn(0)));
|
||||
if (ws == -2) {
|
||||
ASSERT_STREQN("parnt", p, 5);
|
||||
strcpy(p, "child");
|
||||
ASSERT_STREQN("child", p, 5);
|
||||
_exit(0);
|
||||
}
|
||||
EXPECT_STREQN("child", p, 5); // boom
|
||||
EXPECT_NE(-1, munmap(p, 5));
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
// SHARED FILE MEMORY BETWEEN PROCESSES
|
||||
|
||||
TEST(mmap, sharedFileMapFork) {
|
||||
char *p;
|
||||
int fd, pid, ws;
|
||||
char path[PATH_MAX], lol[6];
|
||||
sprintf(path, "%s%s.%ld", kTmpPath, program_invocation_short_name, vigna());
|
||||
ASSERT_NE(-1, (fd = open(path, O_CREAT | O_TRUNC | O_RDWR, 0644)));
|
||||
EXPECT_EQ(6, write(fd, "parnt", 6));
|
||||
EXPECT_NE(-1, fdatasync(fd));
|
||||
EXPECT_NE(MAP_FAILED,
|
||||
(p = mmap(NULL, 6, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0)));
|
||||
EXPECT_STREQN("parnt", p, 5);
|
||||
ASSERT_NE(-1, (ws = xspawn(0)));
|
||||
if (ws == -2) {
|
||||
ASSERT_STREQN("parnt", p, 5);
|
||||
strcpy(p, "child");
|
||||
ASSERT_STREQN("child", p, 5);
|
||||
ASSERT_NE(-1, msync(p, 6, MS_SYNC | MS_INVALIDATE));
|
||||
_exit(0);
|
||||
}
|
||||
EXPECT_STREQN("child", p, 5); // child changing memory changed parent memory
|
||||
// XXX: RHEL5 has a weird issue where if we read the file into its own
|
||||
// shared memory then corruption occurs!
|
||||
EXPECT_EQ(6, pread(fd, lol, 6, 0));
|
||||
EXPECT_STREQN("child", lol, 5); // changing memory changed file
|
||||
EXPECT_NE(-1, munmap(p, 6));
|
||||
EXPECT_NE(-1, close(fd));
|
||||
EXPECT_NE(-1, unlink(path));
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue