Changeset 7c2bb2c in mainline for uspace/srv/hid/remcons/remcons.c

Timestamp:

2012-01-10T14:59:39Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

1870d81

Parents:

3806317

Message:

remcons: spawn task in separate fibril

File:

• uspace/srv/hid/remcons/remcons.c (modified) (4 diffs)

uspace/srv/hid/remcons/remcons.c

@@ -336 +336 @@
 }
 
-
-static int network_client_fibril(void *arg)
-{
+static int spawn_task_fibril(void *arg)
+{
+        client_t *client = arg;
         int rc;
-        client_t *client = arg;
-
-        rc = loc_service_register(client->service_name, &client->service_id);
-        if (rc != EOK) {
-                fprintf(stderr, "%s: Unable to register device %s\n", NAME,
-                    client->service_name);
-                return EOK;
-        }
-        printf("Service %s registered as %" PRIun "\n", client->service_name,
-            client->service_id);
 
         char term[LOC_NAME_MAXLEN];
@@ -359 +349 @@
                 printf("%s: Error spawning %s -w %s %s (%s)\n", NAME,
                     APP_GETTERM, term, "/app/bdsh", str_error(rc));
+                fibril_mutex_lock(&client->refcount_mutex);
+                client->refcount--;
+                fibril_condvar_signal(&client->refcount_cv);
+                fibril_mutex_unlock(&client->refcount_mutex);
                 return EOK;
         }
-        fibril_mutex_lock(&client->refcount_mutex);
-        client->refcount++;
-        fibril_mutex_unlock(&client->refcount_mutex);
 
         task_exit_t task_exit;
@@ -370 +361 @@
         printf("%s: getterm terminated: %d, %d\n", NAME, task_exit, task_retval);
 
+        /* Announce destruction. */
+        fibril_mutex_lock(&client->refcount_mutex);
+        client->refcount--;
+        fibril_condvar_signal(&client->refcount_cv);
+        fibril_mutex_unlock(&client->refcount_mutex);
+
+        return EOK;
+}
+
+
+static int network_client_fibril(void *arg)
+{
+        int rc;
+        client_t *client = arg;
+
+        rc = loc_service_register(client->service_name, &client->service_id);
+        if (rc != EOK) {
+                fprintf(stderr, "%s: Unable to register device %s\n", NAME,
+                    client->service_name);
+                return EOK;
+        }
+        printf("Service %s registered as %" PRIun "\n", client->service_name,
+            client->service_id);
+
+        fibril_mutex_lock(&client->refcount_mutex);
+        client->refcount++;
+        fibril_mutex_unlock(&client->refcount_mutex);
+
+        fid_t spawn_fibril = fibril_create(spawn_task_fibril, client);
+        assert(spawn_fibril);
+        fibril_add_ready(spawn_fibril);
+
+        /* Wait for all clients to exit. */
+        fibril_mutex_lock(&client->refcount_mutex);
+        while (client->refcount > 0) {
+                fibril_condvar_wait(&client->refcount_cv, &client->refcount_mutex);
+        }
+        fibril_mutex_unlock(&client->refcount_mutex);
+
         closesocket(client->socket);
         rc = loc_service_unregister(client->service_id);
@@ -376 +406 @@
         }
 
-        /* Wait for all clients to exit. */
-        fibril_mutex_lock(&client->refcount_mutex);
-        /* Drop our reference. */
-        client->refcount--;
-        while (client->refcount > 0) {
-                fibril_condvar_wait(&client->refcount_cv, &client->refcount_mutex);
-        }
-        fibril_mutex_unlock(&client->refcount_mutex);
-
+        printf("Destroying service %s.\n", client->service_name);
         client_destroy(client);