Changes in uspace/srv/ns/task.c [a35b458:5a6cc679] in mainline

File:

• uspace/srv/ns/task.c (modified) (16 diffs)

uspace/srv/ns/task.c

@@ -48 +48 @@
 typedef struct {
         ht_link_t link;
-
+        
         task_id_t id;    /**< Task ID. */
         bool finished;   /**< Task is done. */
@@ -115 +115 @@
         sysarg_t in_phone_hash = *(sysarg_t*)key;
         p2i_entry_t *entry = hash_table_get_inst(item, p2i_entry_t, link);
-
+        
         return (in_phone_hash == entry->in_phone_hash);
 }
@@ -157 +157 @@
                 return ENOMEM;
         }
-
+        
         if (!hash_table_create(&phone_to_id, 0, 0, &p2i_ops)) {
                 printf(NAME ": No memory available for tasks\n");
                 return ENOMEM;
         }
-
+        
         list_initialize(&pending_wait);
         return EOK;
@@ -171 +171 @@
 {
         task_exit_t texit;
-
+        
 loop:
         list_foreach(pending_wait, link, pending_wait_t, pr) {
@@ -177 +177 @@
                 if (!link)
                         continue;
-
+                
                 hashed_task_t *ht = hash_table_get_inst(link, hashed_task_t, link);
                 if (!ht->finished)
                         continue;
-
+                
                 texit = ht->have_rval ? TASK_EXIT_NORMAL :
                     TASK_EXIT_UNEXPECTED;
                 async_answer_2(pr->callid, EOK, texit, ht->retval);
-
+                
                 list_remove(&pr->link);
                 free(pr);
@@ -197 +197 @@
         hashed_task_t *ht = (link != NULL) ?
             hash_table_get_inst(link, hashed_task_t, link) : NULL;
-
+        
         if (ht == NULL) {
                 /* No such task exists. */
@@ -203 +203 @@
                 return;
         }
-
+        
         if (ht->finished) {
                 task_exit_t texit = ht->have_rval ? TASK_EXIT_NORMAL :
@@ -210 +210 @@
                 return;
         }
-
+        
         /* Add to pending list */
         pending_wait_t *pr =
@@ -218 +218 @@
                 return;
         }
-
+        
         link_initialize(&pr->link);
         pr->id = id;
@@ -228 +228 @@
 {
         task_id_t id = MERGE_LOUP32(IPC_GET_ARG1(*call), IPC_GET_ARG2(*call));
-
+        
         ht_link_t *link = hash_table_find(&phone_to_id, &call->in_phone_hash);
         if (link != NULL)
                 return EEXIST;
-
+        
         p2i_entry_t *entry = (p2i_entry_t *) malloc(sizeof(p2i_entry_t));
         if (entry == NULL)
                 return ENOMEM;
-
+        
         hashed_task_t *ht = (hashed_task_t *) malloc(sizeof(hashed_task_t));
         if (ht == NULL) {
@@ -242 +242 @@
                 return ENOMEM;
         }
-
+        
         /*
          * Insert into the phone-to-id map.
          */
-
+        
         entry->in_phone_hash = call->in_phone_hash;
         entry->id = id;
         hash_table_insert(&phone_to_id, &entry->link);
-
+        
         /*
          * Insert into the main table.
          */
-
+        
         ht->id = id;
         ht->finished = false;
@@ -260 +260 @@
         ht->retval = -1;
         hash_table_insert(&task_hash_table, &ht->link);
-
+        
         return EOK;
 }
@@ -269 +269 @@
         if (link == NULL)
                 return ENOENT;
-
+        
         p2i_entry_t *entry = hash_table_get_inst(link, p2i_entry_t, link);
         *id = entry->id;
-
+        
         return EOK;
 }
@@ -279 +279 @@
 {
         task_id_t id = call->in_task_id;
-
+        
         ht_link_t *link = hash_table_find(&task_hash_table, &id);
         hashed_task_t *ht = (link != NULL) ?
             hash_table_get_inst(link, hashed_task_t, link) : NULL;
-
+        
         if ((ht == NULL) || (ht->finished))
                 return EINVAL;
-
+        
         ht->finished = true;
         ht->have_rval = true;
         ht->retval = IPC_GET_ARG1(*call);
-
+        
         process_pending_wait();
-
+        
         return EOK;
 }
@@ -302 +302 @@
         if (rc != EOK)
                 return rc;
-
+        
         /* Delete from phone-to-id map. */
         hash_table_remove(&phone_to_id, &call->in_phone_hash);
-
+        
         /* Mark task as finished. */
         ht_link_t *link = hash_table_find(&task_hash_table, &id);
@@ -312 +312 @@
 
         hashed_task_t *ht = hash_table_get_inst(link, hashed_task_t, link);
-
+        
         ht->finished = true;
-
+        
         process_pending_wait();
         hash_table_remove(&task_hash_table, &id);
-
+        
         return EOK;
 }