Index: uspace/dist/src/c/demos/edit/edit.c =================================================================== --- uspace/dist/src/c/demos/edit/edit.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/dist/src/c/demos/edit/edit.c (revision 34e1206ec4dc79f0592077e3ee270fba91d1eb9d) @@ -88,5 +88,5 @@ */ int ideal_column; - + char *previous_search; bool previous_search_reverse; @@ -532,8 +532,8 @@ pane.rflags |= REDRAW_TEXT; } - + if (update_ideal_column) pane.ideal_column = c_new.column; - + caret_update(); } @@ -608,5 +608,5 @@ const char *old_fname = (doc.file_name != NULL) ? doc.file_name : ""; char *fname; - + fname = prompt("Save As", old_fname); if (fname == NULL) { @@ -815,5 +815,5 @@ /* Clear the remaining rows if file is short. */ - + int i; sysarg_t j; @@ -905,5 +905,5 @@ console_flush(con); } - + if ((csel_end.row == rbc.row) && (csel_end.column == s_column)) { console_flush(con); @@ -911,5 +911,5 @@ console_flush(con); } - + c = str_decode(row_buf, &pos, size); if (c != '\t') { @@ -966,5 +966,5 @@ int n = printf(" %d, %d (%d): File '%s'. Ctrl-Q Quit Ctrl-S Save " "Ctrl-E Save As", coord.row, coord.column, last_row, fname); - + int pos = scr_columns - 1 - n; printf("%*s", pos, ""); @@ -1151,8 +1151,8 @@ coord.row = row; coord.column = column; - + spt_t pt; sheet_get_cell_pt(doc.sh, &coord, align_dir, &pt); - + caret_move(pt, select, true); } @@ -1196,5 +1196,5 @@ { char *sline; - + sline = prompt("Go to line", ""); if (sline == NULL) { @@ -1202,5 +1202,5 @@ return; } - + char *endptr; int line = strtol(sline, &endptr, 10); @@ -1211,5 +1211,5 @@ } free(sline); - + caret_move_absolute(line, pane.ideal_column, dir_before, false); } @@ -1270,13 +1270,13 @@ { char *pattern; - + const char *prompt_text = "Find next"; if (reverse) prompt_text = "Find previous"; - + const char *default_value = ""; if (pane.previous_search) default_value = pane.previous_search; - + pattern = prompt(prompt_text, default_value); if (pattern == NULL) { @@ -1284,10 +1284,10 @@ return; } - + if (pane.previous_search) free(pane.previous_search); pane.previous_search = pattern; pane.previous_search_reverse = reverse; - + search(pattern, reverse); } @@ -1299,5 +1299,5 @@ return; } - + search(pane.previous_search, pane.previous_search_reverse); } @@ -1306,8 +1306,8 @@ { status_display("Searching..."); - + spt_t sp, producer_pos; tag_get_pt(&pane.caret_pos, &sp); - + /* Start searching on the position before/after caret */ if (!reverse) { @@ -1318,9 +1318,9 @@ } producer_pos = sp; - + search_ops_t ops = search_spt_ops; if (reverse) ops = search_spt_reverse_ops; - + search_t *search = search_init(pattern, &producer_pos, ops, reverse); if (search == NULL) { @@ -1328,5 +1328,5 @@ return; } - + match_t match; errno_t rc = search_next_match(search, &match); @@ -1335,5 +1335,5 @@ search_fini(search); } - + if (match.end) { status_display("Match found."); @@ -1356,5 +1356,5 @@ status_display("Not found."); } - + search_fini(search); } @@ -1649,5 +1649,5 @@ console_set_pos(con, 0, scr_rows - 1); console_set_style(con, STYLE_INVERTED); - + int pos = -(scr_columns - 3); printf(" %*s ", pos, str); Index: uspace/dist/src/c/demos/edit/search.c =================================================================== --- uspace/dist/src/c/demos/edit/search.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/dist/src/c/demos/edit/search.c (revision 34e1206ec4dc79f0592077e3ee270fba91d1eb9d) @@ -48,5 +48,5 @@ if (search == NULL) return NULL; - + wchar_t *p = str_to_awstr(pattern); if (p == NULL) { @@ -54,7 +54,7 @@ return NULL; } - + search->pattern_length = wstr_length(p); - + if (reverse) { /* Reverse the pattern */ @@ -67,7 +67,7 @@ } } - + search->pattern = p; - + search->client_data = client_data; search->ops = ops; @@ -78,7 +78,7 @@ return NULL; } - + search->pattern_pos = 0; - + search->back_table[0] = -1; search->back_table[1] = 0; @@ -100,5 +100,5 @@ } } - + return search; } @@ -107,5 +107,5 @@ { search_equals_fn eq = s->ops.equals; - + wchar_t cur_char; errno_t rc = EOK; @@ -128,8 +128,8 @@ } } - + match->end = NULL; match->length = 0; - + return rc; } @@ -139,5 +139,5 @@ free(search->pattern); free(search->back_table); - + } Index: uspace/dist/src/c/demos/edit/sheet.c =================================================================== --- uspace/dist/src/c/demos/edit/sheet.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/dist/src/c/demos/edit/sheet.c (revision 34e1206ec4dc79f0592077e3ee270fba91d1eb9d) @@ -263,5 +263,5 @@ coord.row = row; coord.column = 65536; - + sheet_get_cell_pt(sh, &coord, dir_before, &pt); spt_get_coord(&pt, &coord); Index: uspace/dist/src/c/demos/tetris/scores.c =================================================================== --- uspace/dist/src/c/demos/tetris/scores.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/dist/src/c/demos/tetris/scores.c (revision 34e1206ec4dc79f0592077e3ee270fba91d1eb9d) @@ -99,14 +99,14 @@ { int i; - + clear_screen(); moveto(10, 0); printf("\tRank \tLevel \tName\t points\n"); printf("\t========================================================\n"); - + for (i = 0; i < NUMSPOTS - 1; i++) printf("\t%6d %6d %-16s %20d\n", i + 1, scores[i].hs_level, scores[i].hs_name, scores[i].hs_score); - + if (!firstgame) { printf("\t========================================================\n"); @@ -114,5 +114,5 @@ scores[NUMSPOTS - 1].hs_level, scores[NUMSPOTS - 1].hs_name, scores[NUMSPOTS - 1].hs_score); } - + printf("\n\n\n\n\tPress any key to return to main menu."); getchar(); @@ -126,5 +126,5 @@ cons_event_t ev; kbd_event_t *kev; - + clear_screen(); moveto(10, 10); @@ -134,26 +134,26 @@ i = 6; off = 6; - + moveto(10 , 28); printf("%s%.*s", scores[NUMSPOTS - 1].hs_name, MAXLOGNAME-i, "........................................"); - + while (1) { console_flush(console); if (!console_get_event(console, &ev)) exit(1); - + if (ev.type != CEV_KEY || ev.ev.key.type == KEY_RELEASE) continue; - + kev = &ev.ev.key; - + if (kev->key == KC_ENTER || kev->key == KC_NENTER) break; - + if (kev->key == KC_BACKSPACE) { if (i > 0) { wchar_t uc; - + --i; while (off > 0) { @@ -165,5 +165,5 @@ break; } - + scores[NUMSPOTS - 1].hs_name[off] = '\0'; } @@ -177,20 +177,20 @@ } } - + moveto(10, 28); printf("%s%.*s", scores[NUMSPOTS - 1].hs_name, MAXLOGNAME - i, "........................................"); } - + scores[NUMSPOTS - 1].hs_score = score; scores[NUMSPOTS - 1].hs_level = level; - + i = NUMSPOTS - 1; while ((i > 0) && (scores[i - 1].hs_score < score)) i--; - + for (j = NUMSPOTS - 2; j > i; j--) copyhiscore(j, j-1); - + copyhiscore(i, NUMSPOTS - 1); } @@ -236,5 +236,5 @@ return; } - + cnt = fwrite(scores, sizeof(struct highscore), NUMSPOTS, f); rc = fclose(f); Index: uspace/dist/src/c/demos/tetris/screen.c =================================================================== --- uspace/dist/src/c/demos/tetris/screen.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/dist/src/c/demos/tetris/screen.c (revision 34e1206ec4dc79f0592077e3ee270fba91d1eb9d) @@ -148,8 +148,8 @@ sysarg_t ccap; errno_t rc = console_get_color_cap(console, &ccap); - + if (rc != EOK) return false; - + return ((ccap & CONSOLE_CAP_RGB) == CONSOLE_CAP_RGB); } @@ -161,8 +161,8 @@ { winsize_t ws; - + Rows = 0; Cols = 0; - + if (get_display_size(&ws) == 0) { Rows = ws.ws_row; @@ -171,8 +171,8 @@ use_color = get_display_color_sup(); - + if ((Rows < MINROWS) || (Cols < MINCOLS)) { char smallscr[55]; - + snprintf(smallscr, sizeof(smallscr), "the screen is too small (must be at least %dx%d)", @@ -181,5 +181,5 @@ } isset = 1; - + scr_clear(); } @@ -197,5 +197,5 @@ if (isset) scr_end(); - + errx(1, "aborting: %s", why); } @@ -213,8 +213,8 @@ int j; int ccol; - + /* Always leave cursor after last displayed point */ curscreen[D_LAST * B_COLS - 1] = -1; - + if (score != curscore) { moveto(0, 0); @@ -222,5 +222,5 @@ curscore = score; } - + /* Draw preview of next pattern */ if ((showpreview) && (nextshape != lastshape)) { @@ -228,7 +228,7 @@ static int r = 5, c = 2; int tr, tc, t; - + lastshape = nextshape; - + /* Clean */ resume_normal(); @@ -241,8 +241,8 @@ moveto(r + 2, c - 1); putstr(" "); - + moveto(r - 3, c - 2); putstr("Next shape:"); - + /* Draw */ start_standout(nextshape->color); @@ -252,8 +252,8 @@ t = c + r * B_COLS; t += nextshape->off[i]; - + tr = t / B_COLS; tc = t % B_COLS; - + moveto(tr, 2*tc); putstr(" "); @@ -261,5 +261,5 @@ resume_normal(); } - + bp = &board[D_FIRST * B_COLS]; sp = &curscreen[D_FIRST * B_COLS]; @@ -269,5 +269,5 @@ if (*sp == (so = *bp)) continue; - + *sp = so; if (i != ccol) { @@ -278,5 +278,5 @@ moveto(RTOD(j), CTOD(i)); } - + if (so != cur_so) { if (so) @@ -287,5 +287,5 @@ } putstr(" "); - + ccol = i + 1; /* @@ -297,8 +297,8 @@ * the next cell is a different color. */ - + if ((i > STOP) || (sp[1] != bp[1]) || (so != bp[1])) continue; - + if (sp[2] != bp[2]) sp[1] = -1; @@ -309,8 +309,8 @@ } } - + if (cur_so) resume_normal(); - + console_flush(console); } @@ -323,7 +323,7 @@ { int l = str_size(s); - + moveto(Rows - 2, ((Cols - l) >> 1) - 1); - + if (set) putstr(s); @@ -341,8 +341,8 @@ { suseconds_t timeout = fallrate; - + while (timeout > 0) { cons_event_t event; - + if (!console_get_event_timeout(console, &event, &timeout)) break; @@ -359,10 +359,10 @@ * and increase speed. */ - + if (timeleft <= 0) { faster(); timeleft = fallrate; } - + /* * Wait to see if there is any input. If so, take it and @@ -371,19 +371,19 @@ * make timeleft zero and return -1. */ - + wchar_t c = 0; - + while (c == 0) { cons_event_t event; - + if (!console_get_event_timeout(console, &event, &timeleft)) { timeleft = 0; return -1; } - + if (event.type == CEV_KEY && event.ev.key.type == KEY_PRESS) c = event.ev.key.c; } - + return (int) c; } @@ -395,15 +395,15 @@ { wchar_t c = 0; - + while (c == 0) { cons_event_t event; - + if (!console_get_event(console, &event)) return -1; - + if (event.type == CEV_KEY && event.ev.key.type == KEY_PRESS) c = event.ev.key.c; } - + return (int) c; } Index: uspace/dist/src/c/demos/tetris/shapes.c =================================================================== --- uspace/dist/src/c/demos/tetris/shapes.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/dist/src/c/demos/tetris/shapes.c (revision 34e1206ec4dc79f0592077e3ee270fba91d1eb9d) @@ -96,9 +96,9 @@ { const int *o = shape->off; - + if ((board[pos]) || (board[pos + *o++]) || (board[pos + *o++]) || (board[pos + *o])) return 0; - + return 1; } @@ -111,5 +111,5 @@ { const int *o = shape->off; - + board[pos] = onoff ? shape->color : 0x000000; board[pos + *o++] = onoff ? shape->color : 0x000000; Index: uspace/dist/src/c/demos/tetris/tetris.c =================================================================== --- uspace/dist/src/c/demos/tetris/tetris.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/dist/src/c/demos/tetris/tetris.c (revision 34e1206ec4dc79f0592077e3ee270fba91d1eb9d) @@ -98,5 +98,5 @@ int i; cell *p = board; - + for (i = B_SIZE; i; i--) *p++ = (i <= (2 * B_COLS) || (i % B_COLS) < 2) ? 0x0000ff : 0x000000; @@ -113,5 +113,5 @@ int base; cell *p; - + for (i = A_FIRST; i < A_LAST; i++) { base = i * B_COLS + 1; @@ -122,19 +122,19 @@ rows++; memset(&board[base], 0, sizeof(cell) * (B_COLS - 2)); - + scr_update(); tsleep(); - + while (--base != 0) board[base + B_COLS] = board[base]; - + scr_update(); tsleep(); - + break; } } } - + switch (rows) { case 1: @@ -160,8 +160,8 @@ int i; int j = rand() % 4; - + for (i = 0; i < j; i++) tmp = &shapes[classic ? tmp->rotc : tmp->rot]; - + return (tmp); } @@ -170,5 +170,5 @@ { struct timeval tv; - + gettimeofday(&tv, NULL); srand(tv.tv_sec + tv.tv_usec / 100000); @@ -180,5 +180,5 @@ moveto(5, 10); puts("Tetris\n\n"); - + moveto(8, 10); printf("Level = %d (press keys 1 - 9 to change)", level); @@ -202,5 +202,5 @@ while (1) { int i = getchar(); - + switch(i) { case 'p': @@ -249,12 +249,12 @@ int j; int ch; - + console = console_init(stdin, stdout); - + keys = "jkl pq"; - + classic = 0; showpreview = 1; - + while ((ch = getopt(argc, argv, "ck:ps")) != -1) switch(ch) { @@ -280,11 +280,11 @@ usage(); } - + argc -= optind; argv += optind; - + if (argc) usage(); - + for (i = 0; i <= 5; i++) { for (j = i + 1; j <= 5; j++) { @@ -292,5 +292,5 @@ errx(1, "%s", "duplicate command keys specified."); } - + if (keys[i] == ' ') str_cpy(key_write[i], sizeof(key_write[i]), ""); @@ -300,10 +300,10 @@ } } - + snprintf(key_msg, sizeof(key_msg), "%s - left %s - rotate %s - right %s - drop %s - pause %s - quit", key_write[0], key_write[1], key_write[2], key_write[3], key_write[4], key_write[5]); - + scr_init(); if (loadscores() != EOK) @@ -312,17 +312,17 @@ while (tetris_menu(&level)) { fallrate = 1000000 / level; - + scr_clear(); setup_board(); - + srandomdev(); scr_set(); - + pos = A_FIRST * B_COLS + (B_COLS / 2) - 1; nextshape = randshape(); curshape = randshape(); - + scr_msg(key_msg, 1); - + while (1) { place(curshape, pos, 1); @@ -338,5 +338,5 @@ continue; } - + /* * Put up the current shape `permanently', @@ -346,5 +346,5 @@ score++; elide(); - + /* * Choose a new shape. If it does not fit, @@ -354,11 +354,11 @@ nextshape = randshape(); pos = A_FIRST * B_COLS + (B_COLS / 2) - 1; - + if (!fits_in(curshape, pos)) break; - - continue; - } - + + continue; + } + /* * Handle command keys. @@ -368,9 +368,9 @@ break; } - + if (c == keys[4]) { static char msg[] = "paused - press RETURN to continue"; - + place(curshape, pos, 1); do { @@ -380,5 +380,5 @@ console_flush(console); } while (!twait()); - + scr_msg(msg, 0); scr_msg(key_msg, 1); @@ -386,5 +386,5 @@ continue; } - + if (c == keys[0]) { /* move left */ @@ -393,15 +393,15 @@ continue; } - + if (c == keys[1]) { /* turn */ const struct shape *new = &shapes[classic ? curshape->rotc : curshape->rot]; - + if (fits_in(new, pos)) curshape = new; continue; } - + if (c == keys[2]) { /* move right */ @@ -410,5 +410,5 @@ continue; } - + if (c == keys[3]) { /* move to bottom */ @@ -419,5 +419,5 @@ continue; } - + if (c == '\f') { scr_clear(); @@ -425,5 +425,5 @@ } } - + scr_clear(); loadscores(); @@ -432,9 +432,9 @@ score = 0; } - + scr_clear(); printf("\nGame over.\n"); scr_end(); - + return 0; } Index: uspace/dist/src/c/demos/top/screen.c =================================================================== --- uspace/dist/src/c/demos/top/screen.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/dist/src/c/demos/top/screen.c (revision 34e1206ec4dc79f0592077e3ee270fba91d1eb9d) @@ -98,10 +98,10 @@ { screen_style_normal(); - + if (clear) { console_flush(console); console_clear(console); } - + screen_moveto(0, 0); } @@ -112,13 +112,13 @@ sysarg_t rows; screen_get_size(&cols, &rows); - + sysarg_t c; sysarg_t r; screen_get_pos(&c, &r); - + sysarg_t i; for (i = c + 1; i < cols; i++) puts(" "); - + if (r + 1 < rows) puts("\n"); @@ -128,8 +128,8 @@ { console = console_init(stdin, stdout); - + console_flush(console); console_cursor_visibility(console, false); - + screen_restart(true); } @@ -141,5 +141,5 @@ screen_restart(true); - + console_flush(console); console_cursor_visibility(console, true); @@ -149,5 +149,5 @@ { printf("%3" PRIu64 ".", ffloat.upper / ffloat.lower); - + unsigned int i; uint64_t rest = (ffloat.upper % ffloat.lower) * 10; @@ -156,5 +156,5 @@ rest = (rest % ffloat.lower) * 10; } - + printf("%%"); } @@ -165,9 +165,9 @@ sysarg_t rows; screen_get_size(&cols, &rows); - + sysarg_t c; sysarg_t r; screen_get_pos(&c, &r); - + if (c < cols) { int pos = cols - c - 1; @@ -183,5 +183,5 @@ data->hours, data->minutes, data->seconds, data->udays, data->uhours, data->uminutes, data->useconds); - + size_t i; for (i = 0; i < data->load_count; i++) { @@ -189,5 +189,5 @@ stats_print_load_fragment(data->load[i], 2); } - + screen_newline(); } @@ -208,9 +208,9 @@ size_t other = 0; size_t invalid = 0; - + size_t i; for (i = 0; i < data->threads_count; i++) { total++; - + switch (data->threads[i].state) { case Running: @@ -234,5 +234,5 @@ } } - + printf("threads: %zu total, %zu running, %zu ready, " "%zu sleeping, %zu lingering, %zu other, %zu invalid", @@ -250,8 +250,8 @@ char busy_suffix; char idle_suffix; - + order_suffix(data->cpus[i].busy_cycles, &busy, &busy_suffix); order_suffix(data->cpus[i].idle_cycles, &idle, &idle_suffix); - + printf("cpu%u (%4" PRIu16 " MHz): busy cycles: " "%" PRIu64 "%c, idle cycles: %" PRIu64 "%c", @@ -264,5 +264,5 @@ } else printf("cpu%u inactive", data->cpus[i].id); - + screen_newline(); } @@ -279,10 +279,10 @@ const char *used_suffix; const char *free_suffix; - + bin_order_suffix(data->physmem->total, &total, &total_suffix, false); bin_order_suffix(data->physmem->unavail, &unavail, &unavail_suffix, false); bin_order_suffix(data->physmem->used, &used, &used_suffix, false); bin_order_suffix(data->physmem->free, &free, &free_suffix, false); - + printf("memory: %" PRIu64 "%s total, %" PRIu64 "%s unavail, %" PRIu64 "%s used, %" PRIu64 "%s free", total, total_suffix, @@ -304,19 +304,19 @@ sysarg_t rows; screen_get_size(&cols, &rows); - - screen_newline(); - + + screen_newline(); + printf("Operation modes:"); screen_newline(); - + printf(" t .. tasks statistics"); screen_newline(); - + printf(" i .. IPC statistics"); screen_newline(); - + printf(" e .. exceptions statistics"); screen_newline(); - + printf(" a .. toggle display of all/hot exceptions"); screen_newline(); @@ -329,18 +329,18 @@ printf("Other keys:"); screen_newline(); - + printf(" s .. choose column to sort by"); screen_newline(); - + printf(" r .. toggle reversed sorting"); screen_newline(); - + printf(" q .. quit"); screen_newline(); - + sysarg_t col; sysarg_t row; screen_get_pos(&col, &row); - + while (row < rows) { screen_newline(); @@ -379,9 +379,9 @@ sysarg_t rows; screen_get_size(&cols, &rows); - + sysarg_t col; sysarg_t row; screen_get_pos(&col, &row); - + size_t i; for (i = 0; (i < table->num_fields) && (row < rows); i++) { @@ -440,5 +440,5 @@ } } - + while (row < rows) { screen_newline(); @@ -452,5 +452,5 @@ sysarg_t rows; screen_get_size(&cols, &rows); - + sysarg_t col; sysarg_t row; @@ -463,5 +463,5 @@ row++; } - + while (row < rows) { screen_newline(); @@ -493,5 +493,5 @@ print_physmem_info(data); print_warning(); - + switch (screen_mode) { case SCREEN_TABLE: @@ -506,5 +506,5 @@ print_help(); } - + console_flush(console); } @@ -526,5 +526,5 @@ vsnprintf(warning_text, warning_text_size, fmt, args); va_end(args); - + warning_timeleft = 2 * USEC_COUNT; @@ -542,8 +542,8 @@ * Reset timeleft whenever it is not positive. */ - + if (timeleft <= 0) timeleft = sec * USEC_COUNT; - + /* * Wait to see if there is any input. If so, take it and @@ -552,10 +552,10 @@ * make timeleft zero and return -1. */ - + wchar_t c = 0; - + while (c == 0) { cons_event_t event; - + warning_timeleft -= timeleft; if (!console_get_event_timeout(console, &event, &timeleft)) { @@ -564,9 +564,9 @@ } warning_timeleft += timeleft; - + if (event.type == CEV_KEY && event.ev.key.type == KEY_PRESS) c = event.ev.key.c; } - + return (int) c; } Index: uspace/dist/src/c/demos/top/top.c =================================================================== --- uspace/dist/src/c/demos/top/top.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/dist/src/c/demos/top/top.c (revision 34e1206ec4dc79f0592077e3ee270fba91d1eb9d) @@ -152,72 +152,72 @@ target->table.num_fields = 0; target->table.fields = NULL; - + /* Get current time */ struct timeval time; gettimeofday(&time, NULL); - + target->hours = (time.tv_sec % DAY) / HOUR; target->minutes = (time.tv_sec % HOUR) / MINUTE; target->seconds = time.tv_sec % MINUTE; - + /* Get uptime */ struct timeval uptime; getuptime(&uptime); - + target->udays = uptime.tv_sec / DAY; target->uhours = (uptime.tv_sec % DAY) / HOUR; target->uminutes = (uptime.tv_sec % HOUR) / MINUTE; target->useconds = uptime.tv_sec % MINUTE; - + /* Get load */ target->load = stats_get_load(&(target->load_count)); if (target->load == NULL) return "Cannot get system load"; - + /* Get CPUs */ target->cpus = stats_get_cpus(&(target->cpus_count)); if (target->cpus == NULL) return "Cannot get CPUs"; - + target->cpus_perc = (perc_cpu_t *) calloc(target->cpus_count, sizeof(perc_cpu_t)); if (target->cpus_perc == NULL) return "Not enough memory for CPU utilization"; - + /* Get tasks */ target->tasks = stats_get_tasks(&(target->tasks_count)); if (target->tasks == NULL) return "Cannot get tasks"; - + target->tasks_perc = (perc_task_t *) calloc(target->tasks_count, sizeof(perc_task_t)); if (target->tasks_perc == NULL) return "Not enough memory for task utilization"; - + /* Get threads */ target->threads = stats_get_threads(&(target->threads_count)); if (target->threads == NULL) return "Cannot get threads"; - + /* Get Exceptions */ target->exceptions = stats_get_exceptions(&(target->exceptions_count)); if (target->exceptions == NULL) return "Cannot get exceptions"; - + target->exceptions_perc = (perc_exc_t *) calloc(target->exceptions_count, sizeof(perc_exc_t)); if (target->exceptions_perc == NULL) return "Not enough memory for exception utilization"; - + /* Get physical memory */ target->physmem = stats_get_physmem(); if (target->physmem == NULL) return "Cannot get physical memory"; - + target->ucycles_diff = calloc(target->tasks_count, sizeof(uint64_t)); if (target->ucycles_diff == NULL) return "Not enough memory for user utilization"; - + /* Allocate memory for computed values */ target->kcycles_diff = calloc(target->tasks_count, @@ -225,15 +225,15 @@ if (target->kcycles_diff == NULL) return "Not enough memory for kernel utilization"; - + target->ecycles_diff = calloc(target->exceptions_count, sizeof(uint64_t)); if (target->ecycles_diff == NULL) return "Not enough memory for exception cycles utilization"; - + target->ecount_diff = calloc(target->exceptions_count, sizeof(uint64_t)); if (target->ecount_diff == NULL) return "Not enough memory for exception count utilization"; - + return NULL; } @@ -249,5 +249,5 @@ /* For each CPU: Compute total cycles and divide it between user and kernel */ - + size_t i; for (i = 0; i < new_data->cpus_count; i++) { @@ -257,19 +257,19 @@ new_data->cpus[i].busy_cycles - old_data->cpus[i].busy_cycles; uint64_t sum = idle + busy; - + FRACTION_TO_FLOAT(new_data->cpus_perc[i].idle, idle * 100, sum); FRACTION_TO_FLOAT(new_data->cpus_perc[i].busy, busy * 100, sum); } - + /* For all tasks compute sum and differencies of all cycles */ - + uint64_t virtmem_total = 0; uint64_t resmem_total = 0; uint64_t ucycles_total = 0; uint64_t kcycles_total = 0; - + for (i = 0; i < new_data->tasks_count; i++) { /* Match task with the previous instance */ - + bool found = false; size_t j; @@ -280,5 +280,5 @@ } } - + if (!found) { /* This is newly borned task, ignore it */ @@ -287,10 +287,10 @@ continue; } - + new_data->ucycles_diff[i] = new_data->tasks[i].ucycles - old_data->tasks[j].ucycles; new_data->kcycles_diff[i] = new_data->tasks[i].kcycles - old_data->tasks[j].kcycles; - + virtmem_total += new_data->tasks[i].virtmem; resmem_total += new_data->tasks[i].resmem; @@ -298,7 +298,7 @@ kcycles_total += new_data->kcycles_diff[i]; } - + /* For each task compute percential change */ - + for (i = 0; i < new_data->tasks_count; i++) { FRACTION_TO_FLOAT(new_data->tasks_perc[i].virtmem, @@ -311,10 +311,10 @@ new_data->kcycles_diff[i] * 100, kcycles_total); } - + /* For all exceptions compute sum and differencies of cycles */ - + uint64_t ecycles_total = 0; uint64_t ecount_total = 0; - + for (i = 0; i < new_data->exceptions_count; i++) { /* @@ -323,5 +323,5 @@ * usually disappear, but it does not hurt. */ - + bool found = false; size_t j; @@ -332,5 +332,5 @@ } } - + if (!found) { /* This is a new exception, ignore it */ @@ -339,16 +339,16 @@ continue; } - + new_data->ecycles_diff[i] = new_data->exceptions[i].cycles - old_data->exceptions[j].cycles; new_data->ecount_diff[i] = new_data->exceptions[i].count - old_data->exceptions[i].count; - + ecycles_total += new_data->ecycles_diff[i]; ecount_total += new_data->ecount_diff[i]; } - + /* For each exception compute percential change */ - + for (i = 0; i < new_data->exceptions_count; i++) { FRACTION_TO_FLOAT(new_data->exceptions_perc[i].cycles, @@ -363,5 +363,5 @@ field_t *fa = (field_t *)a + sort_column; field_t *fb = (field_t *)b + sort_column; - + if (fa->type > fb->type) return 1 * sort_reverse; @@ -535,38 +535,38 @@ if (target->load != NULL) free(target->load); - + if (target->cpus != NULL) free(target->cpus); - + if (target->cpus_perc != NULL) free(target->cpus_perc); - + if (target->tasks != NULL) free(target->tasks); - + if (target->tasks_perc != NULL) free(target->tasks_perc); - + if (target->threads != NULL) free(target->threads); - + if (target->exceptions != NULL) free(target->exceptions); - + if (target->exceptions_perc != NULL) free(target->exceptions_perc); - + if (target->physmem != NULL) free(target->physmem); - + if (target->ucycles_diff != NULL) free(target->ucycles_diff); - + if (target->kcycles_diff != NULL) free(target->kcycles_diff); - + if (target->ecycles_diff != NULL) free(target->ecycles_diff); - + if (target->ecount_diff != NULL) free(target->ecount_diff); @@ -581,14 +581,14 @@ data_t data_prev; const char *ret = NULL; - + screen_init(); printf("Reading initial data...\n"); - + if ((ret = read_data(&data)) != NULL) goto out; - + /* Compute some rubbish to have initialised values */ compute_percentages(&data, &data); - + /* And paint screen until death */ while (true) { @@ -601,5 +601,5 @@ goto out; } - + compute_percentages(&data_prev, &data); free_data(&data_prev); @@ -671,14 +671,14 @@ print_data(&data); } - + out: screen_done(); free_data(&data); - + if (ret != NULL) { fprintf(stderr, "%s: %s\n", NAME, ret); return 1; } - + return 0; } Index: uspace/dist/src/c/demos/top/top.h =================================================================== --- uspace/dist/src/c/demos/top/top.h (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/dist/src/c/demos/top/top.h (revision 34e1206ec4dc79f0592077e3ee270fba91d1eb9d) @@ -112,30 +112,30 @@ time_t minutes; time_t seconds; - + sysarg_t udays; sysarg_t uhours; sysarg_t uminutes; sysarg_t useconds; - + size_t load_count; load_t *load; - + size_t cpus_count; stats_cpu_t *cpus; perc_cpu_t *cpus_perc; - + size_t tasks_count; stats_task_t *tasks; perc_task_t *tasks_perc; - + size_t threads_count; stats_thread_t *threads; - + size_t exceptions_count; stats_exc_t *exceptions; perc_exc_t *exceptions_perc; - + stats_physmem_t *physmem; - + uint64_t *ucycles_diff; uint64_t *kcycles_diff;