Changeset 4c53333 in mainline for uspace/srv/locsrv/locsrv.c

Timestamp:

2013-07-11T08:21:10Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

64e63ce1

Parents:

80445cf (diff), c8bb1633 (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

File:

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

uspace/srv/locsrv/locsrv.c

@@ -42 +42 @@
 #include <stdio.h>
 #include <errno.h>
-#include <bool.h>
+#include <stdbool.h>
 #include <fibril_synch.h>
 #include <macros.h>
@@ -51 +51 @@
 
 #include "category.h"
-#include "loc.h"
+#include "locsrv.h"
 
 #define NAME          "loc"
@@ -390 +390 @@
          */
         list_initialize(&server->services);
-
         link_initialize(&server->servers);
         
@@ -651 +650 @@
             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));
         
         fibril_mutex_unlock(&services_list_mutex);
@@ -1308 +1353 @@
         categ_dir_add_cat(&cdir, cat);
 
+        cat = category_new("clock");
+        categ_dir_add_cat(&cdir, cat);
+
         cat = category_new("test3");
         categ_dir_add_cat(&cdir, cat);
@@ -1321 +1369 @@
         
         cat = category_new("nic");
+        categ_dir_add_cat(&cdir, cat);
+
+        cat = category_new("visualizer");
+        categ_dir_add_cat(&cdir, cat);
+
+        cat = category_new("renderer");
         categ_dir_add_cat(&cdir, cat);
         
@@ -1405 +1459 @@
                 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:
@@ -1490 +1547 @@
         
         /* 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);