Changes in uspace/srv/devman/devman.c [8b1e15ac:ebcb05a] in mainline
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/srv/devman/devman.c
r8b1e15ac rebcb05a 34 34 #include <fcntl.h> 35 35 #include <sys/stat.h> 36 #include <io/log.h> 36 37 #include <ipc/driver.h> 37 38 #include <ipc/devman.h> … … 146 147 fibril_mutex_unlock(&drivers_list->drivers_mutex); 147 148 148 printf(NAME": the '%s' driverwas added to the list of available "149 "drivers. \n", drv->name);149 log_msg(LVL_NOTE, "Driver `%s' was added to the list of available " 150 "drivers.", drv->name); 150 151 } 151 152 … … 237 238 bool read_match_ids(const char *conf_path, match_id_list_t *ids) 238 239 { 239 printf(NAME ": read_match_ids conf_path = %s.\n", conf_path);240 log_msg(LVL_DEBUG, "read_match_ids(conf_path=\"%s\")", conf_path); 240 241 241 242 bool suc = false; … … 247 248 fd = open(conf_path, O_RDONLY); 248 249 if (fd < 0) { 249 printf(NAME ": unable to open %s\n", conf_path); 250 log_msg(LVL_ERROR, "Unable to open `%s' for reading: %s.", 251 conf_path, str_error(fd)); 250 252 goto cleanup; 251 253 } … … 255 257 lseek(fd, 0, SEEK_SET); 256 258 if (len == 0) { 257 printf(NAME ": configuration file '%s' is empty.\n", conf_path); 259 log_msg(LVL_ERROR, "Configuration file '%s' is empty.", 260 conf_path); 258 261 goto cleanup; 259 262 } … … 261 264 buf = malloc(len + 1); 262 265 if (buf == NULL) { 263 printf(NAME ": memory allocation failed when parsing file "264 "'%s'. \n", conf_path);266 log_msg(LVL_ERROR, "Memory allocation failed when parsing file " 267 "'%s'.", conf_path); 265 268 goto cleanup; 266 269 } 267 270 268 if (read(fd, buf, len) <= 0) { 269 printf(NAME ": unable to read file '%s'.\n", conf_path); 271 ssize_t read_bytes = safe_read(fd, buf, len); 272 if (read_bytes <= 0) { 273 log_msg(LVL_ERROR, "Unable to read file '%s'.", conf_path); 270 274 goto cleanup; 271 275 } 272 buf[ len] = 0;276 buf[read_bytes] = 0; 273 277 274 278 suc = parse_match_ids(buf, ids); … … 305 309 bool get_driver_info(const char *base_path, const char *name, driver_t *drv) 306 310 { 307 printf(NAME ": get_driver_info base_path = %s, name = %s.\n",311 log_msg(LVL_DEBUG, "get_driver_info(base_path=\"%s\", name=\"%s\")", 308 312 base_path, name); 309 313 … … 337 341 struct stat s; 338 342 if (stat(drv->binary_path, &s) == ENOENT) { /* FIXME!! */ 339 printf(NAME ": driver not found at path %s.", drv->binary_path); 343 log_msg(LVL_ERROR, "Driver not found at path `%s'.", 344 drv->binary_path); 340 345 goto cleanup; 341 346 } … … 364 369 int lookup_available_drivers(driver_list_t *drivers_list, const char *dir_path) 365 370 { 366 printf(NAME ": lookup_available_drivers, dir = %s \n", dir_path);371 log_msg(LVL_DEBUG, "lookup_available_drivers(dir=\"%s\")", dir_path); 367 372 368 373 int drv_cnt = 0; … … 398 403 dev_node_t *dev; 399 404 400 printf(NAME ": create_root_nodes\n");405 log_msg(LVL_DEBUG, "create_root_nodes()"); 401 406 402 407 fibril_rwlock_write_lock(&tree->rwlock); … … 483 488 void attach_driver(dev_node_t *dev, driver_t *drv) 484 489 { 485 printf(NAME ": attach_driver %s to device %s\n",486 d rv->name, dev->pfun->pathname);490 log_msg(LVL_DEBUG, "attach_driver(dev=\"%s\",drv=\"%s\")", 491 dev->pfun->pathname, drv->name); 487 492 488 493 fibril_mutex_lock(&drv->driver_mutex); … … 506 511 assert(fibril_mutex_is_locked(&drv->driver_mutex)); 507 512 508 printf(NAME ": start_driver '%s'\n", drv->name);513 log_msg(LVL_DEBUG, "start_driver(drv=\"%s\")", drv->name); 509 514 510 515 rc = task_spawnl(NULL, drv->binary_path, drv->binary_path, NULL); 511 516 if (rc != EOK) { 512 printf(NAME ": error spawning %s (%s)\n",513 drv->name, str_error(rc));517 log_msg(LVL_ERROR, "Spawning driver `%s' (%s) failed: %s.", 518 drv->name, drv->binary_path, str_error(rc)); 514 519 return false; 515 520 } … … 573 578 int phone; 574 579 575 printf(NAME ": pass_devices_to_driver(`%s')\n", driver->name); 580 log_msg(LVL_DEBUG, "pass_devices_to_driver(driver=\"%s\")", 581 driver->name); 576 582 577 583 fibril_mutex_lock(&driver->driver_mutex); … … 640 646 * immediately and possibly started here as well. 641 647 */ 642 printf(NAME ": driver %s goes into running state.\n", driver->name);648 log_msg(LVL_DEBUG, "Driver `%s' enters running state.", driver->name); 643 649 driver->state = DRIVER_RUNNING; 644 650 … … 657 663 void initialize_running_driver(driver_t *driver, dev_tree_t *tree) 658 664 { 659 printf(NAME ": initialize_running_driver (`%s')\n", driver->name); 665 log_msg(LVL_DEBUG, "initialize_running_driver(driver=\"%s\")", 666 driver->name); 660 667 661 668 /* … … 747 754 * access any structures that would affect driver_t. 748 755 */ 749 printf(NAME ": add_device (driver `%s', device `%s')\n", drv->name,750 d ev->pfun->name);756 log_msg(LVL_DEBUG, "add_device(drv=\"%s\", dev=\"%s\")", 757 drv->name, dev->pfun->name); 751 758 752 759 sysarg_t rc; … … 809 816 driver_t *drv = find_best_match_driver(drivers_list, dev); 810 817 if (drv == NULL) { 811 printf(NAME ": no driver found for device '%s'.\n",818 log_msg(LVL_ERROR, "No driver found for device `%s'.", 812 819 dev->pfun->pathname); 813 820 return false; … … 847 854 bool init_device_tree(dev_tree_t *tree, driver_list_t *drivers_list) 848 855 { 849 printf(NAME ": init_device_tree.\n");856 log_msg(LVL_DEBUG, "init_device_tree()"); 850 857 851 858 tree->current_handle = 0; … … 1026 1033 fun->pathname = (char *) malloc(pathsize); 1027 1034 if (fun->pathname == NULL) { 1028 printf(NAME ": failed to allocate device path.\n");1035 log_msg(LVL_ERROR, "Failed to allocate device path."); 1029 1036 return false; 1030 1037 } … … 1057 1064 assert(fibril_rwlock_is_write_locked(&tree->rwlock)); 1058 1065 1066 log_msg(LVL_DEBUG, "insert_dev_node(dev=%p, pfun=%p [\"%s\"])", 1067 dev, pfun, pfun->pathname); 1068 1059 1069 /* Add the node to the handle-to-node map. */ 1060 1070 dev->handle = ++tree->current_handle; … … 1063 1073 1064 1074 /* Add the node to the list of its parent's children. */ 1065 printf("insert_dev_node: dev=%p, dev->pfun := %p\n", dev, pfun);1066 1075 dev->pfun = pfun; 1067 1076 pfun->child = dev; … … 1123 1132 fun_node_t *find_fun_node_by_path(dev_tree_t *tree, char *path) 1124 1133 { 1134 assert(path != NULL); 1135 1136 bool is_absolute = path[0] == '/'; 1137 if (!is_absolute) { 1138 return NULL; 1139 } 1140 1125 1141 fibril_rwlock_read_lock(&tree->rwlock); 1126 1142 … … 1132 1148 char *rel_path = path; 1133 1149 char *next_path_elem = NULL; 1134 bool cont = (rel_path[0] == '/');1150 bool cont = true; 1135 1151 1136 1152 while (cont && fun != NULL) { … … 1157 1173 } 1158 1174 1175 /** Find function with a specified name belonging to given device. 1176 * 1177 * Device tree rwlock should be held at least for reading. 1178 * 1179 * @param dev Device the function belongs to. 1180 * @param name Function name (not path). 1181 * @return Function node. 1182 * @retval NULL No function with given name. 1183 */ 1184 fun_node_t *find_fun_node_in_device(dev_node_t *dev, const char *name) 1185 { 1186 assert(dev != NULL); 1187 assert(name != NULL); 1188 1189 fun_node_t *fun; 1190 link_t *link; 1191 1192 for (link = dev->functions.next; 1193 link != &dev->functions; 1194 link = link->next) { 1195 fun = list_get_instance(link, fun_node_t, dev_functions); 1196 1197 if (str_cmp(name, fun->name) == 0) 1198 return fun; 1199 } 1200 1201 return NULL; 1202 } 1203 1204 /** Find function node by its class name and index. */ 1205 fun_node_t *find_fun_node_by_class(class_list_t *class_list, 1206 const char *class_name, const char *dev_name) 1207 { 1208 assert(class_list != NULL); 1209 assert(class_name != NULL); 1210 assert(dev_name != NULL); 1211 1212 fibril_rwlock_read_lock(&class_list->rwlock); 1213 1214 dev_class_t *cl = find_dev_class_no_lock(class_list, class_name); 1215 if (cl == NULL) { 1216 fibril_rwlock_read_unlock(&class_list->rwlock); 1217 return NULL; 1218 } 1219 1220 dev_class_info_t *dev = find_dev_in_class(cl, dev_name); 1221 if (dev == NULL) { 1222 fibril_rwlock_read_unlock(&class_list->rwlock); 1223 return NULL; 1224 } 1225 1226 fun_node_t *fun = dev->fun; 1227 1228 fibril_rwlock_read_unlock(&class_list->rwlock); 1229 1230 return fun; 1231 } 1232 1233 1159 1234 /** Find child function node with a specified name. 1160 1235 * … … 1167 1242 fun_node_t *find_node_child(fun_node_t *pfun, const char *name) 1168 1243 { 1169 fun_node_t *fun; 1170 link_t *link; 1171 1172 link = pfun->child->functions.next; 1173 1174 while (link != &pfun->child->functions) { 1175 fun = list_get_instance(link, fun_node_t, dev_functions); 1176 1177 if (str_cmp(name, fun->name) == 0) 1178 return fun; 1179 1180 link = link->next; 1181 } 1182 1183 return NULL; 1244 return find_fun_node_in_device(pfun->child, name); 1184 1245 } 1185 1246 … … 1215 1276 if (info != NULL) { 1216 1277 memset(info, 0, sizeof(dev_class_info_t)); 1217 li st_initialize(&info->dev_classes);1218 li st_initialize(&info->devmap_link);1219 li st_initialize(&info->link);1278 link_initialize(&info->dev_classes); 1279 link_initialize(&info->devmap_link); 1280 link_initialize(&info->link); 1220 1281 } 1221 1282 … … 1343 1404 } 1344 1405 1406 dev_class_info_t *find_dev_in_class(dev_class_t *dev_class, const char *dev_name) 1407 { 1408 assert(dev_class != NULL); 1409 assert(dev_name != NULL); 1410 1411 link_t *link; 1412 for (link = dev_class->devices.next; 1413 link != &dev_class->devices; 1414 link = link->next) { 1415 dev_class_info_t *dev = list_get_instance(link, 1416 dev_class_info_t, link); 1417 1418 if (str_cmp(dev->dev_name, dev_name) == 0) { 1419 return dev; 1420 } 1421 } 1422 1423 return NULL; 1424 } 1425 1345 1426 void init_class_list(class_list_t *class_list) 1346 1427 {
Note:
See TracChangeset
for help on using the changeset viewer.