Changeset d5a89a3 in mainline for kernel/generic/src


Ignore:
Timestamp:
2019-02-11T22:31:04Z (6 years ago)
Author:
Matthieu Riolo <matthieu.riolo@…>
Children:
aaf9789c
Parents:
e3272101 (diff), 4805495 (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:

merging with upstream/master

Location:
kernel/generic/src
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • kernel/generic/src/console/kconsole.c

    re3272101 rd5a89a3  
    156156
    157157/** Print count times a character */
    158 NO_TRACE static void print_cc(wchar_t ch, size_t count)
     158_NO_TRACE static void print_cc(wchar_t ch, size_t count)
    159159{
    160160        size_t i;
    … …  
    203203 *
    204204 */
    205 NO_TRACE static int cmdtab_compl(char *input, size_t size, indev_t *indev,
     205_NO_TRACE static int cmdtab_compl(char *input, size_t size, indev_t *indev,
    206206    hints_enum_func_t hints_enum)
    207207{
    … …  
    290290}
    291291
    292 NO_TRACE static cmd_info_t *parse_cmd(const wchar_t *cmdline)
     292_NO_TRACE static cmd_info_t *parse_cmd(const wchar_t *cmdline)
    293293{
    294294        size_t start = 0;
    … …  
    331331}
    332332
    333 NO_TRACE static wchar_t *clever_readline(const char *prompt, indev_t *indev,
     333_NO_TRACE static wchar_t *clever_readline(const char *prompt, indev_t *indev,
    334334    char *tmp)
    335335{
    … …  
    548548}
    549549
    550 NO_TRACE static bool parse_int_arg(const char *text, size_t len,
     550_NO_TRACE static bool parse_int_arg(const char *text, size_t len,
    551551    sysarg_t *result)
    552552{
    … …  
    637637 *
    638638 */
    639 NO_TRACE static bool parse_argument(const char *cmdline, size_t size,
     639_NO_TRACE static bool parse_argument(const char *cmdline, size_t size,
    640640    size_t *start, size_t *end)
    641641{
    … …  
    674674 *
    675675 */
    676 NO_TRACE static cmd_info_t *parse_cmdline(const char *cmdline, size_t size)
     676_NO_TRACE static cmd_info_t *parse_cmdline(const char *cmdline, size_t size)
    677677{
    678678        size_t start = 0;

  • kernel/generic/src/ddi/ddi.c

    re3272101 rd5a89a3  
    121121 *
    122122 */
    123 NO_TRACE static errno_t physmem_map(uintptr_t phys, size_t pages,
     123_NO_TRACE static errno_t physmem_map(uintptr_t phys, size_t pages,
    124124    unsigned int flags, uintptr_t *virt, uintptr_t bound)
    125125{
    … …  
    227227}
    228228
    229 NO_TRACE static errno_t physmem_unmap(uintptr_t virt)
     229_NO_TRACE static errno_t physmem_unmap(uintptr_t virt)
    230230{
    231231        assert(TASK);
    … …  
    312312 *
    313313 */
    314 NO_TRACE static errno_t iospace_enable(task_id_t id, uintptr_t ioaddr, size_t size)
     314_NO_TRACE static errno_t iospace_enable(task_id_t id, uintptr_t ioaddr, size_t size)
    315315{
    316316        /*
    … …  
    353353 *
    354354 */
    355 NO_TRACE static errno_t iospace_disable(task_id_t id, uintptr_t ioaddr, size_t size)
     355_NO_TRACE static errno_t iospace_disable(task_id_t id, uintptr_t ioaddr, size_t size)
    356356{
    357357        /*
    … …  
    413413}
    414414
    415 NO_TRACE static errno_t dmamem_map(uintptr_t virt, size_t size, unsigned int map_flags,
     415_NO_TRACE static errno_t dmamem_map(uintptr_t virt, size_t size, unsigned int map_flags,
    416416    unsigned int flags, uintptr_t *phys)
    417417{
    … …  
    422422}
    423423
    424 NO_TRACE static errno_t dmamem_map_anonymous(size_t size, uintptr_t constraint,
     424_NO_TRACE static errno_t dmamem_map_anonymous(size_t size, uintptr_t constraint,
    425425    unsigned int map_flags, unsigned int flags, uintptr_t *phys,
    426426    uintptr_t *virt, uintptr_t bound)
    … …  
    451451}
    452452
    453 NO_TRACE static errno_t dmamem_unmap(uintptr_t virt, size_t size)
     453_NO_TRACE static errno_t dmamem_unmap(uintptr_t virt, size_t size)
    454454{
    455455        // TODO: implement unlocking & unmap
    … …  
    457457}
    458458
    459 NO_TRACE static errno_t dmamem_unmap_anonymous(uintptr_t virt)
     459_NO_TRACE static errno_t dmamem_unmap_anonymous(uintptr_t virt)
    460460{
    461461        return as_area_destroy(TASK->as, virt);

  • kernel/generic/src/interrupt/interrupt.c

    re3272101 rd5a89a3  
    9999 *
    100100 */
    101 NO_TRACE void exc_dispatch(unsigned int n, istate_t *istate)
     101_NO_TRACE void exc_dispatch(unsigned int n, istate_t *istate)
    102102{
    103103#if (IVT_ITEMS > 0)
    … …  
    159159 *
    160160 */
    161 NO_TRACE static void exc_undef(unsigned int n, istate_t *istate)
     161_NO_TRACE static void exc_undef(unsigned int n, istate_t *istate)
    162162{
    163163        fault_if_from_uspace(istate, "Unhandled exception %u.", n);
    … …  
    165165}
    166166
    167 static NO_TRACE void
     167static _NO_TRACE void
    168168fault_from_uspace_core(istate_t *istate, const char *fmt, va_list args)
    169169{
    … …  
    185185 *
    186186 */
    187 NO_TRACE void fault_from_uspace(istate_t *istate, const char *fmt, ...)
     187_NO_TRACE void fault_from_uspace(istate_t *istate, const char *fmt, ...)
    188188{
    189189        va_list args;
    … …  
    197197 *
    198198 */
    199 NO_TRACE void fault_if_from_uspace(istate_t *istate, const char *fmt, ...)
     199_NO_TRACE void fault_if_from_uspace(istate_t *istate, const char *fmt, ...)
    200200{
    201201        if (!istate_from_uspace(istate))
    … …  
    233233 *
    234234 */
    235 NO_TRACE static int cmd_exc_print(cmd_arg_t *argv)
     235_NO_TRACE static int cmd_exc_print(cmd_arg_t *argv)
    236236{
    237237        bool excs_all;

  • kernel/generic/src/lib/str.c

    re3272101 rd5a89a3  
    11/*
    22 * Copyright (c) 2001-2004 Jakub Jermar
     3 * Copyright (c) 2005 Martin Decky
     4 * Copyright (c) 2008 Jiri Svoboda
     5 * Copyright (c) 2011 Martin Sucha
     6 * Copyright (c) 2011 Oleg Romanenko
    37 * All rights reserved.
    48 *
    … …  
    103107
    104108#include <str.h>
    105 #include <cpu.h>
    106 #include <arch/asm.h>
    107 #include <arch.h>
     109
     110#include <assert.h>
    108111#include <errno.h>
     112#include <stdbool.h>
     113#include <stddef.h>
     114#include <stdint.h>
     115#include <stdlib.h>
     116
    109117#include <align.h>
    110 #include <assert.h>
    111118#include <macros.h>
    112 #include <stdlib.h>
    113119
    114120/** Check the condition if wchar_t is signed */
    … …  
    616622}
    617623
     624/** Convert wide string to string.
     625 *
     626 * Convert wide string @a src to string. The output is written to the buffer
     627 * specified by @a dest and @a size. @a size must be non-zero and the string
     628 * written will always be well-formed.
     629 *
     630 * @param dest  Destination buffer.
     631 * @param size  Size of the destination buffer.
     632 * @param src   Source wide string.
     633 */
     634void wstr_to_str(char *dest, size_t size, const wchar_t *src)
     635{
     636        wchar_t ch;
     637        size_t src_idx;
     638        size_t dest_off;
     639
     640        /* There must be space for a null terminator in the buffer. */
     641        assert(size > 0);
     642
     643        src_idx = 0;
     644        dest_off = 0;
     645
     646        while ((ch = src[src_idx++]) != 0) {
     647                if (chr_encode(ch, dest, &dest_off, size - 1) != EOK)
     648                        break;
     649        }
     650
     651        dest[dest_off] = '\0';
     652}
     653
     654/** Find first occurence of character in string.
     655 *
     656 * @param str String to search.
     657 * @param ch  Character to look for.
     658 *
     659 * @return Pointer to character in @a str or NULL if not found.
     660 */
     661char *str_chr(const char *str, wchar_t ch)
     662{
     663        wchar_t acc;
     664        size_t off = 0;
     665        size_t last = 0;
     666
     667        while ((acc = str_decode(str, &off, STR_NO_LIMIT)) != 0) {
     668                if (acc == ch)
     669                        return (char *) (str + last);
     670                last = off;
     671        }
     672
     673        return NULL;
     674}
     675
     676/** Insert a wide character into a wide string.
     677 *
     678 * Insert a wide character into a wide string at position
     679 * @a pos. The characters after the position are shifted.
     680 *
     681 * @param str     String to insert to.
     682 * @param ch      Character to insert to.
     683 * @param pos     Character index where to insert.
     684 * @param max_pos Characters in the buffer.
     685 *
     686 * @return True if the insertion was sucessful, false if the position
     687 *         is out of bounds.
     688 *
     689 */
     690bool wstr_linsert(wchar_t *str, wchar_t ch, size_t pos, size_t max_pos)
     691{
     692        size_t len = wstr_length(str);
     693
     694        if ((pos > len) || (pos + 1 > max_pos))
     695                return false;
     696
     697        size_t i;
     698        for (i = len; i + 1 > pos; i--)
     699                str[i + 1] = str[i];
     700
     701        str[pos] = ch;
     702
     703        return true;
     704}
     705
     706/** Remove a wide character from a wide string.
     707 *
     708 * Remove a wide character from a wide string at position
     709 * @a pos. The characters after the position are shifted.
     710 *
     711 * @param str String to remove from.
     712 * @param pos Character index to remove.
     713 *
     714 * @return True if the removal was sucessful, false if the position
     715 *         is out of bounds.
     716 *
     717 */
     718bool wstr_remove(wchar_t *str, size_t pos)
     719{
     720        size_t len = wstr_length(str);
     721
     722        if (pos >= len)
     723                return false;
     724
     725        size_t i;
     726        for (i = pos + 1; i <= len; i++)
     727                str[i - 1] = str[i];
     728
     729        return true;
     730}
     731
    618732/** Duplicate string.
    619733 *
    … …  
    675789        str_ncpy(dest, size + 1, src, size);
    676790        return dest;
    677 }
    678 
    679 /** Convert wide string to string.
    680  *
    681  * Convert wide string @a src to string. The output is written to the buffer
    682  * specified by @a dest and @a size. @a size must be non-zero and the string
    683  * written will always be well-formed.
    684  *
    685  * @param dest  Destination buffer.
    686  * @param size  Size of the destination buffer.
    687  * @param src   Source wide string.
    688  */
    689 void wstr_to_str(char *dest, size_t size, const wchar_t *src)
    690 {
    691         wchar_t ch;
    692         size_t src_idx;
    693         size_t dest_off;
    694 
    695         /* There must be space for a null terminator in the buffer. */
    696         assert(size > 0);
    697 
    698         src_idx = 0;
    699         dest_off = 0;
    700 
    701         while ((ch = src[src_idx++]) != 0) {
    702                 if (chr_encode(ch, dest, &dest_off, size - 1) != EOK)
    703                         break;
    704         }
    705 
    706         dest[dest_off] = '\0';
    707 }
    708 
    709 /** Find first occurence of character in string.
    710  *
    711  * @param str String to search.
    712  * @param ch  Character to look for.
    713  *
    714  * @return Pointer to character in @a str or NULL if not found.
    715  *
    716  */
    717 char *str_chr(const char *str, wchar_t ch)
    718 {
    719         wchar_t acc;
    720         size_t off = 0;
    721         size_t last = 0;
    722 
    723         while ((acc = str_decode(str, &off, STR_NO_LIMIT)) != 0) {
    724                 if (acc == ch)
    725                         return (char *) (str + last);
    726                 last = off;
    727         }
    728 
    729         return NULL;
    730 }
    731 
    732 /** Insert a wide character into a wide string.
    733  *
    734  * Insert a wide character into a wide string at position
    735  * @a pos. The characters after the position are shifted.
    736  *
    737  * @param str     String to insert to.
    738  * @param ch      Character to insert to.
    739  * @param pos     Character index where to insert.
    740  * @param max_pos Characters in the buffer.
    741  *
    742  * @return True if the insertion was sucessful, false if the position
    743  *         is out of bounds.
    744  *
    745  */
    746 bool wstr_linsert(wchar_t *str, wchar_t ch, size_t pos, size_t max_pos)
    747 {
    748         size_t len = wstr_length(str);
    749 
    750         if ((pos > len) || (pos + 1 > max_pos))
    751                 return false;
    752 
    753         size_t i;
    754         for (i = len; i + 1 > pos; i--)
    755                 str[i + 1] = str[i];
    756 
    757         str[pos] = ch;
    758 
    759         return true;
    760 }
    761 
    762 /** Remove a wide character from a wide string.
    763  *
    764  * Remove a wide character from a wide string at position
    765  * @a pos. The characters after the position are shifted.
    766  *
    767  * @param str String to remove from.
    768  * @param pos Character index to remove.
    769  *
    770  * @return True if the removal was sucessful, false if the position
    771  *         is out of bounds.
    772  *
    773  */
    774 bool wstr_remove(wchar_t *str, size_t pos)
    775 {
    776         size_t len = wstr_length(str);
    777 
    778         if (pos >= len)
    779                 return false;
    780 
    781         size_t i;
    782         for (i = pos + 1; i <= len; i++)
    783                 str[i - 1] = str[i];
    784 
    785         return true;
    786791}
    787792

  • kernel/generic/src/main/main.c

    re3272101 rd5a89a3  
    160160 *
    161161 */
    162 NO_TRACE void main_bsp(void)
     162_NO_TRACE void main_bsp(void)
    163163{
    164164        config.cpu_count = 1;

  • kernel/generic/src/mm/as.c

    re3272101 rd5a89a3  
    127127static void used_space_shorten_ival(used_space_ival_t *, size_t);
    128128
    129 NO_TRACE static errno_t as_constructor(void *obj, unsigned int flags)
     129_NO_TRACE static errno_t as_constructor(void *obj, unsigned int flags)
    130130{
    131131        as_t *as = (as_t *) obj;
    … …  
    137137}
    138138
    139 NO_TRACE static size_t as_destructor(void *obj)
     139_NO_TRACE static size_t as_destructor(void *obj)
    140140{
    141141        return as_destructor_arch((as_t *) obj);
    … …  
    281281 *
    282282 */
    283 NO_TRACE void as_hold(as_t *as)
     283_NO_TRACE void as_hold(as_t *as)
    284284{
    285285        refcount_up(&as->refcount);
    … …  
    294294 *
    295295 */
    296 NO_TRACE void as_release(as_t *as)
     296_NO_TRACE void as_release(as_t *as)
    297297{
    298298        if (refcount_down(&as->refcount))
    … …  
    340340 * @return True if the two areas conflict, false otherwise.
    341341 */
    342 NO_TRACE static bool area_is_conflicting(uintptr_t addr,
     342_NO_TRACE static bool area_is_conflicting(uintptr_t addr,
    343343    size_t count, bool guarded, as_area_t *area)
    344344{
    … …  
    380380 *
    381381 */
    382 NO_TRACE static bool check_area_conflicts(as_t *as, uintptr_t addr,
     382_NO_TRACE static bool check_area_conflicts(as_t *as, uintptr_t addr,
    383383    size_t count, bool guarded, as_area_t *avoid)
    384384{
    … …  
    474474 *
    475475 */
    476 NO_TRACE static uintptr_t as_get_unmapped_area(as_t *as, uintptr_t bound,
     476_NO_TRACE static uintptr_t as_get_unmapped_area(as_t *as, uintptr_t bound,
    477477    size_t size, bool guarded)
    478478{
    … …  
    580580 * @param pagemap Pagemap
    581581 */
    582 NO_TRACE void as_pagemap_initialize(as_pagemap_t *pagemap)
     582_NO_TRACE void as_pagemap_initialize(as_pagemap_t *pagemap)
    583583{
    584584        odict_initialize(&pagemap->map, as_pagemap_getkey, as_pagemap_cmp);
    … …  
    591591 * @param pagemap Pagemap
    592592 */
    593 NO_TRACE void as_pagemap_finalize(as_pagemap_t *pagemap)
     593_NO_TRACE void as_pagemap_finalize(as_pagemap_t *pagemap)
    594594{
    595595        as_page_mapping_t *mapping = as_pagemap_first(pagemap);
    … …  
    606606 * @return First mapping or @c NULL if there is none
    607607 */
    608 NO_TRACE as_page_mapping_t *as_pagemap_first(as_pagemap_t *pagemap)
     608_NO_TRACE as_page_mapping_t *as_pagemap_first(as_pagemap_t *pagemap)
    609609{
    610610        odlink_t *odlink;
    … …  
    622622 * @return Next mapping or @c NULL if @a cur is the last one
    623623 */
    624 NO_TRACE as_page_mapping_t *as_pagemap_next(as_page_mapping_t *cur)
     624_NO_TRACE as_page_mapping_t *as_pagemap_next(as_page_mapping_t *cur)
    625625{
    626626        odlink_t *odlink;
    … …  
    640640 * @return EOK on succcess or ENOENT if no mapping found
    641641 */
    642 NO_TRACE errno_t as_pagemap_find(as_pagemap_t *pagemap, uintptr_t vaddr,
     642_NO_TRACE errno_t as_pagemap_find(as_pagemap_t *pagemap, uintptr_t vaddr,
    643643    uintptr_t *rframe)
    644644{
    … …  
    663663 * @param frame Physical frame address
    664664 */
    665 NO_TRACE void as_pagemap_insert(as_pagemap_t *pagemap, uintptr_t vaddr,
     665_NO_TRACE void as_pagemap_insert(as_pagemap_t *pagemap, uintptr_t vaddr,
    666666    uintptr_t frame)
    667667{
    … …  
    680680 * @param mapping Mapping
    681681 */
    682 NO_TRACE void as_pagemap_remove(as_page_mapping_t *mapping)
     682_NO_TRACE void as_pagemap_remove(as_page_mapping_t *mapping)
    683683{
    684684        odict_remove(&mapping->lpagemap);
    … …  
    693693 *
    694694 */
    695 NO_TRACE static void sh_info_remove_reference(share_info_t *sh_info)
     695_NO_TRACE static void sh_info_remove_reference(share_info_t *sh_info)
    696696{
    697697        bool dealloc = false;
    … …  
    861861 *
    862862 */
    863 NO_TRACE static as_area_t *find_area_and_lock(as_t *as, uintptr_t va)
     863_NO_TRACE static as_area_t *find_area_and_lock(as_t *as, uintptr_t va)
    864864{
    865865        assert(mutex_locked(&as->lock));
    … …  
    13051305 *
    13061306 */
    1307 NO_TRACE bool as_area_check_access(as_area_t *area, pf_access_t access)
     1307_NO_TRACE bool as_area_check_access(as_area_t *area, pf_access_t access)
    13081308{
    13091309        assert(mutex_locked(&area->lock));
    … …  
    13281328 *
    13291329 */
    1330 NO_TRACE static unsigned int area_flags_to_page_flags(unsigned int aflags)
     1330_NO_TRACE static unsigned int area_flags_to_page_flags(unsigned int aflags)
    13311331{
    13321332        unsigned int flags = PAGE_USER | PAGE_PRESENT;
    … …  
    16981698 *
    16991699 */
    1700 NO_TRACE unsigned int as_area_get_flags(as_area_t *area)
     1700_NO_TRACE unsigned int as_area_get_flags(as_area_t *area)
    17011701{
    17021702        assert(mutex_locked(&area->lock));
    … …  
    17461746 *
    17471747 */
    1748 NO_TRACE pte_t *page_table_create(unsigned int flags)
     1748_NO_TRACE pte_t *page_table_create(unsigned int flags)
    17491749{
    17501750        assert(as_operations);
    … …  
    17611761 *
    17621762 */
    1763 NO_TRACE void page_table_destroy(pte_t *page_table)
     1763_NO_TRACE void page_table_destroy(pte_t *page_table)
    17641764{
    17651765        assert(as_operations);
    … …  
    17821782 *
    17831783 */
    1784 NO_TRACE void page_table_lock(as_t *as, bool lock)
     1784_NO_TRACE void page_table_lock(as_t *as, bool lock)
    17851785{
    17861786        assert(as_operations);
    … …  
    17961796 *
    17971797 */
    1798 NO_TRACE void page_table_unlock(as_t *as, bool unlock)
     1798_NO_TRACE void page_table_unlock(as_t *as, bool unlock)
    17991799{
    18001800        assert(as_operations);
    … …  
    18111811 *         are locked, otherwise false.
    18121812 */
    1813 NO_TRACE bool page_table_locked(as_t *as)
     1813_NO_TRACE bool page_table_locked(as_t *as)
    18141814{
    18151815        assert(as_operations);

  • kernel/generic/src/mm/frame.c

    re3272101 rd5a89a3  
    7979 *
    8080 */
    81 NO_TRACE static void frame_initialize(frame_t *frame)
     81_NO_TRACE static void frame_initialize(frame_t *frame)
    8282{
    8383        frame->refcount = 0;
    … …  
    100100 *
    101101 */
    102 NO_TRACE static size_t zones_insert_zone(pfn_t base, size_t count,
     102_NO_TRACE static size_t zones_insert_zone(pfn_t base, size_t count,
    103103    zone_flags_t flags)
    104104{
    … …  
    156156 *
    157157 */
    158 NO_TRACE static size_t frame_total_free_get_internal(void)
     158_NO_TRACE static size_t frame_total_free_get_internal(void)
    159159{
    160160        size_t total = 0;
    … …  
    167167}
    168168
    169 NO_TRACE size_t frame_total_free_get(void)
     169_NO_TRACE size_t frame_total_free_get(void)
    170170{
    171171        size_t total;
    … …  
    190190 *
    191191 */
    192 NO_TRACE size_t find_zone(pfn_t frame, size_t count, size_t hint)
     192_NO_TRACE size_t find_zone(pfn_t frame, size_t count, size_t hint)
    193193{
    194194        if (hint >= zones.count)
    … …  
    211211
    212212/** @return True if zone can allocate specified number of frames */
    213 NO_TRACE static bool zone_can_alloc(zone_t *zone, size_t count,
     213_NO_TRACE static bool zone_can_alloc(zone_t *zone, size_t count,
    214214    pfn_t constraint)
    215215{
    … …  
    239239 *
    240240 */
    241 NO_TRACE static size_t find_free_zone_all(size_t count, zone_flags_t flags,
     241_NO_TRACE static size_t find_free_zone_all(size_t count, zone_flags_t flags,
    242242    pfn_t constraint, size_t hint)
    243243{
    … …  
    265265 *
    266266 */
    267 NO_TRACE static bool is_high_priority(pfn_t base, size_t count)
     267_NO_TRACE static bool is_high_priority(pfn_t base, size_t count)
    268268{
    269269        return (base + count <= FRAME_LOWPRIO);
    … …  
    285285 *
    286286 */
    287 NO_TRACE static size_t find_free_zone_lowprio(size_t count, zone_flags_t flags,
     287_NO_TRACE static size_t find_free_zone_lowprio(size_t count, zone_flags_t flags,
    288288    pfn_t constraint, size_t hint)
    289289{
    … …  
    322322 *
    323323 */
    324 NO_TRACE static size_t find_free_zone(size_t count, zone_flags_t flags,
     324_NO_TRACE static size_t find_free_zone(size_t count, zone_flags_t flags,
    325325    pfn_t constraint, size_t hint)
    326326{
    … …  
    346346
    347347/** Return frame from zone. */
    348 NO_TRACE static frame_t *zone_get_frame(zone_t *zone, size_t index)
     348_NO_TRACE static frame_t *zone_get_frame(zone_t *zone, size_t index)
    349349{
    350350        assert(index < zone->count);
    … …  
    366366 *
    367367 */
    368 NO_TRACE static size_t zone_frame_alloc(zone_t *zone, size_t count,
     368_NO_TRACE static size_t zone_frame_alloc(zone_t *zone, size_t count,
    369369    pfn_t constraint)
    370370{
    … …  
    405405 *
    406406 */
    407 NO_TRACE static size_t zone_frame_free(zone_t *zone, size_t index)
     407_NO_TRACE static size_t zone_frame_free(zone_t *zone, size_t index)
    408408{
    409409        assert(zone->flags & ZONE_AVAILABLE);
    … …  
    427427
    428428/** Mark frame in zone unavailable to allocation. */
    429 NO_TRACE static void zone_mark_unavailable(zone_t *zone, size_t index)
     429_NO_TRACE static void zone_mark_unavailable(zone_t *zone, size_t index)
    430430{
    431431        assert(zone->flags & ZONE_AVAILABLE);
    … …  
    453453 *
    454454 */
    455 NO_TRACE static void zone_merge_internal(size_t z1, size_t z2, zone_t *old_z1,
     455_NO_TRACE static void zone_merge_internal(size_t z1, size_t z2, zone_t *old_z1,
    456456    void *confdata)
    457457{
    … …  
    507507 *
    508508 */
    509 NO_TRACE static void return_config_frames(size_t znum, pfn_t pfn, size_t count)
     509_NO_TRACE static void return_config_frames(size_t znum, pfn_t pfn, size_t count)
    510510{
    511511        assert(zones.info[znum].flags & ZONE_AVAILABLE);
    … …  
    623623 *
    624624 */
    625 NO_TRACE static void zone_construct(zone_t *zone, pfn_t start, size_t count,
     625_NO_TRACE static void zone_construct(zone_t *zone, pfn_t start, size_t count,
    626626    zone_flags_t flags, void *confdata)
    627627{
    … …  
    10371037 *
    10381038 */
    1039 NO_TRACE void frame_reference_add(pfn_t pfn)
     1039_NO_TRACE void frame_reference_add(pfn_t pfn)
    10401040{
    10411041        irq_spinlock_lock(&zones.lock, true);
    … …  
    10561056 *
    10571057 */
    1058 NO_TRACE void frame_mark_unavailable(pfn_t start, size_t count)
     1058_NO_TRACE void frame_mark_unavailable(pfn_t start, size_t count)
    10591059{
    10601060        irq_spinlock_lock(&zones.lock, true);

  • kernel/generic/src/mm/page.c

    re3272101 rd5a89a3  
    9595 *
    9696 */
    97 NO_TRACE void page_mapping_insert(as_t *as, uintptr_t page, uintptr_t frame,
     97_NO_TRACE void page_mapping_insert(as_t *as, uintptr_t page, uintptr_t frame,
    9898    unsigned int flags)
    9999{
    … …  
    120120 *
    121121 */
    122 NO_TRACE void page_mapping_remove(as_t *as, uintptr_t page)
     122_NO_TRACE void page_mapping_remove(as_t *as, uintptr_t page)
    123123{
    124124        assert(page_table_locked(as));
    … …  
    144144 *         the PTE is not guaranteed to be present.
    145145 */
    146 NO_TRACE bool page_mapping_find(as_t *as, uintptr_t page, bool nolock,
     146_NO_TRACE bool page_mapping_find(as_t *as, uintptr_t page, bool nolock,
    147147    pte_t *pte)
    148148{
    … …  
    165165 * @param pte      New PTE.
    166166 */
    167 NO_TRACE void page_mapping_update(as_t *as, uintptr_t page, bool nolock,
     167_NO_TRACE void page_mapping_update(as_t *as, uintptr_t page, bool nolock,
    168168    pte_t *pte)
    169169{

  • kernel/generic/src/mm/slab.c

    re3272101 rd5a89a3  
    158158 *
    159159 */
    160 NO_TRACE static slab_t *slab_space_alloc(slab_cache_t *cache,
     160_NO_TRACE static slab_t *slab_space_alloc(slab_cache_t *cache,
    161161    unsigned int flags)
    162162{
    … …  
    206206 *
    207207 */
    208 NO_TRACE static size_t slab_space_free(slab_cache_t *cache, slab_t *slab)
     208_NO_TRACE static size_t slab_space_free(slab_cache_t *cache, slab_t *slab)
    209209{
    210210        frame_free(KA2PA(slab->start), slab->cache->frames);
    … …  
    218218
    219219/** Map object to slab structure */
    220 NO_TRACE static slab_t *obj2slab(void *obj)
     220_NO_TRACE static slab_t *obj2slab(void *obj)
    221221{
    222222        return (slab_t *) frame_get_parent(ADDR2PFN(KA2PA(obj)), 0);
    … …  
    234234 *
    235235 */
    236 NO_TRACE static size_t slab_obj_destroy(slab_cache_t *cache, void *obj,
     236_NO_TRACE static size_t slab_obj_destroy(slab_cache_t *cache, void *obj,
    237237    slab_t *slab)
    238238{
    … …  
    276276 *
    277277 */
    278 NO_TRACE static void *slab_obj_create(slab_cache_t *cache, unsigned int flags)
     278_NO_TRACE static void *slab_obj_create(slab_cache_t *cache, unsigned int flags)
    279279{
    280280        irq_spinlock_lock(&cache->slablock, true);
    … …  
    332332 *
    333333 */
    334 NO_TRACE static slab_magazine_t *get_mag_from_cache(slab_cache_t *cache,
     334_NO_TRACE static slab_magazine_t *get_mag_from_cache(slab_cache_t *cache,
    335335    bool first)
    336336{
    … …  
    357357 *
    358358 */
    359 NO_TRACE static void put_mag_to_cache(slab_cache_t *cache,
     359_NO_TRACE static void put_mag_to_cache(slab_cache_t *cache,
    360360    slab_magazine_t *mag)
    361361{
    … …  
    373373 *
    374374 */
    375 NO_TRACE static size_t magazine_destroy(slab_cache_t *cache,
     375_NO_TRACE static size_t magazine_destroy(slab_cache_t *cache,
    376376    slab_magazine_t *mag)
    377377{
    … …  
    392392 *
    393393 */
    394 NO_TRACE static slab_magazine_t *get_full_current_mag(slab_cache_t *cache)
     394_NO_TRACE static slab_magazine_t *get_full_current_mag(slab_cache_t *cache)
    395395{
    396396        slab_magazine_t *cmag = cache->mag_cache[CPU->id].current;
    … …  
    429429 *
    430430 */
    431 NO_TRACE static void *magazine_obj_get(slab_cache_t *cache)
     431_NO_TRACE static void *magazine_obj_get(slab_cache_t *cache)
    432432{
    433433        if (!CPU)
    … …  
    459459 *
    460460 */
    461 NO_TRACE static slab_magazine_t *make_empty_current_mag(slab_cache_t *cache)
     461_NO_TRACE static slab_magazine_t *make_empty_current_mag(slab_cache_t *cache)
    462462{
    463463        slab_magazine_t *cmag = cache->mag_cache[CPU->id].current;
    … …  
    509509 *
    510510 */
    511 NO_TRACE static int magazine_obj_put(slab_cache_t *cache, void *obj)
     511_NO_TRACE static int magazine_obj_put(slab_cache_t *cache, void *obj)
    512512{
    513513        if (!CPU)
    … …  
    538538 *
    539539 */
    540 NO_TRACE static size_t comp_objects(slab_cache_t *cache)
     540_NO_TRACE static size_t comp_objects(slab_cache_t *cache)
    541541{
    542542        if (cache->flags & SLAB_CACHE_SLINSIDE)
    … …  
    550550 *
    551551 */
    552 NO_TRACE static size_t badness(slab_cache_t *cache)
     552_NO_TRACE static size_t badness(slab_cache_t *cache)
    553553{
    554554        size_t objects = comp_objects(cache);
    … …  
    564564 *
    565565 */
    566 NO_TRACE static bool make_magcache(slab_cache_t *cache)
     566_NO_TRACE static bool make_magcache(slab_cache_t *cache)
    567567{
    568568        assert(_slab_initialized >= 2);
    … …  
    585585 *
    586586 */
    587 NO_TRACE static void _slab_cache_create(slab_cache_t *cache, const char *name,
     587_NO_TRACE static void _slab_cache_create(slab_cache_t *cache, const char *name,
    588588    size_t size, size_t align, errno_t (*constructor)(void *obj,
    589589    unsigned int kmflag), size_t (*destructor)(void *obj), unsigned int flags)
    … …  
    660660 *
    661661 */
    662 NO_TRACE static size_t _slab_reclaim(slab_cache_t *cache, unsigned int flags)
     662_NO_TRACE static size_t _slab_reclaim(slab_cache_t *cache, unsigned int flags)
    663663{
    664664        if (cache->flags & SLAB_CACHE_NOMAGAZINE)
    … …  
    707707 *
    708708 */
    709 NO_TRACE static void _slab_free(slab_cache_t *cache, void *obj, slab_t *slab)
     709_NO_TRACE static void _slab_free(slab_cache_t *cache, void *obj, slab_t *slab)
    710710{
    711711        if (!obj)

  • kernel/generic/src/proc/current.c

    re3272101 rd5a89a3  
    7070 *
    7171 */
    72 NO_TRACE void current_copy(current_t *src, current_t *dst)
     72_NO_TRACE void current_copy(current_t *src, current_t *dst)
    7373{
    7474        assert(src->magic == MAGIC);

  • kernel/generic/src/sysinfo/sysinfo.c

    re3272101 rd5a89a3  
    6262 *
    6363 */
    64 NO_TRACE static errno_t sysinfo_item_constructor(void *obj, unsigned int kmflag)
     64_NO_TRACE static errno_t sysinfo_item_constructor(void *obj, unsigned int kmflag)
    6565{
    6666        sysinfo_item_t *item = (sysinfo_item_t *) obj;
    … …  
    8282 *
    8383 */
    84 NO_TRACE static size_t sysinfo_item_destructor(void *obj)
     84_NO_TRACE static size_t sysinfo_item_destructor(void *obj)
    8585{
    8686        sysinfo_item_t *item = (sysinfo_item_t *) obj;
    … …  
    124124 *
    125125 */
    126 NO_TRACE static sysinfo_item_t *sysinfo_find_item(const char *name,
     126_NO_TRACE static sysinfo_item_t *sysinfo_find_item(const char *name,
    127127    sysinfo_item_t *subtree, sysinfo_return_t **ret, bool dry_run)
    128128{
    … …  
    190190 *
    191191 */
    192 NO_TRACE static sysinfo_item_t *sysinfo_create_path(const char *name,
     192_NO_TRACE static sysinfo_item_t *sysinfo_create_path(const char *name,
    193193    sysinfo_item_t **psubtree)
    194194{
    … …  
    508508 *
    509509 */
    510 NO_TRACE static void sysinfo_indent(size_t spaces)
     510_NO_TRACE static void sysinfo_indent(size_t spaces)
    511511{
    512512        for (size_t i = 0; i < spaces; i++)
    … …  
    522522 *
    523523 */
    524 NO_TRACE static void sysinfo_dump_internal(sysinfo_item_t *root, size_t spaces)
     524_NO_TRACE static void sysinfo_dump_internal(sysinfo_item_t *root, size_t spaces)
    525525{
    526526        /* Walk all siblings */
    … …  
    622622 *
    623623 */
    624 NO_TRACE static sysinfo_return_t sysinfo_get_item(const char *name,
     624_NO_TRACE static sysinfo_return_t sysinfo_get_item(const char *name,
    625625    sysinfo_item_t **root, bool dry_run)
    626626{
    … …  
    677677 *
    678678 */
    679 NO_TRACE static sysinfo_return_t sysinfo_get_item_uspace(void *ptr, size_t size,
     679_NO_TRACE static sysinfo_return_t sysinfo_get_item_uspace(void *ptr, size_t size,
    680680    bool dry_run)
    681681{
    … …  
    720720 *
    721721 */
    722 NO_TRACE static sysinfo_return_t sysinfo_get_keys(const char *name,
     722_NO_TRACE static sysinfo_return_t sysinfo_get_keys(const char *name,
    723723    sysinfo_item_t **root, bool dry_run)
    724724{
    … …  
    786786 *
    787787 */
    788 NO_TRACE static sysinfo_return_t sysinfo_get_keys_uspace(void *ptr, size_t size,
     788_NO_TRACE static sysinfo_return_t sysinfo_get_keys_uspace(void *ptr, size_t size,
    789789    bool dry_run)
    790790{
Note: See TracChangeset for help on using the changeset viewer.