Changeset 0b749a3 in mainline for uspace/lib/net/adt/module_map.c

Timestamp:

2010-11-22T15:39:53Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

0eddb76, aae339e9

Parents:

9a1d8ab (diff), 8cd1aa5e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge development/ changes

File:

• uspace/lib/net/adt/module_map.c (modified) (4 diffs)

uspace/lib/net/adt/module_map.c

@@ -27 +27 @@
  */
 
-/** @addtogroup net
- *  @{
+/** @addtogroup libnet
+ * @{
  */
 
 /** @file
- *  Character string to module map implementation.
+ * Character string to module map implementation.
  */
 
@@ -38 +38 @@
 #include <task.h>
 #include <unistd.h>
+#include <errno.h>
 
 #include <ipc/services.h>
 
-#include <net_err.h>
-#include <net_modules.h>
+#include <net/modules.h>
 
 #include <adt/generic_char_map.h>
@@ -49 +49 @@
 GENERIC_CHAR_MAP_IMPLEMENT(modules, module_t)
 
-int add_module(module_ref * module, modules_ref modules, const char * name, const char * filename, services_t service, task_id_t task_id, connect_module_t connect_module){
-        ERROR_DECLARE;
+/** Adds module to the module map.
+ *
+ * @param[out] module   The module structure added.
+ * @param[in] modules   The module map.
+ * @param[in] name      The module name.
+ * @param[in] filename  The full path filename.
+ * @param[in] service   The module service.
+ * @param[in] task_id   The module current task identifier. Zero means not
+ *                      running.
+ * @param[in] connect_module The module connecting function.
+ * @return              EOK on success.
+ * @return              ENOMEM if there is not enough memory left.
+ */
+int
+add_module(module_t **module, modules_t *modules, const char *name,
+    const char *filename, services_t service, task_id_t task_id,
+    connect_module_t connect_module)
+{
+        module_t *tmp_module;
+        int rc;
 
-        module_ref tmp_module;
+        tmp_module = (module_t *) malloc(sizeof(module_t));
+        if (!tmp_module)
+                return ENOMEM;
 
-        tmp_module = (module_ref) malloc(sizeof(module_t));
-        if(! tmp_module){
-                return ENOMEM;
-        }
         tmp_module->task_id = task_id;
         tmp_module->phone = 0;
@@ -65 +81 @@
         tmp_module->service = service;
         tmp_module->connect_module = connect_module;
-        if(ERROR_OCCURRED(modules_add(modules, tmp_module->name, 0, tmp_module))){
+
+        rc = modules_add(modules, tmp_module->name, 0, tmp_module);
+        if (rc != EOK) {
                 free(tmp_module);
-                return ERROR_CODE;
+                return rc;
         }
-        if(module){
+        if (module)
                 *module = tmp_module;
-        }
+
         return EOK;
 }
 
-module_ref get_running_module(modules_ref modules, char * name){
-        module_ref module;
+/** Searches and returns the specified module.
+ *
+ * If the module is not running, the module filaname is spawned.
+ * If the module is not connected, the connect_function is called.
+ *
+ * @param[in] modules   The module map.
+ * @param[in] name      The module name.
+ * @return              The running module found. It does not have to be
+ *                      connected.
+ * @return              NULL if there is no such module.
+ */
+module_t *get_running_module(modules_t *modules, char *name)
+{
+        module_t *module;
 
         module = modules_find(modules, name, 0);
-        if(! module){
+        if (!module)
                 return NULL;
+
+        if (!module->task_id) {
+                module->task_id = spawn(module->filename);
+                if (!module->task_id)
+                        return NULL;
         }
-        if(! module->task_id){
-                module->task_id = spawn(module->filename);
-                if(! module->task_id){
-                        return NULL;
-                }
-        }
-        if(! module->phone){
+        if (!module->phone)
                 module->phone = module->connect_module(module->service);
-        }
+
         return module;
 }
 
+/** Starts the given module.
+ *
+ * @param[in] fname     The module full or relative path filename.
+ * @return              The new module task identifier on success.
+ * @return              Zero if there is no such module.
+ */
 task_id_t spawn(const char *fname)
 {
-        const char *argv[2];
-        task_id_t res;
+        task_id_t id;
+        int rc;
         
-        argv[0] = fname;
-        argv[1] = NULL;
-        res = task_spawn(fname, argv, NULL);
+        rc = task_spawnl(&id, fname, fname, NULL);
+        if (rc != EOK)
+                return 0;
         
-        return res;
+        return id;
 }