Added file io test to test0. Added close call to libposix.

tasks/fs0/main.c

@@ -100,21 +100,12 @@ void handle_fs_requests(void)
 
 void main(void)
 {
-	struct timeval tv;
-
 	printf("\n%s: Started with tid: %d\n", __TASKNAME__, self_tid());
 
 	initialise();
 
 	wait_pager(PAGER_TID);
 
-	if (gettimeofday(&tv, 0) < 0) {
-		printf("Reading the time has failed.\n");
-	} else {
-		printf("Current time since system started: %u useconds, "
-		       "%u seconds.\n", tv.tv_usec, tv.tv_sec);
-	}
-
 	printf("%s: Listening requests.\n", __TASKNAME__);
 	while (1) {
 		handle_fs_requests();

tasks/libposix/close.c

@@ -0,0 +1,46 @@
+/*
+ * l4/posix glue for close()
+ *
+ * Copyright (C) 2007 Bahadir Balban
+ */
+#include <errno.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <l4lib/arch/syscalls.h>
+#include <l4lib/arch/syslib.h>
+#include <l4lib/ipcdefs.h>
+#include <l4lib/utcb.h>
+#include <l4/macros.h>
+#include INC_GLUE(memory.h)
+
+static inline int l4_close(int fd)
+{
+	write_mr(L4SYS_ARG0, fd);
+
+	/* Call pager with close() request. Check ipc error. */
+	if ((fd = l4_sendrecv(VFS_TID, VFS_TID, L4_IPC_TAG_CLOSE)) < 0) {
+		printf("%s: L4 IPC Error: %d.\n", __FUNCTION__, fd);
+		return fd;
+	}
+	/* Check if syscall itself was successful */
+	if ((fd = l4_get_retval()) < 0) {
+		printf("%s: CLOSE Error: %d.\n", __FUNCTION__, fd);
+		return fd;
+	}
+	return fd;
+}
+
+int close(int fd)
+{
+	int ret = l4_close(fd);
+
+	/* If error, return positive error code */
+	if (ret < 0) {
+		errno = -ret;
+		return -1;
+	}
+
+	/* else return value */
+	return ret;
+}
+

tasks/libposix/open.c

@@ -22,13 +22,12 @@ static inline int l4_open(const char *pathname, int flags, mode_t mode)
 {
 	int fd;
 
-	// write_mr(L4SYS_ARG0, (unsigned long)pathname);
 	copy_to_utcb((void *)pathname, 0, strlen(pathname) + 1);
 	write_mr(L4SYS_ARG0, (unsigned long)utcb_page);
 	write_mr(L4SYS_ARG1, flags);
 	write_mr(L4SYS_ARG2, (u32)mode);
 
-	/* Call pager with shmget() request. Check ipc error. */
+	/* Call pager with open() request. Check ipc error. */
 	if ((fd = l4_sendrecv(VFS_TID, VFS_TID, L4_IPC_TAG_OPEN)) < 0) {
 		printf("%s: L4 IPC Error: %d.\n", __FUNCTION__, fd);
 		return fd;

tasks/libposix/write.c

@@ -19,7 +19,7 @@ static inline int l4_write(int fd, const void *buf, size_t count)
 	write_mr(L4SYS_ARG1, (const unsigned long)buf);
 	write_mr(L4SYS_ARG2, count);
 
-	/* Call pager with shmget() request. Check ipc error. */
+	/* Call pager with write() request. Check ipc error. */
 	if ((wrcnt = l4_sendrecv(VFS_TID, VFS_TID, L4_IPC_TAG_WRITE)) < 0) {
 		printf("%s: L4 IPC Error: %d.\n", __FUNCTION__, wrcnt);
 		return wrcnt;

tasks/test0/include/tests.h

@@ -6,5 +6,6 @@
 int shmtest(void);
 int mmaptest(void);
 int dirtest(void);
+int fileio(void);
 
 #endif /* __TEST0_TESTS_H__ */

tasks/test0/main.c

@@ -28,7 +28,7 @@ void main(void)
 	wait_pager(0);
 
 	dirtest();
-
+	fileio();
 	while (1)
 		wait_pager(0);
 #if 0

tasks/test0/src/fileio.c

@@ -0,0 +1,33 @@
+
+#include <stdio.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <string.h>
+#include <tests.h>
+
+int fileio(void)
+{
+	int fd;
+	ssize_t cnt;
+	int err;
+
+	char *str = "I WROTE TO THIS FILE\n";
+
+	if ((fd = open("/home/bahadir/newfile.txt", O_RDWR | O_CREAT | O_TRUNC, S_IRWXU)) < 0) {
+		perror("OPEN");
+		return 0;
+	}
+
+	if ((int)(cnt = write(fd, str, strlen(str))) < 0) {
+		perror("WRITE");
+		return 0;
+	}
+
+	if ((err = close(fd)) < 0)
+		perror("CLOSE");
+
+	return 0;
+}
+