Changes in uspace/lib/c/generic/loc.c [45058baa:0fe52ef] in mainline
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/lib/c/generic/loc.c
r45058baa r0fe52ef 45 45 static FIBRIL_MUTEX_INITIALIZE(loc_consumer_mutex); 46 46 47 static FIBRIL_MUTEX_INITIALIZE(loc_callback_mutex); 48 static bool loc_callback_created = false; 49 47 50 static async_sess_t *loc_supp_block_sess = NULL; 48 51 static async_sess_t *loc_cons_block_sess = NULL; … … 51 54 static async_sess_t *loc_consumer_sess = NULL; 52 55 56 static loc_cat_change_cb_t cat_change_cb = NULL; 57 58 static void loc_cb_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg) 59 { 60 loc_cat_change_cb_t cb_fun; 61 62 while (true) { 63 ipc_call_t call; 64 ipc_callid_t callid = async_get_call(&call); 65 66 if (!IPC_GET_IMETHOD(call)) { 67 /* TODO: Handle hangup */ 68 return; 69 } 70 71 int retval; 72 73 switch (IPC_GET_IMETHOD(call)) { 74 case LOC_EVENT_CAT_CHANGE: 75 fibril_mutex_lock(&loc_callback_mutex); 76 cb_fun = cat_change_cb; 77 if (cb_fun != NULL) { 78 (*cb_fun)(); 79 } 80 fibril_mutex_unlock(&loc_callback_mutex); 81 retval = 0; 82 break; 83 default: 84 retval = ENOTSUP; 85 } 86 87 async_answer_0(callid, retval); 88 } 89 } 90 91 53 92 static void clone_session(fibril_mutex_t *mtx, async_sess_t *src, 54 93 async_sess_t **dst) … … 60 99 61 100 fibril_mutex_unlock(mtx); 101 } 102 103 static int loc_callback_create(void) 104 { 105 async_exch_t *exch; 106 sysarg_t retval; 107 int rc = EOK; 108 109 fibril_mutex_lock(&loc_callback_mutex); 110 111 if (!loc_callback_created) { 112 exch = loc_exchange_begin_blocking(LOC_PORT_CONSUMER); 113 114 ipc_call_t answer; 115 aid_t req = async_send_0(exch, LOC_CALLBACK_CREATE, &answer); 116 async_connect_to_me(exch, 0, 0, 0, loc_cb_conn, NULL); 117 loc_exchange_end(exch); 118 119 async_wait_for(req, &retval); 120 if (rc != EOK) 121 goto done; 122 123 if (retval != EOK) { 124 rc = retval; 125 goto done; 126 } 127 128 loc_callback_created = true; 129 } 130 131 rc = EOK; 132 done: 133 fibril_mutex_unlock(&loc_callback_mutex); 134 return rc; 62 135 } 63 136 … … 194 267 } 195 268 196 /** Register new device.197 * 198 * The @p interface is used when forwarding connection to the driver.269 /** Register new service. 270 * 271 * The @p interface is used when forwarding connection to the server. 199 272 * If not 0, the first argument is the interface and the second argument 200 273 * is the service ID. … … 203 276 * the handle (to ensure backward compatibility). 204 277 * 205 * @param fq dn Fully qualified device name.206 * @param[out] handle Handle to the created instance of device.207 * @param interface Interface when forwarding .208 * 209 */ 210 int loc_service_register_with_iface(const char *fq dn,211 service_id_t * handle, sysarg_t interface)278 * @param fqsn Fully qualified service name 279 * @param[out] sid Service ID of new service 280 * @param interface Interface when forwarding 281 * 282 */ 283 int loc_service_register_with_iface(const char *fqsn, 284 service_id_t *sid, sysarg_t interface) 212 285 { 213 286 async_exch_t *exch = loc_exchange_begin_blocking(LOC_PORT_SUPPLIER); … … 216 289 aid_t req = async_send_2(exch, LOC_SERVICE_REGISTER, interface, 0, 217 290 &answer); 218 sysarg_t retval = async_data_write_start(exch, fq dn, str_size(fqdn));291 sysarg_t retval = async_data_write_start(exch, fqsn, str_size(fqsn)); 219 292 220 293 loc_exchange_end(exch); … … 228 301 229 302 if (retval != EOK) { 230 if ( handle!= NULL)231 * handle= -1;232 233 return retval; 234 } 235 236 if ( handle!= NULL)237 * handle= (service_id_t) IPC_GET_ARG1(answer);303 if (sid != NULL) 304 *sid = -1; 305 306 return retval; 307 } 308 309 if (sid != NULL) 310 *sid = (service_id_t) IPC_GET_ARG1(answer); 238 311 239 312 return retval; 240 313 } 241 314 242 /** Register new device. 243 * 244 * @param fqdn Fully qualified device name. 245 * @param handle Output: Handle to the created instance of device. 246 * 247 */ 248 int loc_service_register(const char *fqdn, service_id_t *handle) 249 { 250 return loc_service_register_with_iface(fqdn, handle, 0); 315 /** Register new service. 316 * 317 * @param fqsn Fully qualified service name 318 * @param sid Output: ID of new service 319 * 320 */ 321 int loc_service_register(const char *fqdn, service_id_t *sid) 322 { 323 return loc_service_register_with_iface(fqdn, sid, 0); 324 } 325 326 /** Unregister service. 327 * 328 * @param sid Service ID 329 */ 330 int loc_service_unregister(service_id_t sid) 331 { 332 async_exch_t *exch; 333 sysarg_t retval; 334 335 exch = loc_exchange_begin_blocking(LOC_PORT_SUPPLIER); 336 retval = async_req_1_0(exch, LOC_SERVICE_UNREGISTER, sid); 337 loc_exchange_end(exch); 338 339 return (int)retval; 251 340 } 252 341 … … 291 380 } 292 381 293 /** Get service name. 294 * 295 * Provided ID of a service, return its name. 296 * 297 * @param svc_id Service ID 382 /** Get object name. 383 * 384 * Provided ID of an object, return its name. 385 * 386 * @param method IPC method 387 * @param id Object ID 298 388 * @param name Place to store pointer to new string. Caller should 299 389 * free it using free(). 300 390 * @return EOK on success or negative error code 301 391 */ 302 int loc_service_get_name(service_id_t svc_id, char **name)392 static int loc_get_name_internal(sysarg_t method, sysarg_t id, char **name) 303 393 { 304 394 async_exch_t *exch; … … 312 402 313 403 ipc_call_t answer; 314 aid_t req = async_send_1(exch, LOC_SERVICE_GET_NAME, svc_id, &answer);404 aid_t req = async_send_1(exch, method, id, &answer); 315 405 aid_t dreq = async_data_read(exch, name_buf, LOC_NAME_MAXLEN, 316 406 &dreply); … … 341 431 } 342 432 433 /** Get category name. 434 * 435 * Provided ID of a service, return its name. 436 * 437 * @param cat_id Category ID 438 * @param name Place to store pointer to new string. Caller should 439 * free it using free(). 440 * @return EOK on success or negative error code 441 */ 442 int loc_category_get_name(category_id_t cat_id, char **name) 443 { 444 return loc_get_name_internal(LOC_CATEGORY_GET_NAME, cat_id, name); 445 } 446 447 /** Get service name. 448 * 449 * Provided ID of a service, return its name. 450 * 451 * @param svc_id Service ID 452 * @param name Place to store pointer to new string. Caller should 453 * free it using free(). 454 * @return EOK on success or negative error code 455 */ 456 int loc_service_get_name(service_id_t svc_id, char **name) 457 { 458 return loc_get_name_internal(LOC_SERVICE_GET_NAME, svc_id, name); 459 } 343 460 344 461 int loc_namespace_get_id(const char *name, service_id_t *handle, … … 749 866 data, count); 750 867 } 868 869 int loc_register_cat_change_cb(loc_cat_change_cb_t cb_fun) 870 { 871 if (loc_callback_create() != EOK) 872 return EIO; 873 874 cat_change_cb = cb_fun; 875 return EOK; 876 }
Note:
See TracChangeset
for help on using the changeset viewer.