Few minor fixes

This commit is contained in:
Bahadir Balban
2009-10-13 13:51:30 +03:00
parent c37b9030fd
commit 38ac9052c0
7 changed files with 52 additions and 15 deletions

View File

@@ -15,15 +15,15 @@ int main(int argc, char *argv[]);
int __container_init(int argc, char **argv)
{
void *envp = &argv[argc + 1];
// char *pagerval;
char *pagerval;
if ((char *)envp == *argv)
envp = &argv[argc];
__libposix_init(envp);
//pagerval = getenv("pagerid");
//printf("Pager id: %s\n", pagerval);
pagerval = getenv("pagerid");
printf("Pager id: %s\n", pagerval);
/* Generic L4 thread initialisation */
__l4_init();

View File

@@ -5,7 +5,7 @@
*/
virtual_base = 0x10000000;
/* __stack = (0x20000000 - 0x1000 - 8); */
/* First page before the env/args */

View File

@@ -3,7 +3,7 @@
#define __TASKNAME__ "test0"
#define TEST_VERBOSE_PRINT
//#define TEST_VERBOSE_PRINT
#if defined (TEST_VERBOSE_PRINT)
#define test_printf(...) printf(__VA_ARGS__)
#else
@@ -24,5 +24,6 @@ int fileio(void);
int clonetest(void);
int exectest(pid_t);
int user_mutex_test(void);
int small_io_test(void);
#endif /* __TEST0_TESTS_H__ */

View File

@@ -23,6 +23,7 @@ void wait_pager(l4id_t partner)
// printf("Pager synced with us.\n");
}
pid_t parent_of_all;
int main(int argc, char *argv[])
@@ -36,7 +37,8 @@ int main(int argc, char *argv[])
printf("\n%s: Running POSIX API tests.\n", __TASKNAME__);
/*
small_io_test();
dirtest();
mmaptest();
@@ -56,7 +58,7 @@ int main(int argc, char *argv[])
if (parent_of_all == getpid()) {
user_mutex_test();
}
*/
exectest(parent_of_all);
while (1)

View File

@@ -26,10 +26,9 @@ int exectest(pid_t parent_of_all)
int left, cnt;
char *argv[5];
char *envp[2];
void *buf;
memset(filename, 0, 128);
sprintf(filename, "/execfile%d", getpid());
sprintf(filename, "/home/bahadir/execfile%d", getpid());
/* First create a new file and write the executable data to that file */
if ((fd = open(filename, O_RDWR | O_CREAT | O_TRUNC, S_IRWXU)) < 0) {
@@ -67,6 +66,7 @@ int exectest(pid_t parent_of_all)
goto out_err;
}
#if 0
/* Reopen */
if ((fd = open(filename, O_RDONLY, S_IRWXU)) < 0) {
err = errno;
@@ -82,7 +82,7 @@ int exectest(pid_t parent_of_all)
printf("First page of read and written file doesn't match\n");
else
printf("First page matches.\n");
#endif
/* Set up some arguments */
argv[0] = "FIRST ARG";
argv[1] = "SECOND ARG";

View File

@@ -8,6 +8,41 @@
#include <tests.h>
#include <errno.h>
#define PAGE_SIZE 0x1000
int small_io_test(void)
{
int fd1, fd2;
char *string = "abcdefg";
char strbuf[30];
char *path = "/text.txt";
fd1 = open(path, O_TRUNC | O_RDWR | O_CREAT, S_IRWXU);
fd2 = open(path, O_RDWR, 0);
printf("fd1: %d, fd2: %d\n", fd1, fd2);
perror("OPEN");
for (int i = 0; i < 4; i++) {
sprintf(strbuf, "%s%d", string, i);
printf("Writing to %s offset %x, string: %s\n",
path, i*PAGE_SIZE, strbuf);
lseek(fd1, i*PAGE_SIZE, SEEK_SET);
write(fd1, strbuf, strlen(strbuf) + 1);
}
close(fd1);
memset(strbuf, 0, 30);
for (int i = 0; i < 4; i++) {
lseek(fd2, i*PAGE_SIZE, SEEK_SET);
read(fd2, strbuf, 30);
printf("Read %s, offset %x as %s\n", path, i*PAGE_SIZE, strbuf);
}
close(fd2);
return 0;
}
int fileio(void)
{
int fd;