Index: uspace/srv/fs/tmpfs/tmpfs.c =================================================================== --- uspace/srv/fs/tmpfs/tmpfs.c (revision 64b67c39501d9b1e2ce7abca50c6d56eef787040) +++ uspace/srv/fs/tmpfs/tmpfs.c (revision 860271d40119cf9d1999b88bdac7ceeca219a5b3) @@ -50,4 +50,6 @@ #include #include "../../vfs/vfs.h" + +#define NAME "tmpfs" @@ -133,5 +135,5 @@ int vfs_phone; - printf("TMPFS: HelenOS TMPFS file system server.\n"); + printf(NAME ": HelenOS TMPFS file system server\n"); vfs_phone = ipc_connect_me_to(PHONE_NS, SERVICE_VFS, 0, 0); @@ -145,11 +147,9 @@ tmpfs_connection); if (rc != EOK) { - printf("Failed to register the TMPFS file system (%d)\n", rc); + printf(NAME ": Failed to register file system (%d)\n", rc); return rc; } - dprintf("TMPFS filesystem registered, fs_handle=%d.\n", - tmpfs_reg.fs_handle); - + printf(NAME ": Accepting connections\n"); async_manager(); /* not reached */ Index: uspace/srv/fs/tmpfs/tmpfs_ops.c =================================================================== --- uspace/srv/fs/tmpfs/tmpfs_ops.c (revision 64b67c39501d9b1e2ce7abca50c6d56eef787040) +++ uspace/srv/fs/tmpfs/tmpfs_ops.c (revision 860271d40119cf9d1999b88bdac7ceeca219a5b3) @@ -51,4 +51,8 @@ #include #include +#include +#include +#include +#include #define min(a, b) ((a) < (b) ? (a) : (b)) @@ -58,4 +62,8 @@ #define NAMES_BUCKETS 4 + +#define BLOCK_SIZE 1024 // FIXME +#define RD_BASE 1024 // FIXME +#define RD_READ_BLOCK (RD_BASE + 1) /* @@ -141,4 +149,9 @@ hash_table_t dentries; +struct rdentry { + uint8_t type; + uint32_t len; +} __attribute__((packed)); + /* Implementation of hash table interface for the dentries hash table. */ static hash_index_t dentries_hash(unsigned long *key) @@ -236,4 +249,175 @@ root->lnkcnt = 1; return true; +} + +static bool tmpfs_blockread(int phone, void *buffer, size_t *bufpos, size_t *buflen, size_t *pos, void *dst, size_t size) +{ + size_t offset = 0; + size_t left = size; + + while (left > 0) { + size_t rd; + + if (*bufpos + left < *buflen) + rd = left; + else + rd = *buflen - *bufpos; + + if (rd > 0) { + memcpy(dst + offset, buffer + *bufpos, rd); + offset += rd; + *bufpos += rd; + *pos += rd; + left -= rd; + } + + if (*bufpos == *buflen) { + int retval; + int rc = ipc_call_sync_2_1(phone, RD_READ_BLOCK, *pos / BLOCK_SIZE, BLOCK_SIZE, (sysarg_t *) &retval); + if ((rc != EOK) || (retval != EOK)) + return false; + + *bufpos = 0; + *buflen = BLOCK_SIZE; + } + } + + return true; +} + +static bool tmpfs_restore_recursion(int phone, void *block, size_t *bufpos, size_t *buflen, size_t *pos, tmpfs_dentry_t *parent) +{ + struct rdentry entry; + + do { + char *fname; + tmpfs_dentry_t *node; + uint32_t size; + + if (!tmpfs_blockread(phone, block, bufpos, buflen, pos, &entry, sizeof(entry))) + return false; + + entry.len = uint32_t_le2host(entry.len); + + switch (entry.type) { + case 0: + break; + case 1: + fname = malloc(entry.len + 1); + if (fname == NULL) + return false; + + node = (tmpfs_dentry_t *) tmpfs_create_node(L_FILE); + if (node == NULL) { + free(fname); + return false; + } + + if (!tmpfs_blockread(phone, block, bufpos, buflen, pos, fname, entry.len)) { + tmpfs_destroy_node((void *) node); + free(fname); + return false; + } + fname[entry.len] = 0; + + if (!tmpfs_link_node((void *) parent, (void *) node, fname)) { + tmpfs_destroy_node((void *) node); + free(fname); + return false; + } + free(fname); + + if (!tmpfs_blockread(phone, block, bufpos, buflen, pos, &size, sizeof(size))) + return false; + + size = uint32_t_le2host(size); + + node->data = malloc(size); + if (node->data == NULL) + return false; + + node->size = size; + if (!tmpfs_blockread(phone, block, bufpos, buflen, pos, node->data, size)) + return false; + + break; + case 2: + fname = malloc(entry.len + 1); + if (fname == NULL) + return false; + + node = (tmpfs_dentry_t *) tmpfs_create_node(L_DIRECTORY); + if (node == NULL) { + free(fname); + return false; + } + + if (!tmpfs_blockread(phone, block, bufpos, buflen, pos, fname, entry.len)) { + tmpfs_destroy_node((void *) node); + free(fname); + return false; + } + fname[entry.len] = 0; + + if (!tmpfs_link_node((void *) parent, (void *) node, fname)) { + tmpfs_destroy_node((void *) node); + free(fname); + return false; + } + free(fname); + + if (!tmpfs_restore_recursion(phone, block, bufpos, buflen, pos, node)) + return false; + + break; + default: + return false; + } + } while (entry.type != 0); + + return true; +} + +static bool tmpfs_restore(dev_handle_t dev) +{ + void *block = mmap(NULL, BLOCK_SIZE, + PROTO_READ | PROTO_WRITE, MAP_ANONYMOUS | MAP_PRIVATE, 0, 0); + + if (block == NULL) + return false; + + int phone = ipc_connect_me_to(PHONE_NS, SERVICE_DEVMAP, DEVMAP_CONNECT_TO_DEVICE, dev); + + if (phone < 0) { + munmap(block, BLOCK_SIZE); + return false; + } + + if (ipc_share_out_start(phone, block, AS_AREA_READ | AS_AREA_WRITE) != EOK) + goto error; + + size_t bufpos = 0; + size_t buflen = 0; + size_t pos = 0; + + char tag[6]; + if (!tmpfs_blockread(phone, block, &bufpos, &buflen, &pos, tag, 5)) + goto error; + + tag[5] = 0; + if (strcmp(tag, "TMPFS") != 0) + goto error; + + if (!tmpfs_restore_recursion(phone, block, &bufpos, &buflen, &pos, root)) + goto error; + + ipc_hangup(phone); + munmap(block, BLOCK_SIZE); + return true; + +error: + ipc_hangup(phone); + munmap(block, BLOCK_SIZE); + return false; } @@ -396,14 +580,22 @@ void tmpfs_mount(ipc_callid_t rid, ipc_call_t *request) { - dev_handle_t mr_dev_handle = (dev_handle_t)IPC_GET_ARG1(*request); - fs_index_t mr_index = (fs_index_t)IPC_GET_ARG2(*request); - fs_handle_t mp_fs_handle = (fs_handle_t)IPC_GET_ARG3(*request); - dev_handle_t mp_dev_handle = (dev_handle_t)IPC_GET_ARG4(*request); - fs_index_t mp_index = (fs_index_t)IPC_GET_ARG5(*request); + dev_handle_t mr_dev_handle = (dev_handle_t) IPC_GET_ARG1(*request); + fs_index_t mr_index = (fs_index_t) IPC_GET_ARG2(*request); + fs_handle_t mp_fs_handle = (fs_handle_t) IPC_GET_ARG3(*request); + dev_handle_t mp_dev_handle = (dev_handle_t) IPC_GET_ARG4(*request); + fs_index_t mp_index = (fs_index_t) IPC_GET_ARG5(*request); + if ((mr_index == root->index) && - (mp_fs_handle == tmpfs_reg.fs_handle) && - (mp_index == mr_index)) - ipc_answer_0(rid, EOK); - else + (mp_fs_handle == tmpfs_reg.fs_handle) && + (mp_index == mr_index)) { + + if (mr_dev_handle >= 0) { + if (tmpfs_restore(mr_dev_handle)) + ipc_answer_0(rid, EOK); + else + ipc_answer_0(rid, ELIMIT); + } else + ipc_answer_0(rid, EOK); + } else ipc_answer_0(rid, ENOTSUP); }