Changeset f4f866c in mainline for uspace/lib/c/generic/sysinfo.c

Timestamp:

2010-04-23T21:42:26Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6c39a907

Parents:

38aaacc2 (diff), 80badbe (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/lib/c/generic/sysinfo.c (modified) (1 diff)

uspace/lib/c/generic/sysinfo.c

@@ -31 +31 @@
  */
 /** @file
- */ 
+ */
 
 #include <libc.h>
 #include <sysinfo.h>
 #include <str.h>
+#include <errno.h>
+#include <malloc.h>
+#include <bool.h>
 
-sysarg_t sysinfo_value(const char *name)
+/** Get sysinfo item type
+ *
+ * @param path Sysinfo path.
+ *
+ * @return Sysinfo item type.
+ *
+ */
+sysinfo_item_tag_t sysinfo_get_tag(const char *path)
 {
-        return __SYSCALL2(SYS_SYSINFO_VALUE, (sysarg_t) name,
-            (sysarg_t) str_size(name));
+        return (sysinfo_item_tag_t) __SYSCALL2(SYS_SYSINFO_GET_TAG,
+            (sysarg_t) path, (sysarg_t) str_size(path));
+}
+
+/** Get sysinfo numerical value
+ *
+ * @param path  Sysinfo path.
+ * @param value Pointer to store the numerical value to.
+ *
+ * @return EOK if the value was successfully read and
+ *         is of SYSINFO_VAL_VAL type.
+ *
+ */
+int sysinfo_get_value(const char *path, sysarg_t *value)
+{
+        return (int) __SYSCALL3(SYS_SYSINFO_GET_VALUE, (sysarg_t) path,
+            (sysarg_t) str_size(path), (sysarg_t) value);
+}
+
+/** Get sysinfo binary data size
+ *
+ * @param path  Sysinfo path.
+ * @param value Pointer to store the binary data size.
+ *
+ * @return EOK if the value was successfully read and
+ *         is of SYSINFO_VAL_DATA type.
+ *
+ */
+static int sysinfo_get_data_size(const char *path, size_t *size)
+{
+        return (int) __SYSCALL3(SYS_SYSINFO_GET_DATA_SIZE, (sysarg_t) path,
+            (sysarg_t) str_size(path), (sysarg_t) size);
+}
+
+/** Get sysinfo binary data
+ *
+ * @param path  Sysinfo path.
+ * @param value Pointer to store the binary data size.
+ *
+ * @return Binary data read from sysinfo or NULL if the
+ *         sysinfo item value type is not binary data.
+ *         The returned non-NULL pointer should be
+ *         freed by free().
+ *
+ */
+void *sysinfo_get_data(const char *path, size_t *size)
+{
+        /* The binary data size might change during time.
+           Unfortunatelly we cannot allocate the buffer
+           and transfer the data as a single atomic operation.
+        
+           Let's hope that the number of iterations is bounded
+           in common cases. */
+        
+        void *data = NULL;
+        
+        while (true) {
+                /* Get the binary data size */
+                int ret = sysinfo_get_data_size(path, size);
+                if ((ret != EOK) || (size == 0)) {
+                        /* Not a binary data item
+                           or an empty item */
+                        break;
+                }
+                
+                data = realloc(data, *size);
+                if (data == NULL)
+                        break;
+                
+                /* Get the data */
+                ret = __SYSCALL4(SYS_SYSINFO_GET_DATA, (sysarg_t) path,
+                    (sysarg_t) str_size(path), (sysarg_t) data, (sysarg_t) *size);
+                if (ret == EOK)
+                        return data;
+                
+                if (ret != ENOMEM) {
+                        /* The failure to get the data was not caused
+                           by wrong buffer size */
+                        break;
+                }
+        }
+        
+        if (data != NULL)
+                free(data);
+        
+        *size = 0;
+        return NULL;
 }