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

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.

Location:

uspace/srv/fs/udf

Files:

• udf_file.c (modified) (4 diffs)
• udf_file.h (modified) (1 diff)
• udf_ops.c (modified) (5 diffs)

uspace/srv/fs/udf/udf_file.c

@@ -568 +568 @@
  *
  * @param read_len Returned value. Length file or part file which we could read.
- * @param chandle
+ * @param call     IPC call
  * @param node     UDF node
  * @param pos      Position in file since we have to read.
@@ -576 +576 @@
  *
  */
-errno_t udf_read_file(size_t *read_len, cap_call_handle_t chandle, udf_node_t *node,
+errno_t udf_read_file(size_t *read_len, ipc_call_t *call, udf_node_t *node,
     aoff64_t pos, size_t len)
 {
@@ -598 +598 @@
             BLOCK_FLAGS_NONE);
         if (rc != EOK) {
-                async_answer_0(chandle, rc);
+                async_answer_0(call, rc);
                 return rc;
         }
@@ -619 +619 @@
         }
 
-        async_data_read_finalize(chandle, block->data + sector_pos, *read_len);
+        async_data_read_finalize(call, block->data + sector_pos, *read_len);
         return block_put(block);
 }

uspace/srv/fs/udf/udf_file.h

@@ -198 +198 @@
 extern errno_t udf_read_allocation_sequence(udf_node_t *, uint8_t *, uint16_t,
     uint32_t, uint32_t);
-extern errno_t udf_read_file(size_t *, cap_call_handle_t, udf_node_t *, aoff64_t,
+extern errno_t udf_read_file(size_t *, ipc_call_t *, udf_node_t *, aoff64_t,
     size_t);
 extern errno_t udf_get_fid(udf_file_identifier_descriptor_t **, block_t **,

uspace/srv/fs/udf/udf_ops.c

@@ -464 +464 @@
         udf_node_t *node = UDF_NODE(rfn);
 
-        cap_call_handle_t chandle;
+        ipc_call_t call;
         size_t len = 0;
-        if (!async_data_read_receive(&chandle, &len)) {
-                async_answer_0(chandle, EINVAL);
+        if (!async_data_read_receive(&call, &len)) {
+                async_answer_0(&call, EINVAL);
                 udf_node_put(rfn);
                 return EINVAL;
@@ -475 +475 @@
                 if (pos >= node->data_size) {
                         *rbytes = 0;
-                        async_data_read_finalize(chandle, NULL, 0);
+                        async_data_read_finalize(&call, NULL, 0);
                         udf_node_put(rfn);
                         return EOK;
@@ -482 +482 @@
                 size_t read_len = 0;
                 if (node->data == NULL)
-                        rc = udf_read_file(&read_len, chandle, node, pos, len);
+                        rc = udf_read_file(&read_len, &call, node, pos, len);
                 else {
                         /* File in allocation descriptors area */
                         read_len = (len < node->data_size) ? len : node->data_size;
-                        async_data_read_finalize(chandle, node->data + pos, read_len);
+                        async_data_read_finalize(&call, node->data + pos, read_len);
                         rc = EOK;
                 }
@@ -505 +505 @@
                             fid->lenght_file_id, &node->instance->charset);
 
-                        async_data_read_finalize(chandle, name, str_size(name) + 1);
+                        async_data_read_finalize(&call, name, str_size(name) + 1);
                         *rbytes = 1;
                         free(name);
@@ -517 +517 @@
                         *rbytes = 0;
                         udf_node_put(rfn);
-                        async_answer_0(chandle, ENOENT);
+                        async_answer_0(&call, ENOENT);
                         return ENOENT;
                 }