Changes in uspace/srv/ns/task.c [007e6efa:96b02eb9] in mainline

File:

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

uspace/srv/ns/task.c

@@ -43 +43 @@
 
 #define TASK_HASH_TABLE_CHAINS  256
-#define P2I_HASH_TABLE_CHAINS   256
+#define P2I_HASH_TABLE_CHAINS  256
+
+static int get_id_by_phone(sysarg_t phone_hash, task_id_t *id);
 
 /* TODO:
@@ -55 +57 @@
 typedef struct {
         link_t link;
-        
-        task_id_t id;    /**< Task ID. */
-        bool finished;   /**< Task is done. */
-        bool have_rval;  /**< Task returned a value. */
-        int retval;      /**< The return value. */
+        task_id_t id;   /**< Task ID. */
+        bool finished;  /**< Task is done. */
+        bool have_rval; /**< Task returned a value. */
+        int retval;     /**< The return value. */
 } hashed_task_t;
 
@@ -70 +71 @@
  *
  */
-static hash_index_t task_hash(unsigned long key[])
+static hash_index_t task_hash(unsigned long *key)
 {
         assert(key);
-        return (LOWER32(key[0]) % TASK_HASH_TABLE_CHAINS);
+        return (LOWER32(*key) % TASK_HASH_TABLE_CHAINS);
 }
 
@@ -123 +124 @@
 typedef struct {
         link_t link;
-        sysarg_t in_phone_hash;  /**< Incoming phone hash. */
-        task_id_t id;            /**< Task ID. */
+        sysarg_t phash;    /**< Task ID. */
+        task_id_t id;    /**< Task ID. */
 } p2i_entry_t;
 
@@ -130 +131 @@
  *
  * @param key Array of keys.
- *
  * @return Hash index corresponding to key[0].
  *
  */
-static hash_index_t p2i_hash(unsigned long key[])
+static hash_index_t p2i_hash(unsigned long *key)
 {
         assert(key);
-        return (key[0] % TASK_HASH_TABLE_CHAINS);
+        return (*key % TASK_HASH_TABLE_CHAINS);
 }
 
@@ -154 +154 @@
         assert(keys == 1);
         assert(item);
-        
-        p2i_entry_t *entry = hash_table_get_instance(item, p2i_entry_t, link);
-        
-        return (key[0] == entry->in_phone_hash);
+
+        p2i_entry_t *e = hash_table_get_instance(item, p2i_entry_t, link);
+
+        return (key[0] == e->phash);
 }
 
@@ -197 +197 @@
                 return ENOMEM;
         }
-        
+
         if (!hash_table_create(&phone_to_id, P2I_HASH_TABLE_CHAINS,
             1, &p2i_ops)) {
@@ -205 +205 @@
         
         list_initialize(&pending_wait);
+        
         return EOK;
 }
@@ -237 +238 @@
                             ht->retval);
                 }
-                
+
                 hash_table_remove(&task_hash_table, keys, 2);
                 list_remove(cur);
@@ -249 +250 @@
         sysarg_t retval;
         task_exit_t texit;
-        
+
         unsigned long keys[2] = {
                 LOWER32(id),
                 UPPER32(id)
         };
-        
+
         link_t *link = hash_table_find(&task_hash_table, keys);
         hashed_task_t *ht = (link != NULL) ?
             hash_table_get_instance(link, hashed_task_t, link) : NULL;
-        
+
         if (ht == NULL) {
                 /* No such task exists. */
@@ -264 +265 @@
                 return;
         }
-        
+
         if (!ht->finished) {
                 /* Add to pending list */
@@ -274 +275 @@
                 }
                 
-                link_initialize(&pr->link);
                 pr->id = id;
                 pr->callid = callid;
