Changeset acfdcb0 in mainline

Timestamp:

2008-01-27T19:11:40Z (17 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

43b1e86

Parents:

f7017572

Message:

Remove the debugging hack from tmpfs_init(), which created several files and
directories on the filesystem. TMPFS is now self-sufficient enough to be able
to create its content via the standard VFS interface.

Location:

uspace

Files:

• app/tester/vfs/vfs1.c (modified) (4 diffs)
• srv/fs/tmpfs/tmpfs_ops.c (modified) (1 diff)

uspace/app/tester/vfs/vfs1.c

@@ -45 +45 @@
 {
         if (mount("tmpfs", "/", "nulldev0") != EOK)
-                return "Mount failed.\n";
+                return "mount() failed.\n";
+        if (!quiet)
+                printf("mounted tmpfs on /.\n");
 
         if (mkdir("/mydir", 0) != 0)
                 return "mkdir() failed.\n";
         if (!quiet)
-                printf("Created directory /mydir\n");
+                printf("created directory /mydir\n");
         
         int fd0 = open("/mydir/myfile", O_CREAT);
@@ -56 +58 @@
                 return "open() failed.\n";
         if (!quiet)
-                printf("Created /mydir/myfile, handle=%d\n", fd0);
+                printf("created file /mydir/myfile, fd=%d\n", fd0);
 
         ssize_t cnt;
@@ -64 +66 @@
                 return "write() failed.\n";
         if (!quiet)
-                printf("Written %d btyes to handle %d.\n", cnt, fd0);
+                printf("written %d bytes, fd=%d\n", cnt, fd0);
         if (lseek(fd0, 0, SEEK_SET) != 0)
                 return "lseek() failed.\n";
+        if (!quiet)
+                printf("sought to position 0, fd=%d\n", fd0);
+
+        char buf[10];
+
+        cnt = read(fd0, buf, sizeof(buf));
+        if (cnt < 0)
+                return "read() failed.\n";
+
+        if (!quiet)
+                printf("read %d bytes: \"%.*s\", fd=%d\n", cnt, cnt, buf, fd0);
 
         DIR *dirp;
@@ -75 +88 @@
                 return "opendir() failed.";
         while ((dp = readdir(dirp)))
-                printf("Discovered %s\n", dp->d_name);
+                printf("discovered node %s in /\n", dp->d_name);
         closedir(dirp);
-
-        int fd1 = open("/dir1/file1", O_RDONLY);
-        int fd2 = open("/dir2/file2", O_RDONLY);
-
-        if (fd1 < 0)
-                return "open() failed.\n";
-        if (fd2 < 0)
-                return "open() failed.\n";
-
-        if (!quiet)
-                printf("Opened file descriptors %d and %d.\n", fd1, fd2);
-
-        char buf[10];
-
-        cnt = read(fd0, buf, sizeof(buf));
-        if (cnt < 0)
-                return "read() failed.\n";
-
-        if (!quiet)
-                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/srv/fs/tmpfs/tmpfs_ops.c

@@ -122 +122 @@
         root->type = TMPFS_DIRECTORY;
         hash_table_insert(&dentries, &root->index, &root->dh_link);
-
-        /*
-         * This is only for debugging. Once we can create files and directories
-         * using VFS, we can get rid of this.
-         */
-        tmpfs_dentry_t *d;
-        d = (tmpfs_dentry_t *) malloc(sizeof(tmpfs_dentry_t));
-        if (!d) {
-                free(root);
-                root = NULL;
-                return false;
-        }
-        tmpfs_dentry_initialize(d);
-        d->index = tmpfs_next_index++;
-        root->child = d;
-        d->parent = root;
-        d->type = TMPFS_DIRECTORY;
-        d->name = "dir1";
-        hash_table_insert(&dentries, &d->index, &d->dh_link);
-
-        d = (tmpfs_dentry_t *) malloc(sizeof(tmpfs_dentry_t));
-        if (!d) {
-                free(root->child);
-                free(root);
-                root = NULL;
-                return false;
-        }
-        tmpfs_dentry_initialize(d);
-        d->index = tmpfs_next_index++;
-        root->child->sibling = d;
-        d->parent = root;
-        d->type = TMPFS_DIRECTORY;
-        d->name = "dir2";
-        hash_table_insert(&dentries, &d->index, &d->dh_link);
-        
-        d = (tmpfs_dentry_t *) malloc(sizeof(tmpfs_dentry_t));
-        if (!d) {
-                free(root->child->sibling);
-                free(root->child);
-                free(root);
-                root = NULL;
-                return false;
-        }
-        tmpfs_dentry_initialize(d);
-        d->index = tmpfs_next_index++;
-        root->child->child = d;
-        d->parent = root->child;
-        d->type = TMPFS_FILE;
-        d->name = "file1";
-        d->data = "This is the contents of /dir1/file1.\n";
-        d->size = strlen(d->data);
-        hash_table_insert(&dentries, &d->index, &d->dh_link);
-
-        d = (tmpfs_dentry_t *) malloc(sizeof(tmpfs_dentry_t));
-        if (!d) {
-                free(root->child->sibling);
-                free(root->child->child);
-                free(root->child);
-                free(root);
-                root = NULL;
-                return false;
-        }
-        tmpfs_dentry_initialize(d);
-        d->index = tmpfs_next_index++;
-        root->child->sibling->child = d;
-        d->parent = root->child->sibling;
-        d->type = TMPFS_FILE;
-        d->name = "file2";
-        d->data = "This is the contents of /dir2/file2.\n";
-        d->size = strlen(d->data);
-        hash_table_insert(&dentries, &d->index, &d->dh_link);
 
         return true;