Changeset e89a06a in mainline for uspace/srv/volsrv/volsrv.c

Timestamp:

2018-07-06T22:13:20Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

be0f5e4

Parents:

6419c6e

Message:

Encapsulate partitions list in volume server. (Global state is not good coding practice.)

File:

• uspace/srv/volsrv/volsrv.c (modified) (14 diffs)

uspace/srv/volsrv/volsrv.c

@@ -57 +57 @@
 {
         errno_t rc;
+        vol_parts_t *parts = NULL;
+
         log_msg(LOG_DEFAULT, LVL_DEBUG, "vol_init()");
 
-        rc = vol_part_init();
+        rc = vol_parts_create(&parts);
         if (rc != EOK)
-                return rc;
-
-        rc = vol_part_discovery_start();
+                goto error;
+
+        rc = vol_part_discovery_start(parts);
         if (rc != EOK)
-                return rc;
-
-        async_set_fallback_port_handler(vol_client_conn, NULL);
+                goto error;
+
+        async_set_fallback_port_handler(vol_client_conn, parts);
 
         rc = loc_server_register(NAME);
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering server: %s.", str_error(rc));
-                return EEXIST;
+                rc = EEXIST;
         }
 
@@ -79 +81 @@
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering service: %s.", str_error(rc));
-                return EEXIST;
+                rc = EEXIST;
+                goto error;
         }
 
         return EOK;
-}
-
-static void vol_get_parts_srv(ipc_call_t *icall)
+error:
+        vol_parts_destroy(parts);
+        return rc;
+}
+
+static void vol_get_parts_srv(vol_parts_t *parts, ipc_call_t *icall)
 {
         ipc_call_t call;
@@ -105 +111 @@
         }
 
-        rc = vol_part_get_ids(id_buf, size, &act_size);
+        rc = vol_part_get_ids(parts, id_buf, size, &act_size);
         if (rc != EOK) {
                 async_answer_0(&call, rc);
@@ -118 +124 @@
 }
 
-static void vol_part_add_srv(ipc_call_t *icall)
-{
-        service_id_t sid;
-        errno_t rc;
-
-        sid = IPC_GET_ARG1(*icall);
-
-        rc = vol_part_add(sid);
-        if (rc != EOK) {
-                async_answer_0(icall, rc);
-                return;
-        }
-
-        async_answer_0(icall, EOK);
-}
-
-static void vol_part_info_srv(ipc_call_t *icall)
+static void vol_part_add_srv(vol_parts_t *parts, ipc_call_t *icall)
+{
+        service_id_t sid;
+        errno_t rc;
+
+        sid = IPC_GET_ARG1(*icall);
+
+        rc = vol_part_add(parts, sid);
+        if (rc != EOK) {
+                async_answer_0(icall, rc);
+                return;
+        }
+
+        async_answer_0(icall, EOK);
+}
+
+static void vol_part_info_srv(vol_parts_t *parts, ipc_call_t *icall)
 {
         service_id_t sid;
@@ -144 +150 @@
         log_msg(LOG_DEFAULT, LVL_DEBUG, "vol_part_info_srv(%zu)",
             sid);
-        rc = vol_part_find_by_id_ref(sid, &part);
+        rc = vol_part_find_by_id_ref(parts, sid, &part);
         if (rc != EOK) {
                 async_answer_0(icall, ENOENT);
@@ -183 +189 @@
 }
 
-static void vol_part_eject_srv(ipc_call_t *icall)
+static void vol_part_eject_srv(vol_parts_t *parts, ipc_call_t *icall)
 {
         service_id_t sid;
@@ -192 +198 @@
         log_msg(LOG_DEFAULT, LVL_DEBUG, "vol_part_eject_srv(%zu)", sid);
 
-        rc = vol_part_find_by_id_ref(sid, &part);
+        rc = vol_part_find_by_id_ref(parts, sid, &part);
         if (rc != EOK) {
                 async_answer_0(icall, ENOENT);
@@ -209 +215 @@
 }
 
-static void vol_part_empty_srv(ipc_call_t *icall)
+static void vol_part_empty_srv(vol_parts_t *parts, ipc_call_t *icall)
 {
         service_id_t sid;
@@ -218 +224 @@
         log_msg(LOG_DEFAULT, LVL_DEBUG, "vol_part_empty_srv(%zu)", sid);
 
-        rc = vol_part_find_by_id_ref(sid, &part);
+        rc = vol_part_find_by_id_ref(parts, sid, &part);
         if (rc != EOK) {
                 async_answer_0(icall, ENOENT);
@@ -235 +241 @@
 }
 
-static void vol_part_get_lsupp_srv(ipc_call_t *icall)
+static void vol_part_get_lsupp_srv(vol_parts_t *parts, ipc_call_t *icall)
 {
         vol_fstype_t fstype;
@@ -273 +279 @@
 
 
-static void vol_part_mkfs_srv(ipc_call_t *icall)
+static void vol_part_mkfs_srv(vol_parts_t *parts, ipc_call_t *icall)
 {
         service_id_t sid;
@@ -298 +304 @@
         }
 
-        rc = vol_part_find_by_id_ref(sid, &part);
+        rc = vol_part_find_by_id_ref(parts, sid, &part);
         if (rc != EOK) {
                 free(label);
@@ -319 +325 @@
 static void vol_client_conn(ipc_call_t *icall, void *arg)
 {
+        vol_parts_t *parts = (vol_parts_t *) arg;
+
         log_msg(LOG_DEFAULT, LVL_DEBUG, "vol_client_conn()");
 
@@ -337 +345 @@
                 switch (method) {
                 case VOL_GET_PARTS:
-                        vol_get_parts_srv(&call);
+                        vol_get_parts_srv(parts, &call);
                         break;
                 case VOL_PART_ADD:
-                        vol_part_add_srv(&call);
+                        vol_part_add_srv(parts, &call);
                         break;
                 case VOL_PART_INFO:
-                        vol_part_info_srv(&call);
+                        vol_part_info_srv(parts, &call);
                         break;
                 case VOL_PART_EJECT:
-                        vol_part_eject_srv(&call);
+                        vol_part_eject_srv(parts, &call);
                         break;
                 case VOL_PART_EMPTY:
-                        vol_part_empty_srv(&call);
+                        vol_part_empty_srv(parts, &call);
                         break;
                 case VOL_PART_LSUPP:
-                        vol_part_get_lsupp_srv(&call);
+                        vol_part_get_lsupp_srv(parts, &call);
                         break;
                 case VOL_PART_MKFS:
-                        vol_part_mkfs_srv(&call);
+                        vol_part_mkfs_srv(parts, &call);
                         break;
                 default: