Changes in uspace/lib/c/generic/bd_srv.c [135486d:4802dd7] in mainline

File:

• uspace/lib/c/generic/bd_srv.c (modified) (10 diffs)

uspace/lib/c/generic/bd_srv.c

@@ -67 +67 @@
         }
 
-        if (srv->srvs->ops->read_blocks == NULL) {
+        if (srv->ops->read_blocks == NULL) {
                 async_answer_0(rcallid, ENOTSUP);
                 async_answer_0(callid, ENOTSUP);
@@ -73 +73 @@
         }
 
-        rc = srv->srvs->ops->read_blocks(srv, ba, cnt, buf, size);
+        rc = srv->ops->read_blocks(srv, ba, cnt, buf, size);
         if (rc != EOK) {
                 async_answer_0(rcallid, ENOMEM);
@@ -109 +109 @@
         }
 
-        if (srv->srvs->ops->read_toc == NULL) {
+        if (srv->ops->read_toc == NULL) {
                 async_answer_0(rcallid, ENOTSUP);
                 async_answer_0(callid, ENOTSUP);
@@ -115 +115 @@
         }
 
-        rc = srv->srvs->ops->read_toc(srv, session, buf, size);
+        rc = srv->ops->read_toc(srv, session, buf, size);
         if (rc != EOK) {
                 async_answer_0(rcallid, ENOMEM);
@@ -146 +146 @@
         }
 
-        if (srv->srvs->ops->write_blocks == NULL) {
-                async_answer_0(callid, ENOTSUP);
-                return;
-        }
-
-        rc = srv->srvs->ops->write_blocks(srv, ba, cnt, data, size);
+        if (srv->ops->write_blocks == NULL) {
+                async_answer_0(callid, ENOTSUP);
+                return;
+        }
+
+        rc = srv->ops->write_blocks(srv, ba, cnt, data, size);
         free(data);
         async_answer_0(callid, rc);
@@ -162 +162 @@
         size_t block_size;
 
-        if (srv->srvs->ops->get_block_size == NULL) {
-                async_answer_0(callid, ENOTSUP);
-                return;
-        }
-
-        rc = srv->srvs->ops->get_block_size(srv, &block_size);
+        if (srv->ops->get_block_size == NULL) {
+                async_answer_0(callid, ENOTSUP);
+                return;
+        }
+
+        rc = srv->ops->get_block_size(srv, &block_size);
         async_answer_1(callid, rc, block_size);
 }
@@ -177 +177 @@
         aoff64_t num_blocks;
 
-        if (srv->srvs->ops->get_num_blocks == NULL) {
-                async_answer_0(callid, ENOTSUP);
-                return;
-        }
-
-        rc = srv->srvs->ops->get_num_blocks(srv, &num_blocks);
+        if (srv->ops->get_num_blocks == NULL) {
+                async_answer_0(callid, ENOTSUP);
+                return;
+        }
+
+        rc = srv->ops->get_num_blocks(srv, &num_blocks);
         async_answer_2(callid, rc, LOWER32(num_blocks), UPPER32(num_blocks));
 }
 
-static bd_srv_t *bd_srv_create(bd_srvs_t *srvs)
-{
-        bd_srv_t *srv;
-
-        srv = calloc(1, sizeof(srv));
-        if (srv == NULL)
-                return NULL;
-
-        srv->srvs = srvs;
-        return srv;
-}
-
-void bd_srvs_init(bd_srvs_t *srvs)
-{
-        srvs->ops = NULL;
-        srvs->sarg = NULL;
-}
-
-int bd_conn(ipc_callid_t iid, ipc_call_t *icall, bd_srvs_t *srvs)
-{
-        bd_srv_t *srv;
-        int rc;
+void bd_srv_init(bd_srv_t *srv)
+{
+        fibril_mutex_initialize(&srv->lock);
+        srv->connected = false;
+        srv->ops = NULL;
+        srv->arg = NULL;
+        srv->client_sess = NULL;
+}
+
+int bd_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+{
+        bd_srv_t *srv = (bd_srv_t *)arg;
+        int rc;
+
+        fibril_mutex_lock(&srv->lock);
+        if (srv->connected) {
+                fibril_mutex_unlock(&srv->lock);
+                async_answer_0(iid, EBUSY);
+                return EBUSY;
+        }
+
+        srv->connected = true;
+        fibril_mutex_unlock(&srv->lock);
 
         /* Accept the connection */
         async_answer_0(iid, EOK);
-
-        srv = bd_srv_create(srvs);
-        if (srv == NULL)
-                return ENOMEM;
 
         async_sess_t *sess = async_callback_receive(EXCHANGE_SERIALIZE);
@@ -222 +219 @@
         srv->client_sess = sess;
 
-        rc = srvs->ops->open(srvs, srv);
+        rc = srv->ops->open(srv);
         if (rc != EOK)
                 return rc;
@@ -233 +230 @@
                 if (!method) {
                         /* The other side has hung up */
+                        fibril_mutex_lock(&srv->lock);
+                        srv->connected = false;
+                        fibril_mutex_unlock(&srv->lock);
                         async_answer_0(callid, EOK);
                         break;
@@ -258 +258 @@
         }
 
-        rc = srvs->ops->close(srv);
-        free(srv);
-
-        return rc;
+        return srv->ops->close(srv);
 }