Changeset 6843a9c in mainline for uspace/srv/locsrv/locsrv.c

Timestamp:

2012-06-29T13:02:14Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

722912e

Parents:

ba72f2b (diff), 0bbd13e (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 mainline changes

Trivial conflicts.

File:

• uspace/srv/locsrv/locsrv.c (moved) (moved from uspace/srv/loc/loc.c ) (13 diffs)

uspace/srv/locsrv/locsrv.c

@@ -51 +51 @@
 
 #include "category.h"
-#include "loc.h"
+#include "locsrv.h"
 
 #define NAME          "loc"
 #define NULL_SERVICES  256
+
+/** Callback session */
+typedef struct {
+        link_t cb_sess_list;
+        async_sess_t *sess;
+} cb_sess_t;
 
 LIST_INITIALIZE(services_list);
@@ -86 +92 @@
 
 static FIBRIL_MUTEX_INITIALIZE(callback_sess_mutex);
-static async_sess_t *callback_sess = NULL;
+static LIST_INITIALIZE(callback_sess_list);
 
 service_id_t loc_create_id(void)
@@ -384 +390 @@
          */
         list_initialize(&server->services);
-
         link_initialize(&server->servers);
         
@@ -608 +613 @@
         size_t act_size;
         loc_service_t *svc;
+        char *fqn;
         
         if (!async_data_read_receive(&callid, &size)) {
@@ -625 +631 @@
         }
         
-        act_size = str_size(svc->name);
+        if (asprintf(&fqn, "%s/%s", svc->namespace->name, svc->name) < 0) {
+                fibril_mutex_unlock(&services_list_mutex);
+                async_answer_0(callid, ENOMEM);
+                async_answer_0(iid, ENOMEM);
+                return;
+        }
+        
+        act_size = str_size(fqn);
         if (act_size > size) {
+                free(fqn);
                 fibril_mutex_unlock(&services_list_mutex);
                 async_answer_0(callid, EOVERFLOW);
@@ -633 +647 @@
         }
         
-        sysarg_t retval = async_data_read_finalize(callid, svc->name,
+        sysarg_t retval = async_data_read_finalize(callid, fqn,
+            min(size, act_size));
+        free(fqn);
+        
+        fibril_mutex_unlock(&services_list_mutex);
+        
+        async_answer_0(iid, retval);
+}
+
+static void loc_service_get_server_name(ipc_callid_t iid, ipc_call_t *icall)
+{
+        ipc_callid_t callid;
+        size_t size;
+        size_t act_size;
+        loc_service_t *svc;
+        
+        if (!async_data_read_receive(&callid, &size)) {
+                async_answer_0(callid, EREFUSED);
+                async_answer_0(iid, EREFUSED);
+                return;
+        }
+        
+        fibril_mutex_lock(&services_list_mutex);
+        
+        svc = loc_service_find_id(IPC_GET_ARG1(*icall));
+        if (svc == NULL) {
+                fibril_mutex_unlock(&services_list_mutex);
+                async_answer_0(callid, ENOENT);
+                async_answer_0(iid, ENOENT);
+                return;
+        }
+        
+        if (svc->server == NULL) {
+                fibril_mutex_unlock(&services_list_mutex);
+                async_answer_0(callid, EINVAL);
+                async_answer_0(iid, EINVAL);
+                return;
+        }
+        
+        act_size = str_size(svc->server->name);
+        if (act_size > size) {
+                fibril_mutex_unlock(&services_list_mutex);
+                async_answer_0(callid, EOVERFLOW);
+                async_answer_0(iid, EOVERFLOW);
+                return;
+        }
+        
+        sysarg_t retval = async_data_read_finalize(callid, svc->server->name,
             min(size, act_size));
         
@@ -790 +851 @@
 }
 
-/** Find ID for category specified by name.
- *
- * On success, answer will contain EOK int retval and service ID in arg1.
+/** Create callback connection.
+ *
+ * Create callback connection which will be used to send category change
+ * events.
+ *
+ * On success, answer will contain EOK int retval.
  * On failure, error code will be sent in retval.
  *
@@ -798 +862 @@
 static void loc_callback_create(ipc_callid_t iid, ipc_call_t *icall)
 {
-        async_sess_t *cb_sess = async_callback_receive(EXCHANGE_SERIALIZE);
+        cb_sess_t *cb_sess = calloc(1, sizeof(cb_sess_t));
         if (cb_sess == NULL) {
                 async_answer_0(iid, ENOMEM);
@@ -804 +868 @@
         }
         
+        async_sess_t *sess = async_callback_receive(EXCHANGE_SERIALIZE);
+        if (sess == NULL) {
+                free(cb_sess);
+                async_answer_0(iid, ENOMEM);
+                return;
+        }
+        
+        cb_sess->sess = sess;
+        link_initialize(&cb_sess->cb_sess_list);
+        
         fibril_mutex_lock(&callback_sess_mutex);
-        if (callback_sess != NULL) {
-                fibril_mutex_unlock(&callback_sess_mutex);
-                async_answer_0(iid, EEXIST);
-                return;
-        }
-        
-        callback_sess = cb_sess;
+        list_append(&cb_sess->cb_sess_list, &callback_sess_list);
         fibril_mutex_unlock(&callback_sess_mutex);
         
@@ -820 +888 @@
 {
         fibril_mutex_lock(&callback_sess_mutex);
-
-        if (callback_sess != NULL) {
-                async_exch_t *exch = async_exchange_begin(callback_sess);
+        
+        list_foreach(callback_sess_list, link) {
+                cb_sess_t *cb_sess;
+                
+                cb_sess = list_get_instance(link, cb_sess_t, cb_sess_list);
+                
+                async_exch_t *exch = async_exchange_begin(cb_sess->sess);
                 async_msg_0(exch, LOC_EVENT_CAT_CHANGE);
                 async_exchange_end(exch);
         }
-
+        
         fibril_mutex_unlock(&callback_sess_mutex);
 }
@@ -1269 +1341 @@
         categ_dir_add_cat(&cdir, cat);
 
+        cat = category_new("iplink");
+        categ_dir_add_cat(&cdir, cat);
+
         cat = category_new("keyboard");
         categ_dir_add_cat(&cdir, cat);
@@ -1375 +1450 @@
                 case LOC_SERVICE_GET_NAME:
                         loc_service_get_name(callid, &call);
+                        break;
+                case LOC_SERVICE_GET_SERVER_NAME:
+                        loc_service_get_server_name(callid, &call);
                         break;
                 case LOC_NAMESPACE_GET_ID:
@@ -1460 +1538 @@
         
         /* Register location service at naming service */
-        if (service_register(SERVICE_LOC) != EOK)
-                return -1;
+        int rc = service_register(SERVICE_LOC);
+        if (rc != EOK)
+                return rc;
         
         printf("%s: Accepting connections\n", NAME);