@@ -293 +293 @@
 int ns_task_id_intro(ipc_call_t *call)
 {
+        task_id_t id;
         unsigned long keys[2];
-        
-        task_id_t id = MERGE_LOUP32(IPC_GET_ARG1(*call), IPC_GET_ARG2(*call));
+        link_t *link;
+        p2i_entry_t *e;
+        hashed_task_t *ht;
+
+        id = MERGE_LOUP32(IPC_GET_ARG1(*call), IPC_GET_ARG2(*call));
+
         keys[0] = call->in_phone_hash;
-        
-        link_t *link = hash_table_find(&phone_to_id, keys);
+
+        link = hash_table_find(&phone_to_id, keys);
         if (link != NULL)
                 return EEXISTS;
-        
-        p2i_entry_t *entry = (p2i_entry_t *) malloc(sizeof(p2i_entry_t));
-        if (entry == NULL)
+
+        e = (p2i_entry_t *) malloc(sizeof(p2i_entry_t));
+        if (e == NULL)
                 return ENOMEM;
-        
-        hashed_task_t *ht = (hashed_task_t *) malloc(sizeof(hashed_task_t));
+
+        ht = (hashed_task_t *) malloc(sizeof(hashed_task_t));
         if (ht == NULL)
                 return ENOMEM;
-        
-        /*
-         * Insert into the phone-to-id map.
-         */
-        
-        link_initialize(&entry->link);
-        entry->in_phone_hash = call->in_phone_hash;
-        entry->id = id;
-        hash_table_insert(&phone_to_id, keys, &entry->link);
-        
-        /*
-         * Insert into the main table.
-         */
-        
+
+        /* Insert to phone-to-id map. */
+
+        link_initialize(&e->link);
+        e->phash = call->in_phone_hash;
+        e->id = id;
+        hash_table_insert(&phone_to_id, keys, &e->link);
+
+        /* Insert to main table. */
+
         keys[0] = LOWER32(id);
         keys[1] = UPPER32(id);
-        
+
         link_initialize(&ht->link);
         ht->id = id;
@@ -332 +333 @@
         ht->retval = -1;
         hash_table_insert(&task_hash_table, keys, &ht->link);
-        
+
         return EOK;
 }
 
-static int get_id_by_phone(sysarg_t phone_hash, task_id_t *id)
-{
-        unsigned long keys[1] = {phone_hash};
-        
-        link_t *link = hash_table_find(&phone_to_id, keys);
-        if (link == NULL)
-                return ENOENT;
-        
-        p2i_entry_t *entry = hash_table_get_instance(link, p2i_entry_t, link);
-        *id = entry->id;
-        
-        return EOK;
-}
-
 int ns_task_retval(ipc_call_t *call)
 {
         task_id_t id;
-        int rc = get_id_by_phone(call->in_phone_hash, &id);
+        unsigned long keys[2];
+        int rc;
+
+        rc = get_id_by_phone(call->in_phone_hash, &id);
         if (rc != EOK)
                 return rc;
-        
-        unsigned long keys[2] = {
-                LOWER32(id),
-                UPPER32(id)
-        };
+
+        keys[0] = LOWER32(id);
+        keys[1] = UPPER32(id);
         
         link_t *link = hash_table_find(&task_hash_table, keys);
@@ -366 +354 @@
             hash_table_get_instance(link, hashed_task_t, link) : NULL;
         
-        if ((ht == NULL) || (ht->finished))
+        if ((ht == NULL) || ht->finished)
                 return EINVAL;
-        
+
         ht->finished = true;
         ht->have_rval = true;
         ht->retval = IPC_GET_ARG1(*call);
-        
+
         return EOK;
 }
@@ -379 +367 @@
 {
         unsigned long keys[2];
-        
         task_id_t id;
-        int rc = get_id_by_phone(call->in_phone_hash, &id);
+        int rc;
+
+        rc = get_id_by_phone(call->in_phone_hash, &id);
         if (rc != EOK)
                 return rc;
-        
+
         /* Delete from phone-to-id map. */
         keys[0] = call->in_phone_hash;
         hash_table_remove(&phone_to_id, keys, 1);
-        
+
         /* Mark task as finished. */
         keys[0] = LOWER32(id);
         keys[1] = UPPER32(id);
-        
+
         link_t *link = hash_table_find(&task_hash_table, keys);
         hashed_task_t *ht =
@@ -398 +387 @@
         if (ht == NULL)
                 return EOK;
-        
+
         ht->finished = true;
-        
+
+        return EOK;
+}
+
+static int get_id_by_phone(sysarg_t phone_hash, task_id_t *id)
+{
+        unsigned long keys[1];
+        link_t *link;
+        p2i_entry_t *e;
+
+        keys[0] = phone_hash;
+        link = hash_table_find(&phone_to_id, keys);
+        if (link == NULL)
+                return ENOENT;
+
+        e = hash_table_get_instance(link, p2i_entry_t, link);
+        *id = e->id;
+
         return EOK;
 }