Changeset 8b5690f in mainline for uspace/lib/c/generic/stats.c

Timestamp:

2011-02-03T05:11:01Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

ba38f72c

Parents:

22027b6e (diff), 86d7bfa (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/stats.c (modified) (11 diffs)

uspace/lib/c/generic/stats.c

@@ -36 +36 @@
 #include <stats.h>
 #include <sysinfo.h>
-#include <assert.h>
 #include <errno.h>
 #include <stdio.h>
 #include <inttypes.h>
+#include <malloc.h>
 
 #define SYSINFO_STATS_MAX_PATH  64
@@ -71 +71 @@
             (stats_cpu_t *) sysinfo_get_data("system.cpus", &size);
         
-        assert((size % sizeof(stats_cpu_t)) == 0);
+        if ((size % sizeof(stats_cpu_t)) != 0) {
+                if (stats_cpus != NULL)
+                        free(stats_cpus);
+                *count = 0;
+                return NULL;
+        }
         
         *count = size / sizeof(stats_cpu_t);
@@ -91 +96 @@
             (stats_physmem_t *) sysinfo_get_data("system.physmem", &size);
         
-        assert((size == sizeof(stats_physmem_t)) || (size == 0));
+        if (size != sizeof(stats_physmem_t)) {
+                if (stats_physmem != NULL)
+                        free(stats_physmem);
+                return NULL;
+        }
         
         return stats_physmem;
@@ -111 +120 @@
             (stats_task_t *) sysinfo_get_data("system.tasks", &size);
         
-        assert((size % sizeof(stats_task_t)) == 0);
+        if ((size % sizeof(stats_task_t)) != 0) {
+                if (stats_tasks != NULL)
+                        free(stats_tasks);
+                *count = 0;
+                return NULL;
+        }
         
         *count = size / sizeof(stats_task_t);
@@ -135 +149 @@
             (stats_task_t *) sysinfo_get_data(name, &size);
         
-        assert((size == sizeof(stats_task_t)) || (size == 0));
+        if (size != sizeof(stats_task_t)) {
+                if (stats_task != NULL)
+                        free(stats_task);
+                return NULL;
+        }
         
         return stats_task;
@@ -155 +173 @@
             (stats_thread_t *) sysinfo_get_data("system.threads", &size);
         
-        assert((size % sizeof(stats_thread_t)) == 0);
+        if ((size % sizeof(stats_thread_t)) != 0) {
+                if (stats_threads != NULL)
+                        free(stats_threads);
+                *count = 0;
+                return NULL;
+        }
         
         *count = size / sizeof(stats_thread_t);
@@ -179 +202 @@
             (stats_thread_t *) sysinfo_get_data(name, &size);
         
-        assert((size == sizeof(stats_thread_t)) || (size == 0));
+        if (size != sizeof(stats_thread_t)) {
+                if (stats_thread != NULL)
+                        free(stats_thread);
+                return NULL;
+        }
         
         return stats_thread;
@@ -199 +226 @@
             (stats_exc_t *) sysinfo_get_data("system.exceptions", &size);
         
-        assert((size % sizeof(stats_exc_t)) == 0);
+        if ((size % sizeof(stats_exc_t)) != 0) {
+                if (stats_exceptions != NULL)
+                        free(stats_exceptions);
+                *count = 0;
+                return NULL;
+        }
         
         *count = size / sizeof(stats_exc_t);
@@ -217 +249 @@
 {
         char name[SYSINFO_STATS_MAX_PATH];
-        snprintf(name, SYSINFO_STATS_MAX_PATH, "system.exceptionss.%u", excn);
+        snprintf(name, SYSINFO_STATS_MAX_PATH, "system.exceptions.%u", excn);
         
         size_t size = 0;
@@ -223 +255 @@
             (stats_exc_t *) sysinfo_get_data(name, &size);
         
-        assert((size == sizeof(stats_exc_t)) || (size == 0));
+        if (size != sizeof(stats_exc_t)) {
+                if (stats_exception != NULL)
+                        free(stats_exception);
+                return NULL;
+        }
         
         return stats_exception;
@@ -243 +279 @@
             (load_t *) sysinfo_get_data("system.load", &size);
         
-        assert((size % sizeof(load_t)) == 0);
+        if ((size % sizeof(load_t)) != 0) {
+                if (load != NULL)
+                        free(load);
+                *count = 0;
+                return NULL;
+        }
         
         *count = size / sizeof(load_t);