Changeset 763e0cd in mainline

Timestamp:

2011-08-18T14:25:52Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d0dd7b5, f55b12b

Parents:

1dc4a5e

Message:

Locinfo utility. Right now displays yellow pages.

Files:

• boot/Makefile.common (modified) (1 diff)
• uspace/Makefile (modified) (1 diff)
• uspace/lib/c/generic/loc.c (modified) (3 diffs)
• uspace/lib/c/include/ipc/loc.h (modified) (1 diff)
• uspace/srv/loc/loc.c (modified) (3 diffs)

boot/Makefile.common

@@ -150 +150 @@
         $(USPACE_PATH)/app/kill/kill \
         $(USPACE_PATH)/app/killall/killall \
+        $(USPACE_PATH)/app/locinfo/locinfo \
         $(USPACE_PATH)/app/mkfat/mkfat \
         $(USPACE_PATH)/app/lsusb/lsusb \

uspace/Makefile

@@ -44 +44 @@
         app/killall \
         app/klog \
+        app/locinfo \
         app/lsusb \
         app/mkfat \

uspace/lib/c/generic/loc.c

@@ -364 +364 @@
 }
 
-/** Get service name.
- *
- * Provided ID of a service, return its name.
- *
- * @param svc_id        Service ID
+/** Get object name.
+ *
+ * Provided ID of an object, return its name.
+ *
+ * @param method        IPC method
+ * @param id            Object ID
  * @param name          Place to store pointer to new string. Caller should
  *                      free it using free().
  * @return              EOK on success or negative error code
  */
-int loc_service_get_name(service_id_t svc_id, char **name)
+static int loc_get_name_internal(sysarg_t method, sysarg_t id, char **name)
 {
         async_exch_t *exch;
@@ -385 +386 @@
         
         ipc_call_t answer;
-        aid_t req = async_send_1(exch, LOC_SERVICE_GET_NAME, svc_id, &answer);
+        aid_t req = async_send_1(exch, method, id, &answer);
         aid_t dreq = async_data_read(exch, name_buf, LOC_NAME_MAXLEN,
             &dreply);
@@ -414 +415 @@
 }
 
+/** Get category name.
+ *
+ * Provided ID of a service, return its name.
+ *
+ * @param cat_id        Category ID
+ * @param name          Place to store pointer to new string. Caller should
+ *                      free it using free().
+ * @return              EOK on success or negative error code
+ */
+int loc_category_get_name(category_id_t cat_id, char **name)
+{
+        return loc_get_name_internal(LOC_CATEGORY_GET_NAME, cat_id, name);
+}
+
+/** Get service name.
+ *
+ * Provided ID of a service, return its name.
+ *
+ * @param svc_id        Service ID
+ * @param name          Place to store pointer to new string. Caller should
+ *                      free it using free().
+ * @return              EOK on success or negative error code
+ */
+int loc_service_get_name(service_id_t svc_id, char **name)
+{
+        return loc_get_name_internal(LOC_SERVICE_GET_NAME, svc_id, name);
+}
 
 int loc_namespace_get_id(const char *name, service_id_t *handle,

uspace/lib/c/include/ipc/loc.h

@@ -59 +59 @@
         LOC_CALLBACK_CREATE,
         LOC_CATEGORY_GET_ID,
+        LOC_CATEGORY_GET_NAME,
         LOC_CATEGORY_GET_SVCS,
         LOC_ID_PROBE,

uspace/srv/loc/loc.c

@@ -536 +536 @@
 }
 
+static void loc_category_get_name(ipc_callid_t iid, ipc_call_t *icall)
+{
+        ipc_callid_t callid;
+        size_t size;
+        size_t act_size;
+        category_t *cat;
+        
+        if (!async_data_read_receive(&callid, &size)) {
+                async_answer_0(callid, EREFUSED);
+                async_answer_0(iid, EREFUSED);
+                return;
+        }
+        
+        fibril_mutex_lock(&cdir.mutex);
+        
+        cat = category_get(&cdir, IPC_GET_ARG1(*icall));
+        if (cat == NULL) {
+                fibril_mutex_unlock(&cdir.mutex);
+                async_answer_0(callid, ENOENT);
+                async_answer_0(iid, ENOENT);
+                return;
+        }
+        
+        act_size = str_size(cat->name);
+        if (act_size > size) {
+                fibril_mutex_unlock(&cdir.mutex);
+                async_answer_0(callid, EOVERFLOW);
+                async_answer_0(iid, EOVERFLOW);
+                return;
+        }
+        
+        sysarg_t retval = async_data_read_finalize(callid, cat->name,
+            min(size, act_size));
+        
+        fibril_mutex_unlock(&cdir.mutex);
+        
+        async_answer_0(iid, retval);
+}
+
 static void loc_service_get_name(ipc_callid_t iid, ipc_call_t *icall)
 {
@@ -574 +613 @@
         async_answer_0(iid, retval);
 }
-
 
 /** Connect client to the service.
@@ -1298 +1336 @@
                         loc_category_get_id(callid, &call);
                         break;
+                case LOC_CATEGORY_GET_NAME:
+                        loc_category_get_name(callid, &call);
+                        break;
                 case LOC_CATEGORY_GET_SVCS:
                         loc_category_get_svcs(callid, &call);