Changeset f7017572 in mainline

Timestamp:

2008-01-27T18:54:16Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

acfdcb0

Parents:

15b9970

Message:

VFS_WRITE and tmpfs_write fixes.

Location:

uspace

Files:

• app/tester/vfs/vfs1.c (modified) (4 diffs)
• lib/libc/generic/vfs.c (modified) (2 diffs)
• srv/fs/tmpfs/tmpfs.c (modified) (1 diff)
• srv/fs/tmpfs/tmpfs_ops.c (modified) (2 diffs)
• srv/vfs/vfs_ops.c (modified) (2 diffs)

uspace/app/tester/vfs/vfs1.c

@@ -39 +39 @@
 #include "../tester.h"
 
+char text[] = "O xein', angellein Lakedaimoniois hoti teide "
+        "keimetha tois keinon rhemasi peithomenoi.";
+
 char *test_vfs1(bool quiet)
 {
@@ -46 +49 @@
         if (mkdir("/mydir", 0) != 0)
                 return "mkdir() failed.\n";
+        if (!quiet)
+                printf("Created directory /mydir\n");
+        
+        int fd0 = open("/mydir/myfile", O_CREAT);
+        if (fd0 < 0)
+                return "open() failed.\n";
+        if (!quiet)
+                printf("Created /mydir/myfile, handle=%d\n", fd0);
+
+        ssize_t cnt;
+        size_t size = sizeof(text);
+        cnt = write(fd0, text, size);
+        if (cnt < 0)
+                return "write() failed.\n";
+        if (!quiet)
+                printf("Written %d btyes to handle %d.\n", cnt, fd0);
+        if (lseek(fd0, 0, SEEK_SET) != 0)
+                return "lseek() failed.\n";
 
         DIR *dirp;
@@ -57 +78 @@
         closedir(dirp);
 
-        int fd1 = open("/dir1/file1", 0);
-        int fd2 = open("/dir2/file2", 0);
+        int fd1 = open("/dir1/file1", O_RDONLY);
+        int fd2 = open("/dir2/file2", O_RDONLY);
 
         if (fd1 < 0)
@@ -70 +91 @@
         char buf[10];
 
-        ssize_t cnt = read(fd1, buf, sizeof(buf));
+        cnt = read(fd0, buf, sizeof(buf));
         if (cnt < 0)
                 return "read() failed.\n";
 
         if (!quiet)
-                printf("Read %d bytes: %.*s\n", cnt, cnt, buf);
+                printf("Read %d bytes from handle %d: %.*s\n", cnt, fd0, cnt,
+                    buf);
+
+        cnt = read(fd1, buf, sizeof(buf));
+        if (cnt < 0)
+                return "read() failed.\n";
+
+        if (!quiet)
+                printf("Read %d bytes from handle %d: %.*s\n", cnt, fd1, cnt,
+                    buf);
 
         return NULL;

uspace/lib/libc/generic/vfs.c

@@ -166 +166 @@
         async_serialize_end();
         futex_up(&vfs_phone_futex);
-        return (ssize_t) IPC_GET_ARG1(answer);
+        if (rc == EOK)
+                return (ssize_t) IPC_GET_ARG1(answer);
+        else
+                return -1;
 }
 
@@ -196 +199 @@
         async_serialize_end();
         futex_up(&vfs_phone_futex);
-        return (ssize_t) IPC_GET_ARG1(answer);
+        if (rc == EOK)
+                return (ssize_t) IPC_GET_ARG1(answer);
+        else
+                return -1;
 }
 

uspace/srv/fs/tmpfs/tmpfs.c

@@ -116 +116 @@
                         tmpfs_read(callid, &call);
                         break;
+                case VFS_WRITE:
+                        tmpfs_write(callid, &call);
+                        break;
                 default:
                         ipc_answer_0(callid, ENOTSUP);

uspace/srv/fs/tmpfs/tmpfs_ops.c

@@ -498 +498 @@
                 /* The file size is not changing. */
                 (void) ipc_data_write_finalize(callid, dentry->data + pos, len);
-                ipc_answer_1(rid, EOK, len);
+                ipc_answer_2(rid, EOK, len, dentry->size);
                 return;
         }
@@ -512 +512 @@
         if (!newdata) {
                 ipc_answer_0(callid, ENOMEM);
-                ipc_answer_1(rid, EOK, 0);
+                ipc_answer_2(rid, EOK, 0, dentry->size);
                 return;
         }

uspace/srv/vfs/vfs_ops.c

@@ -371 +371 @@
         vfs_file_t *file = vfs_file_get(fd);
         file->node = node;
-        if (oflag & O_APPEND)
+        if (oflag & O_APPEND) 
                 file->append = true;
 
@@ -471 +471 @@
         else {
                 /* Update the cached version of node's size. */
-                file->node->size = IPC_GET_ARG2(answer); 
+                if (rc == EOK)
+                        file->node->size = IPC_GET_ARG2(answer); 
                 rwlock_write_unlock(&file->node->contents_rwlock);
         }
 
         /* Update the position pointer and unlock the open file. */
-        file->pos += bytes;
+        if (rc == EOK)
+                file->pos += bytes;
         futex_up(&file->lock);