Changeset 08bc23d in mainline

Timestamp:

2013-09-10T20:26:27Z (11 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d80d7a8

Parents:

07525cd (diff), a60e90b (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 breaking devman.c apart.

Location:

uspace/srv/devman

Files:

• Makefile (modified) (1 diff)
• dev.c (added)
• dev.h (added)
• devman.c (deleted)
• devman.h (modified) (3 diffs)
• devtree.c (added)
• devtree.h (added)
• driver.c (added)
• driver.h (added)
• fun.c (added)
• fun.h (added)
• loc.c (added)
• loc.h (added)
• main.c (modified) (1 diff)
• match.c (modified) (2 diffs)
• match.h (added)

uspace/srv/devman/Makefile

@@ -33 +33 @@
 
 SOURCES = \
+        dev.c \
+        devtree.c \
+        driver.c \
+        loc.c \
+        fun.c \
         main.c \
-        devman.c \
         match.c \
         util.c

uspace/srv/devman/devman.h

@@ -35 +35 @@
 #define DEVMAN_H_
 
-#include <assert.h>
 #include <stdbool.h>
-#include <dirent.h>
-#include <str.h>
 #include <adt/list.h>
 #include <adt/hash_table.h>
@@ -50 +47 @@
 
 #define NAME "devman"
-
-#define MATCH_EXT ".ma"
 
 #define LOC_DEVICE_NAMESPACE "devices"
@@ -238 +233 @@
 } dev_tree_t;
 
-/* Match ids and scores */
-
-extern int get_match_score(driver_t *, dev_node_t *);
-
-extern bool parse_match_ids(char *, match_id_list_t *);
-extern bool read_match_ids(const char *, match_id_list_t *);
-extern char *read_match_id(char **);
-extern char *read_id(const char **);
-
-/* Drivers */
-
-extern void init_driver_list(driver_list_t *);
-extern driver_t *create_driver(void);
-extern bool get_driver_info(const char *, const char *, driver_t *);
-extern int lookup_available_drivers(driver_list_t *, const char *);
-
-extern driver_t *find_best_match_driver(driver_list_t *, dev_node_t *);
-extern bool assign_driver(dev_node_t *, driver_list_t *, dev_tree_t *);
-
-extern void add_driver(driver_list_t *, driver_t *);
-extern void attach_driver(dev_tree_t *, dev_node_t *, driver_t *);
-extern void detach_driver(dev_tree_t *, dev_node_t *);
-extern void add_device(driver_t *, dev_node_t *, dev_tree_t *);
-extern bool start_driver(driver_t *);
-extern int driver_dev_remove(dev_tree_t *, dev_node_t *);
-extern int driver_dev_gone(dev_tree_t *, dev_node_t *);
-extern int driver_fun_online(dev_tree_t *, fun_node_t *);
-extern int driver_fun_offline(dev_tree_t *, fun_node_t *);
-
-extern driver_t *find_driver(driver_list_t *, const char *);
-extern void initialize_running_driver(driver_t *, dev_tree_t *);
-
-extern void init_driver(driver_t *);
-extern void clean_driver(driver_t *);
-extern void delete_driver(driver_t *);
-
-/* Device nodes */
-
-extern dev_node_t *create_dev_node(void);
-extern void delete_dev_node(dev_node_t *node);
-extern void dev_add_ref(dev_node_t *);
-extern void dev_del_ref(dev_node_t *);
-
-extern dev_node_t *find_dev_node_no_lock(dev_tree_t *tree,
-    devman_handle_t handle);
-extern dev_node_t *find_dev_node(dev_tree_t *tree, devman_handle_t handle);
-extern dev_node_t *find_dev_function(dev_node_t *, const char *);
-extern int dev_get_functions(dev_tree_t *tree, dev_node_t *, devman_handle_t *,
-    size_t, size_t *);
-
-extern fun_node_t *create_fun_node(void);
-extern void delete_fun_node(fun_node_t *);
-extern void fun_add_ref(fun_node_t *);
-extern void fun_del_ref(fun_node_t *);
-extern void fun_busy_lock(fun_node_t *);
-extern void fun_busy_unlock(fun_node_t *);
-extern fun_node_t *find_fun_node_no_lock(dev_tree_t *tree,
-    devman_handle_t handle);
-extern fun_node_t *find_fun_node(dev_tree_t *tree, devman_handle_t handle);
-extern fun_node_t *find_fun_node_by_path(dev_tree_t *, char *);
-extern fun_node_t *find_fun_node_in_device(dev_tree_t *tree, dev_node_t *,
-    const char *);
-
-/* Device tree */
-
-extern bool init_device_tree(dev_tree_t *, driver_list_t *);
-extern bool create_root_nodes(dev_tree_t *);
-extern bool insert_dev_node(dev_tree_t *, dev_node_t *, fun_node_t *);
-extern void remove_dev_node(dev_tree_t *, dev_node_t *);
-extern bool insert_fun_node(dev_tree_t *, fun_node_t *, char *, dev_node_t *);
-extern void remove_fun_node(dev_tree_t *, fun_node_t *);
-
-/* Loc services */
-
-extern void loc_register_tree_function(fun_node_t *, dev_tree_t *);
-
-extern fun_node_t *find_loc_tree_function(dev_tree_t *, service_id_t);
-
-extern void tree_add_loc_function(dev_tree_t *, fun_node_t *);
-
 #endif
 

uspace/srv/devman/main.c

@@ -58 +58 @@
 #include <loc.h>
 
+#include "dev.h"
 #include "devman.h"
+#include "devtree.h"
+#include "driver.h"
+#include "fun.h"
+#include "loc.h"
 
 #define DRIVER_DEFAULT_STORE  "/drv"

uspace/srv/devman/match.c

@@ -31 +31 @@
  */
 
+#include <fcntl.h>
+#include <io/log.h>
 #include <str.h>
+#include <str_error.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 
 #include "devman.h"
+#include "match.h"
 
 /** Compute compound score of driver and device.
@@ -93 +99 @@
 }
 
+/** Read match id at the specified position of a string and set the position in
+ * the string to the first character following the id.
+ *
+ * @param buf           The position in the input string.
+ * @return              The match id.
+ */
+char *read_match_id(char **buf)
+{
+        char *res = NULL;
+        size_t len = get_nonspace_len(*buf);
+        
+        if (len > 0) {
+                res = malloc(len + 1);
+                if (res != NULL) {
+                        str_ncpy(res, len + 1, *buf, len);
+                        *buf += len;
+                }
+        }
+        
+        return res;
+}
+
+/**
+ * Read match ids and associated match scores from a string.
+ *
+ * Each match score in the string is followed by its match id.
+ * The match ids and match scores are separated by whitespaces.
+ * Neither match ids nor match scores can contain whitespaces.
+ *
+ * @param buf           The string from which the match ids are read.
+ * @param ids           The list of match ids into which the match ids and
+ *                      scores are added.
+ * @return              True if at least one match id and associated match score
+ *                      was successfully read, false otherwise.
+ */
+bool parse_match_ids(char *buf, match_id_list_t *ids)
+{
+        int score = 0;
+        char *id = NULL;
+        int ids_read = 0;
+        
+        while (true) {
+                /* skip spaces */
+                if (!skip_spaces(&buf))
+                        break;
+                
+                /* read score */
+                score = strtoul(buf, &buf, 10);
+                
+                /* skip spaces */
+                if (!skip_spaces(&buf))
+                        break;
+                
+                /* read id */
+                id = read_match_id(&buf);
+                if (NULL == id)
+                        break;
+                
+                /* create new match_id structure */
+                match_id_t *mid = create_match_id();
+                mid->id = id;
+                mid->score = score;
+                
+                /* add it to the list */
+                add_match_id(ids, mid);
+                
+                ids_read++;
+        }
+        
+        return ids_read > 0;
+}
+
+/**
+ * Read match ids and associated match scores from a file.
+ *
+ * Each match score in the file is followed by its match id.
+ * The match ids and match scores are separated by whitespaces.
+ * Neither match ids nor match scores can contain whitespaces.
+ *
+ * @param buf           The path to the file from which the match ids are read.
+ * @param ids           The list of match ids into which the match ids and
+ *                      scores are added.
+ * @return              True if at least one match id and associated match score
+ *                      was successfully read, false otherwise.
+ */
+bool read_match_ids(const char *conf_path, match_id_list_t *ids)
+{
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "read_match_ids(conf_path=\"%s\")", conf_path);
+        
+        bool suc = false;
+        char *buf = NULL;
+        bool opened = false;
+        int fd;
+        size_t len = 0;
+        
+        fd = open(conf_path, O_RDONLY);
+        if (fd < 0) {
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Unable to open `%s' for reading: %s.",
+                    conf_path, str_error(fd));
+                goto cleanup;
+        }
+        opened = true;
+        
+        len = lseek(fd, 0, SEEK_END);
+        lseek(fd, 0, SEEK_SET);
+        if (len == 0) {
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Configuration file '%s' is empty.",
+                    conf_path);
+                goto cleanup;
+        }
+        
+        buf = malloc(len + 1);
+        if (buf == NULL) {
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Memory allocation failed when parsing file "
+                    "'%s'.", conf_path);
+                goto cleanup;
+        }
+        
+        ssize_t read_bytes = read_all(fd, buf, len);
+        if (read_bytes <= 0) {
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Unable to read file '%s' (%zd).", conf_path,
+                    read_bytes);
+                goto cleanup;
+        }
+        buf[read_bytes] = 0;
+        
+        suc = parse_match_ids(buf, ids);
+        
+cleanup:
+        free(buf);
+        
+        if (opened)
+                close(fd);
+        
+        return suc;
+}
+
 /** @}
  */