Index: kernel/generic/src/sysinfo/stats.c =================================================================== --- kernel/generic/src/sysinfo/stats.c (revision b7fd2a02e4161f4edd38548e7f8456b8021549be) +++ kernel/generic/src/sysinfo/stats.c (revision a1a81f698d5d7a69659be156314cb47101fde090) @@ -99,5 +99,5 @@ if (dry_run) return NULL; - + /* Assumption: config.cpu_count is constant */ stats_cpu_t *stats_cpus = (stats_cpu_t *) malloc(*size, FRAME_ATOMIC); @@ -106,9 +106,9 @@ return NULL; } - + size_t i; for (i = 0; i < config.cpu_count; i++) { irq_spinlock_lock(&cpus[i].lock, true); - + stats_cpus[i].id = cpus[i].id; stats_cpus[i].active = cpus[i].active; @@ -116,8 +116,8 @@ stats_cpus[i].busy_cycles = cpus[i].busy_cycles; stats_cpus[i].idle_cycles = cpus[i].idle_cycles; - + irq_spinlock_unlock(&cpus[i].lock, true); } - + return ((void *) stats_cpus); } @@ -137,5 +137,5 @@ size_t *count = (size_t *) arg; (*count)++; - + return true; } @@ -156,10 +156,10 @@ * object, return inexact statistics by skipping the respective object. */ - + if (mutex_trylock(&as->lock) != EOK) return 0; - + size_t pages = 0; - + /* Walk the B+ tree and count pages */ list_foreach(as->as_area_btree.leaf_list, leaf_link, btree_node_t, @@ -168,15 +168,15 @@ for (i = 0; i < node->keys; i++) { as_area_t *area = node->value[i]; - + if (mutex_trylock(&area->lock) != EOK) continue; - + pages += area->pages; mutex_unlock(&area->lock); } } - + mutex_unlock(&as->lock); - + return (pages << PAGE_WIDTH); } @@ -197,10 +197,10 @@ * object, return inexact statistics by skipping the respective object. */ - + if (mutex_trylock(&as->lock) != EOK) return 0; - + size_t pages = 0; - + /* Walk the B+ tree and count pages */ list_foreach(as->as_area_btree.leaf_list, leaf_link, btree_node_t, node) { @@ -208,15 +208,15 @@ for (i = 0; i < node->keys; i++) { as_area_t *area = node->value[i]; - + if (mutex_trylock(&area->lock) != EOK) continue; - + pages += area->resident; mutex_unlock(&area->lock); } } - + mutex_unlock(&as->lock); - + return (pages << PAGE_WIDTH); } @@ -234,5 +234,5 @@ assert(interrupts_disabled()); assert(irq_spinlock_locked(&task->lock)); - + stats_task->task_id = task->taskid; str_cpy(stats_task->name, TASK_NAME_BUFLEN, task->name); @@ -260,14 +260,14 @@ stats_task_t **iterator = (stats_task_t **) arg; task_t *task = avltree_get_instance(node, task_t, tasks_tree_node); - + /* Interrupts are already disabled */ irq_spinlock_lock(&(task->lock), false); - + /* Record the statistics and increment the iterator */ produce_stats_task(task, *iterator); (*iterator)++; - + irq_spinlock_unlock(&(task->lock), false); - + return true; } @@ -289,9 +289,9 @@ /* Messing with task structures, avoid deadlock */ irq_spinlock_lock(&tasks_lock, true); - + /* First walk the task tree to count the tasks */ size_t count = 0; avltree_walk(&tasks_tree, avl_count_walker, (void *) &count); - + if (count == 0) { /* No tasks found (strange) */ @@ -300,5 +300,5 @@ return NULL; } - + *size = sizeof(stats_task_t) * count; if (dry_run) { @@ -306,5 +306,5 @@ return NULL; } - + stats_task_t *stats_tasks = (stats_task_t *) malloc(*size, FRAME_ATOMIC); if (stats_tasks == NULL) { @@ -314,11 +314,11 @@ return NULL; } - + /* Walk tha task tree again to gather the statistics */ stats_task_t *iterator = stats_tasks; avltree_walk(&tasks_tree, task_serialize_walker, (void *) &iterator); - + irq_spinlock_unlock(&tasks_lock, true); - + return ((void *) stats_tasks); } @@ -336,5 +336,5 @@ assert(interrupts_disabled()); assert(irq_spinlock_locked(&thread->lock)); - + stats_thread->thread_id = thread->tid; stats_thread->task_id = thread->task->taskid; @@ -343,5 +343,5 @@ stats_thread->ucycles = thread->ucycles; stats_thread->kcycles = thread->kcycles; - + if (thread->cpu != NULL) { stats_thread->on_cpu = true; @@ -366,14 +366,14 @@ stats_thread_t **iterator = (stats_thread_t **) arg; thread_t *thread = avltree_get_instance(node, thread_t, threads_tree_node); - + /* Interrupts are already disabled */ irq_spinlock_lock(&thread->lock, false); - + /* Record the statistics and increment the iterator */ produce_stats_thread(thread, *iterator); (*iterator)++; - + irq_spinlock_unlock(&thread->lock, false); - + return true; } @@ -395,9 +395,9 @@ /* Messing with threads structures, avoid deadlock */ irq_spinlock_lock(&threads_lock, true); - + /* First walk the thread tree to count the threads */ size_t count = 0; avltree_walk(&threads_tree, avl_count_walker, (void *) &count); - + if (count == 0) { /* No threads found (strange) */ @@ -406,5 +406,5 @@ return NULL; } - + *size = sizeof(stats_thread_t) * count; if (dry_run) { @@ -412,5 +412,5 @@ return NULL; } - + stats_thread_t *stats_threads = (stats_thread_t *) malloc(*size, FRAME_ATOMIC); if (stats_threads == NULL) { @@ -420,11 +420,11 @@ return NULL; } - + /* Walk tha thread tree again to gather the statistics */ stats_thread_t *iterator = stats_threads; avltree_walk(&threads_tree, thread_serialize_walker, (void *) &iterator); - + irq_spinlock_unlock(&threads_lock, true); - + return ((void *) stats_threads); } @@ -454,13 +454,13 @@ sysinfo_return_t ret; ret.tag = SYSINFO_VAL_UNDEFINED; - + /* Parse the task ID */ task_id_t task_id; if (str_uint64_t(name, NULL, 0, true, &task_id) != EOK) return ret; - + /* Messing with task structures, avoid deadlock */ irq_spinlock_lock(&tasks_lock, true); - + task_t *task = task_find_by_id(task_id); if (task == NULL) { @@ -469,10 +469,10 @@ return ret; } - + if (dry_run) { ret.tag = SYSINFO_VAL_FUNCTION_DATA; ret.data.data = NULL; ret.data.size = sizeof(stats_task_t); - + irq_spinlock_unlock(&tasks_lock, true); } else { @@ -484,18 +484,18 @@ return ret; } - + /* Correct return value */ ret.tag = SYSINFO_VAL_FUNCTION_DATA; ret.data.data = (void *) stats_task; ret.data.size = sizeof(stats_task_t); - + /* Hand-over-hand locking */ irq_spinlock_exchange(&tasks_lock, &task->lock); - + produce_stats_task(task, stats_task); - + irq_spinlock_unlock(&task->lock, true); } - + return ret; } @@ -525,13 +525,13 @@ sysinfo_return_t ret; ret.tag = SYSINFO_VAL_UNDEFINED; - + /* Parse the thread ID */ thread_id_t thread_id; if (str_uint64_t(name, NULL, 0, true, &thread_id) != EOK) return ret; - + /* Messing with threads structures, avoid deadlock */ irq_spinlock_lock(&threads_lock, true); - + thread_t *thread = thread_find_by_id(thread_id); if (thread == NULL) { @@ -540,10 +540,10 @@ return ret; } - + if (dry_run) { ret.tag = SYSINFO_VAL_FUNCTION_DATA; ret.data.data = NULL; ret.data.size = sizeof(stats_thread_t); - + irq_spinlock_unlock(&threads_lock, true); } else { @@ -555,18 +555,18 @@ return ret; } - + /* Correct return value */ ret.tag = SYSINFO_VAL_FUNCTION_DATA; ret.data.data = (void *) stats_thread; ret.data.size = sizeof(stats_thread_t); - + /* Hand-over-hand locking */ irq_spinlock_exchange(&threads_lock, &thread->lock); - + produce_stats_thread(thread, stats_thread); - + irq_spinlock_unlock(&thread->lock, true); } - + return ret; } @@ -587,8 +587,8 @@ { *size = sizeof(stats_exc_t) * IVT_ITEMS; - + if ((dry_run) || (IVT_ITEMS == 0)) return NULL; - + stats_exc_t *stats_exceptions = (stats_exc_t *) malloc(*size, FRAME_ATOMIC); @@ -598,9 +598,9 @@ return NULL; } - + #if (IVT_ITEMS > 0) /* Messing with exception table, avoid deadlock */ irq_spinlock_lock(&exctbl_lock, true); - + unsigned int i; for (i = 0; i < IVT_ITEMS; i++) { @@ -611,8 +611,8 @@ stats_exceptions[i].count = exc_table[i].count; } - + irq_spinlock_unlock(&exctbl_lock, true); #endif - + return ((void *) stats_exceptions); } @@ -642,15 +642,15 @@ sysinfo_return_t ret; ret.tag = SYSINFO_VAL_UNDEFINED; - + /* Parse the exception number */ uint64_t excn; if (str_uint64_t(name, NULL, 0, true, &excn) != EOK) return ret; - + #if (IVT_FIRST > 0) if (excn < IVT_FIRST) return ret; #endif - + #if (IVT_ITEMS + IVT_FIRST == 0) return ret; @@ -659,5 +659,5 @@ return ret; #endif - + if (dry_run) { ret.tag = SYSINFO_VAL_FUNCTION_DATA; @@ -667,5 +667,5 @@ /* Update excn index for accessing exc_table */ excn -= IVT_FIRST; - + /* Allocate stats_exc_t structure */ stats_exc_t *stats_exception = @@ -673,13 +673,13 @@ if (stats_exception == NULL) return ret; - + /* Messing with exception table, avoid deadlock */ irq_spinlock_lock(&exctbl_lock, true); - + /* Correct return value */ ret.tag = SYSINFO_VAL_FUNCTION_DATA; ret.data.data = (void *) stats_exception; ret.data.size = sizeof(stats_exc_t); - + stats_exception->id = excn; str_cpy(stats_exception->desc, EXC_NAME_BUFLEN, exc_table[excn].name); @@ -687,8 +687,8 @@ stats_exception->cycles = exc_table[excn].cycles; stats_exception->count = exc_table[excn].count; - + irq_spinlock_unlock(&exctbl_lock, true); } - + return ret; } @@ -711,5 +711,5 @@ if (dry_run) return NULL; - + stats_physmem_t *stats_physmem = (stats_physmem_t *) malloc(*size, FRAME_ATOMIC); @@ -718,8 +718,8 @@ return NULL; } - + zones_stats(&(stats_physmem->total), &(stats_physmem->unavail), &(stats_physmem->used), &(stats_physmem->free)); - + return ((void *) stats_physmem); } @@ -742,5 +742,5 @@ if (dry_run) return NULL; - + load_t *stats_load = (load_t *) malloc(*size, FRAME_ATOMIC); if (stats_load == NULL) { @@ -748,14 +748,14 @@ return NULL; } - + /* To always get consistent values acquire the mutex */ mutex_lock(&load_lock); - + unsigned int i; for (i = 0; i < LOAD_STEPS; i++) stats_load[i] = avenrdy[i] << LOAD_KERNEL_SHIFT; - + mutex_unlock(&load_lock); - + return ((void *) stats_load); } @@ -768,5 +768,5 @@ load *= exp; load += (ready << LOAD_FIXED_SHIFT) * (LOAD_FIXED_1 - exp); - + return (load >> LOAD_FIXED_SHIFT); } @@ -782,17 +782,17 @@ { thread_detach(THREAD); - + while (true) { atomic_count_t ready = atomic_get(&nrdy); - + /* Mutually exclude with get_stats_load() */ mutex_lock(&load_lock); - + unsigned int i; for (i = 0; i < LOAD_STEPS; i++) avenrdy[i] = load_calc(avenrdy[i], load_exp[i], ready); - + mutex_unlock(&load_lock); - + thread_sleep(LOAD_INTERVAL); } @@ -805,5 +805,5 @@ { mutex_initialize(&load_lock, MUTEX_PASSIVE); - + sysinfo_set_item_gen_data("system.cpus", NULL, get_stats_cpus, NULL); sysinfo_set_item_gen_data("system.physmem", NULL, get_stats_physmem, NULL); Index: kernel/generic/src/sysinfo/sysinfo.c =================================================================== --- kernel/generic/src/sysinfo/sysinfo.c (revision b7fd2a02e4161f4edd38548e7f8456b8021549be) +++ kernel/generic/src/sysinfo/sysinfo.c (revision a1a81f698d5d7a69659be156314cb47101fde090) @@ -64,5 +64,5 @@ { sysinfo_item_t *item = (sysinfo_item_t *) obj; - + item->name = NULL; item->val_type = SYSINFO_VAL_UNDEFINED; @@ -70,5 +70,5 @@ item->subtree.table = NULL; item->next = NULL; - + return EOK; } @@ -84,8 +84,8 @@ { sysinfo_item_t *item = (sysinfo_item_t *) obj; - + if (item->name != NULL) free(item->name); - + return 0; } @@ -101,5 +101,5 @@ sizeof(sysinfo_item_t), 0, sysinfo_item_constructor, sysinfo_item_destructor, SLAB_CACHE_MAGDEFERRED); - + mutex_initialize(&sysinfo_lock, MUTEX_ACTIVE); } @@ -127,19 +127,19 @@ { assert(subtree != NULL); - + sysinfo_item_t *cur = subtree; - + /* Walk all siblings */ while (cur != NULL) { size_t i = 0; - + /* Compare name with path */ while ((cur->name[i] != 0) && (name[i] == cur->name[i])) i++; - + /* Check for perfect name and path match */ if ((name[i] == 0) && (cur->name[i] == 0)) return cur; - + /* Partial match up to the delimiter */ if ((name[i] == '.') && (cur->name[i] == 0)) { @@ -155,5 +155,5 @@ **ret = cur->subtree.generator.fn(name + i + 1, dry_run, cur->subtree.generator.data); - + return NULL; default: @@ -161,16 +161,16 @@ if (ret != NULL) *ret = NULL; - + return NULL; } } - + cur = cur->next; } - + /* Not found, no data generated */ if (ret != NULL) *ret = NULL; - + return NULL; } @@ -193,22 +193,22 @@ { assert(psubtree != NULL); - + if (*psubtree == NULL) { /* No parent */ - + size_t i = 0; - + /* Find the first delimiter in name */ while ((name[i] != 0) && (name[i] != '.')) i++; - + *psubtree = (sysinfo_item_t *) slab_alloc(sysinfo_item_cache, 0); assert(*psubtree); - + /* Fill in item name up to the delimiter */ (*psubtree)->name = str_ndup(name, i); assert((*psubtree)->name); - + /* Create subtree items */ if (name[i] == '.') { @@ -217,19 +217,19 @@ &((*psubtree)->subtree.table)); } - + /* No subtree needs to be created */ return *psubtree; } - + sysinfo_item_t *cur = *psubtree; - + /* Walk all siblings */ while (cur != NULL) { size_t i = 0; - + /* Compare name with path */ while ((cur->name[i] != 0) && (name[i] == cur->name[i])) i++; - + /* Check for perfect name and path match * -> item is already present. @@ -237,5 +237,5 @@ if ((name[i] == 0) && (cur->name[i] == 0)) return cur; - + /* Partial match up to the delimiter */ if ((name[i] == '.') && (cur->name[i] == 0)) { @@ -257,5 +257,5 @@ } } - + /* No match and no more siblings to check * -> create a new sibling item. @@ -266,15 +266,15 @@ while ((name[i] != 0) && (name[i] != '.')) i++; - + sysinfo_item_t *item = (sysinfo_item_t *) slab_alloc(sysinfo_item_cache, 0); assert(item); - + cur->next = item; - + /* Fill in item name up to the delimiter */ item->name = str_ndup(name, i); assert(item->name); - + /* Create subtree items */ if (name[i] == '.') { @@ -283,12 +283,12 @@ &(item->subtree.table)); } - + /* No subtree needs to be created */ return item; } - + cur = cur->next; } - + /* Unreachable */ assert(false); @@ -309,8 +309,8 @@ /* Protect sysinfo tree consistency */ mutex_lock(&sysinfo_lock); - + if (root == NULL) root = &global_root; - + sysinfo_item_t *item = sysinfo_create_path(name, root); if (item != NULL) { @@ -318,5 +318,5 @@ item->val.val = val; } - + mutex_unlock(&sysinfo_lock); } @@ -340,8 +340,8 @@ /* Protect sysinfo tree consistency */ mutex_lock(&sysinfo_lock); - + if (root == NULL) root = &global_root; - + sysinfo_item_t *item = sysinfo_create_path(name, root); if (item != NULL) { @@ -350,5 +350,5 @@ item->val.data.size = size; } - + mutex_unlock(&sysinfo_lock); } @@ -368,8 +368,8 @@ /* Protect sysinfo tree consistency */ mutex_lock(&sysinfo_lock); - + if (root == NULL) root = &global_root; - + sysinfo_item_t *item = sysinfo_create_path(name, root); if (item != NULL) { @@ -378,5 +378,5 @@ item->val.gen_val.data = data; } - + mutex_unlock(&sysinfo_lock); } @@ -401,8 +401,8 @@ /* Protect sysinfo tree consistency */ mutex_lock(&sysinfo_lock); - + if (root == NULL) root = &global_root; - + sysinfo_item_t *item = sysinfo_create_path(name, root); if (item != NULL) { @@ -411,5 +411,5 @@ item->val.gen_data.data = data; } - + mutex_unlock(&sysinfo_lock); } @@ -426,12 +426,12 @@ /* Protect sysinfo tree consistency */ mutex_lock(&sysinfo_lock); - + if (root == NULL) root = &global_root; - + sysinfo_item_t *item = sysinfo_create_path(name, root); if (item != NULL) item->val_type = SYSINFO_VAL_UNDEFINED; - + mutex_unlock(&sysinfo_lock); } @@ -451,10 +451,10 @@ /* Protect sysinfo tree consistency */ mutex_lock(&sysinfo_lock); - + if (root == NULL) root = &global_root; - + sysinfo_item_t *item = sysinfo_create_path(name, root); - + /* Change the type of the subtree only if it is not already a fixed subtree */ @@ -464,5 +464,5 @@ item->subtree.generator.data = data; } - + mutex_unlock(&sysinfo_lock); } @@ -492,5 +492,5 @@ for (sysinfo_item_t *cur = root; cur; cur = cur->next) { size_t length; - + if (spaces == 0) { printf("%s", cur->name); @@ -501,8 +501,8 @@ length = str_length(cur->name) + 1; } - + sysarg_t val; size_t size; - + /* Display node value and type */ switch (cur->val_type) { @@ -531,5 +531,5 @@ printf("+ %s [unknown]\n", cur->name); } - + /* Recursivelly nest into the subtree */ switch (cur->subtree_type) { @@ -562,10 +562,10 @@ while we are dumping it */ mutex_lock(&sysinfo_lock); - + if (root == NULL) sysinfo_dump_internal(global_root, 0); else sysinfo_dump_internal(root, 0); - + mutex_unlock(&sysinfo_lock); } @@ -590,5 +590,5 @@ if (root == NULL) root = &global_root; - + /* Try to find the item or generate data */ sysinfo_return_t ret; @@ -596,8 +596,8 @@ sysinfo_item_t *item = sysinfo_find_item(name, *root, &ret_ptr, dry_run); - + if (item != NULL) { /* Item found in the fixed sysinfo tree */ - + ret.tag = item->val_type; switch (item->val_type) { @@ -625,5 +625,5 @@ } } - + return ret; } @@ -645,11 +645,11 @@ sysinfo_return_t ret; ret.tag = SYSINFO_VAL_UNDEFINED; - + if (size > SYSINFO_MAX_PATH) return ret; - + char *path = (char *) malloc(size + 1, 0); assert(path); - + if ((copy_from_uspace(path, ptr, size + 1) == 0) && (path[size] == 0)) { @@ -662,5 +662,5 @@ mutex_unlock(&sysinfo_lock); } - + free(path); return ret; @@ -686,7 +686,7 @@ if (root == NULL) root = &global_root; - + sysinfo_item_t *subtree = NULL; - + if (name[0] != 0) { /* Try to find the item */ @@ -698,8 +698,8 @@ } else subtree = *root; - + sysinfo_return_t ret; ret.tag = SYSINFO_VAL_UNDEFINED; - + if (subtree != NULL) { /* @@ -709,5 +709,5 @@ for (sysinfo_item_t *cur = subtree; cur; cur = cur->next) size += str_size(cur->name) + 1; - + if (dry_run) { ret.tag = SYSINFO_VAL_DATA; @@ -719,5 +719,5 @@ if (names == NULL) return ret; - + size_t pos = 0; for (sysinfo_item_t *cur = subtree; cur; cur = cur->next) { @@ -725,5 +725,5 @@ pos += str_size(cur->name) + 1; } - + /* Correct return value */ ret.tag = SYSINFO_VAL_DATA; @@ -732,5 +732,5 @@ } } - + return ret; } @@ -754,11 +754,11 @@ ret.data.data = NULL; ret.data.size = 0; - + if (size > SYSINFO_MAX_PATH) return ret; - + char *path = (char *) malloc(size + 1, 0); assert(path); - + if ((copy_from_uspace(path, ptr, size + 1) == 0) && (path[size] == 0)) { @@ -771,5 +771,5 @@ mutex_unlock(&sysinfo_lock); } - + free(path); return ret; @@ -794,5 +794,5 @@ { errno_t rc; - + /* * Get the keys. @@ -803,5 +803,5 @@ sysinfo_return_t ret = sysinfo_get_keys_uspace(path_ptr, path_size, true); - + /* Check return data tag */ if (ret.tag == SYSINFO_VAL_DATA) @@ -810,5 +810,5 @@ else rc = EINVAL; - + return (sys_errno_t) rc; } @@ -842,9 +842,9 @@ { errno_t rc; - + /* Get the keys */ sysinfo_return_t ret = sysinfo_get_keys_uspace(path_ptr, path_size, false); - + /* Check return data tag */ if (ret.tag == SYSINFO_VAL_DATA) { @@ -853,9 +853,9 @@ if (rc == EOK) rc = copy_to_uspace(size_ptr, &size, sizeof(size)); - + free(ret.data.data); } else rc = EINVAL; - + return (sys_errno_t) rc; } @@ -882,5 +882,5 @@ */ sysinfo_return_t ret = sysinfo_get_item_uspace(path_ptr, path_size, true); - + /* * Map generated value types to constant types (user space does @@ -891,5 +891,5 @@ else if (ret.tag == SYSINFO_VAL_FUNCTION_DATA) ret.tag = SYSINFO_VAL_DATA; - + return (sysarg_t) ret.tag; } @@ -913,5 +913,5 @@ { errno_t rc; - + /* * Get the item. @@ -921,5 +921,5 @@ */ sysinfo_return_t ret = sysinfo_get_item_uspace(path_ptr, path_size, true); - + /* Only constant or generated numerical value is returned */ if ((ret.tag == SYSINFO_VAL_VAL) || (ret.tag == SYSINFO_VAL_FUNCTION_VAL)) @@ -927,5 +927,5 @@ else rc = EINVAL; - + return (sys_errno_t) rc; } @@ -949,5 +949,5 @@ { errno_t rc; - + /* * Get the item. @@ -957,5 +957,5 @@ */ sysinfo_return_t ret = sysinfo_get_item_uspace(path_ptr, path_size, true); - + /* Only the size of constant or generated binary data is considered */ if ((ret.tag == SYSINFO_VAL_DATA) || (ret.tag == SYSINFO_VAL_FUNCTION_DATA)) @@ -964,5 +964,5 @@ else rc = EINVAL; - + return (sys_errno_t) rc; } @@ -999,9 +999,9 @@ { errno_t rc; - + /* Get the item */ sysinfo_return_t ret = sysinfo_get_item_uspace(path_ptr, path_size, false); - + /* Only constant or generated binary data is considered */ if ((ret.tag == SYSINFO_VAL_DATA) || @@ -1013,9 +1013,9 @@ } else rc = EINVAL; - + /* N.B.: The generated binary data should be freed */ if ((ret.tag == SYSINFO_VAL_FUNCTION_DATA) && (ret.data.data != NULL)) free(ret.data.data); - + return (sys_errno_t) rc; }