Changeset 984a9ba in mainline for uspace/srv/fs/tmpfs

Timestamp:

2018-07-05T09:34:09Z (7 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

63d46341

Parents:

76f566d

Message:

do not expose the call capability handler from the async framework

Keep the call capability handler encapsulated within the async framework
and do not expose it explicitly via its API. Use the pointer to
ipc_call_t as the sole object identifying an IPC call in the code that
uses the async framework.

This plugs a major leak in the abstraction and also simplifies both the
async framework (slightly) and all IPC servers.

File:

• uspace/srv/fs/tmpfs/tmpfs_ops.c (modified) (12 diffs)

uspace/srv/fs/tmpfs/tmpfs_ops.c

@@ -55 +55 @@
 
 /** All root nodes have index 0. */
-#define TMPFS_SOME_ROOT         0
+#define TMPFS_SOME_ROOT  0
+
 /** Global counter for assigning node indices. Shared by all instances. */
 fs_index_t tmpfs_next_index = 1;
@@ -308 +309 @@
         if (!nodep)
                 return ENOMEM;
+
         tmpfs_node_initialize(nodep);
         nodep->bp = malloc(sizeof(fs_node_t));
@@ -314 +316 @@
                 return ENOMEM;
         }
+
         fs_node_initialize(nodep->bp);
-        nodep->bp->data = nodep;        /* link the FS and TMPFS nodes */
+        nodep->bp->data = nodep;  /* Link the FS and TMPFS nodes */
 
         rc = tmpfs_root_get(&rootfn, service_id);
@@ -323 +326 @@
         else
                 nodep->index = tmpfs_next_index++;
+
         nodep->service_id = service_id;
         if (lflag & L_DIRECTORY)
@@ -480 +484 @@
          * Receive the read request.
          */
-        cap_call_handle_t chandle;
+        ipc_call_t call;
         size_t size;
-        if (!async_data_read_receive(&chandle, &size)) {
-                async_answer_0(chandle, EINVAL);
+        if (!async_data_read_receive(&call, &size)) {
+                async_answer_0(&call, EINVAL);
                 return EINVAL;
         }
@@ -490 +494 @@
         if (nodep->type == TMPFS_FILE) {
                 bytes = min(nodep->size - pos, size);
-                (void) async_data_read_finalize(chandle, nodep->data + pos,
+                (void) async_data_read_finalize(&call, nodep->data + pos,
                     bytes);
         } else {
@@ -506 +510 @@
 
                 if (lnk == NULL) {
-                        async_answer_0(chandle, ENOENT);
+                        async_answer_0(&call, ENOENT);
                         return ENOENT;
                 }
@@ -512 +516 @@
                 dentryp = list_get_instance(lnk, tmpfs_dentry_t, link);
 
-                (void) async_data_read_finalize(chandle, dentryp->name,
+                (void) async_data_read_finalize(&call, dentryp->name,
                     str_size(dentryp->name) + 1);
                 bytes = 1;
@@ -543 +547 @@
          * Receive the write request.
          */
-        cap_call_handle_t chandle;
+        ipc_call_t call;
         size_t size;
-        if (!async_data_write_receive(&chandle, &size)) {
-                async_answer_0(chandle, EINVAL);
+        if (!async_data_write_receive(&call, &size)) {
+                async_answer_0(&call, EINVAL);
                 return EINVAL;
         }
@@ -555 +559 @@
         if (pos + size <= nodep->size) {
                 /* The file size is not changing. */
-                (void) async_data_write_finalize(chandle, nodep->data + pos,
+                (void) async_data_write_finalize(&call, nodep->data + pos,
                     size);
                 goto out;
@@ -569 +573 @@
         void *newdata = realloc(nodep->data, nodep->size + delta);
         if (!newdata) {
-                async_answer_0(chandle, ENOMEM);
+                async_answer_0(&call, ENOMEM);
                 size = 0;
                 goto out;
@@ -577 +581 @@
         nodep->size += delta;
         nodep->data = newdata;
-        (void) async_data_write_finalize(chandle, nodep->data + pos, size);
+        (void) async_data_write_finalize(&call, nodep->data + pos, size);
 
 out: