Changeset 09b859c in mainline for kernel/generic


Ignore:
Timestamp:
2010-07-07T18:37:44Z (15 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
77385fe
Parents:
e2ea4ab1 (diff), 22c3444 (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 from mainline.

Location:
kernel/generic
Files:
1 added
26 edited

Legend:

Unmodified
Added
Removed

  • kernel/generic/include/adt/avl.h

    re2ea4ab1 r09b859c  
    3434
    3535#ifndef KERN_AVLTREE_H_
    36 #define KERN_AVLTREE_H_ 
     36#define KERN_AVLTREE_H_
    3737
    3838#include <typedefs.h>
     39#include <trace.h>
    3940
    4041/**
    … …  
    110111 * @param t AVL tree.
    111112 */
    112 static inline void avltree_create(avltree_t *t)
     113NO_TRACE static inline void avltree_create(avltree_t *t)
    113114{
    114115        t->root = NULL;
    … …  
    120121 * @param node Node which is initialized.
    121122 */
    122 static inline void avltree_node_initialize(avltree_node_t *node)
     123NO_TRACE static inline void avltree_node_initialize(avltree_node_t *node)
    123124{
    124125        node->key = 0;

  • kernel/generic/include/adt/list.h

    re2ea4ab1 r09b859c  
    3737
    3838#include <typedefs.h>
     39#include <trace.h>
    3940
    4041/** Doubly linked list head and link type. */
    … …  
    5758 * @param link Pointer to link_t structure to be initialized.
    5859 */
    59 static inline void link_initialize(link_t *link)
     60NO_TRACE static inline void link_initialize(link_t *link)
    6061{
    6162        link->prev = NULL;
    … …  
    6970 * @param head Pointer to link_t structure representing head of the list.
    7071 */
    71 static inline void list_initialize(link_t *head)
     72NO_TRACE static inline void list_initialize(link_t *head)
    7273{
    7374        head->prev = head;
    … …  
    8283 * @param head Pointer to link_t structure representing head of the list.
    8384 */
    84 static inline void list_prepend(link_t *link, link_t *head)
     85NO_TRACE static inline void list_prepend(link_t *link, link_t *head)
    8586{
    8687        link->next = head->next;
    … …  
    9798 * @param head Pointer to link_t structure representing head of the list.
    9899 */
    99 static inline void list_append(link_t *link, link_t *head)
     100NO_TRACE static inline void list_append(link_t *link, link_t *head)
    100101{
    101102        link->prev = head->prev;
    … …  
    112113 *              contained in.
    113114 */
    114 static inline void list_remove(link_t *link)
     115NO_TRACE static inline void list_remove(link_t *link)
    115116{
    116117        link->next->prev = link->prev;
    … …  
    125126 * @param head Pointer to link_t structure representing head of the list.
    126127 */
    127 static inline bool list_empty(link_t *head)
     128NO_TRACE static inline bool list_empty(link_t *head)
    128129{
    129130        return head->next == head ? true : false;
    … …  
    143144 *              headless) list.
    144145 */
    145 static inline void headless_list_split_or_concat(link_t *part1, link_t *part2)
     146NO_TRACE static inline void headless_list_split_or_concat(link_t *part1, link_t *part2)
    146147{
    147148        link_t *hlp;
    … …  
    164165 *              headless list.
    165166 */
    166 static inline void headless_list_split(link_t *part1, link_t *part2)
     167NO_TRACE static inline void headless_list_split(link_t *part1, link_t *part2)
    167168{
    168169        headless_list_split_or_concat(part1, part2);
    … …  
    176177 * @param part2 Pointer to link_t structure leading the second headless list.
    177178 */
    178 static inline void headless_list_concat(link_t *part1, link_t *part2)
     179NO_TRACE static inline void headless_list_concat(link_t *part1, link_t *part2)
    179180{
    180181        headless_list_split_or_concat(part1, part2);

  • kernel/generic/include/atomic.h

    re2ea4ab1 r09b859c  
    4040#include <verify.h>
    4141
    42 ATOMIC static inline void atomic_set(atomic_t *val, atomic_count_t i)
     42NO_TRACE ATOMIC static inline void atomic_set(atomic_t *val, atomic_count_t i)
    4343    WRITES(&val->count)
    4444    REQUIRES_EXTENT_MUTABLE(val)
    … …  
    4747}
    4848
    49 ATOMIC static inline atomic_count_t atomic_get(atomic_t *val)
     49NO_TRACE ATOMIC static inline atomic_count_t atomic_get(atomic_t *val)
    5050    REQUIRES_EXTENT_MUTABLE(val)
    5151{

  • kernel/generic/include/bitops.h

    re2ea4ab1 r09b859c  
    3636#define KERN_BITOPS_H_
    3737
     38#include <trace.h>
     39
    3840#ifdef __32_BITS__
    3941        #define fnzb(arg)  fnzb32(arg)
    … …  
    4951 *
    5052 */
    51 static inline uint8_t fnzb32(uint32_t arg)
     53NO_TRACE static inline uint8_t fnzb32(uint32_t arg)
    5254{
    5355        uint8_t n = 0;
    … …  
    8486 *
    8587 */
    86 static inline uint8_t fnzb64(uint64_t arg)
     88NO_TRACE static inline uint8_t fnzb64(uint64_t arg)
    8789{
    8890        uint8_t n = 0;

  • kernel/generic/include/context.h

    re2ea4ab1 r09b859c  
    3737
    3838#include <typedefs.h>
     39#include <trace.h>
    3940#include <arch/context.h>
    4041
    … …  
    8990 *
    9091 */
    91 static inline void __attribute__((no_instrument_function))
    92     context_restore(context_t *ctx)
     92NO_TRACE static inline void context_restore(context_t *ctx)
    9393{
    9494        context_restore_arch(ctx);

  • kernel/generic/include/macros.h

    re2ea4ab1 r09b859c  
    3939
    4040#include <typedefs.h>
     41#include <trace.h>
    4142
    4243/** Return true if the intervals overlap.
    … …  
    4748 * @param sz2 Size of the second interval.
    4849 */
    49 static inline int __attribute__((no_instrument_function))
    50     overlaps(uintptr_t s1, size_t sz1, uintptr_t s2, size_t sz2)
     50NO_TRACE static inline int overlaps(uintptr_t s1, size_t sz1, uintptr_t s2,
     51    size_t sz2)
    5152{
    5253        uintptr_t e1 = s1 + sz1;

  • kernel/generic/include/main/main.h

    re2ea4ab1 r09b859c  
    3232/** @file
    3333 */
    34  
     34
    3535#ifndef KERN_MAIN_H_
    3636#define KERN_MAIN_H_

  • kernel/generic/include/main/version.h

    re2ea4ab1 r09b859c  
    4242/** @}
    4343 */
    44 

  • kernel/generic/include/mm/frame.h

    re2ea4ab1 r09b859c  
    3838
    3939#include <typedefs.h>
     40#include <trace.h>
    4041#include <adt/list.h>
    4142#include <mm/buddy.h>
    … …  
    115116extern zones_t zones;
    116117
    117 static inline uintptr_t PFN2ADDR(pfn_t frame)
     118NO_TRACE static inline uintptr_t PFN2ADDR(pfn_t frame)
    118119{
    119120        return (uintptr_t) (frame << FRAME_WIDTH);
    120121}
    121122
    122 static inline pfn_t ADDR2PFN(uintptr_t addr)
     123NO_TRACE static inline pfn_t ADDR2PFN(uintptr_t addr)
    123124{
    124125        return (pfn_t) (addr >> FRAME_WIDTH);
    125126}
    126127
    127 static inline size_t SIZE2FRAMES(size_t size)
     128NO_TRACE static inline size_t SIZE2FRAMES(size_t size)
    128129{
    129130        if (!size)
    … …  
    132133}
    133134
    134 static inline size_t FRAMES2SIZE(size_t frames)
     135NO_TRACE static inline size_t FRAMES2SIZE(size_t frames)
    135136{
    136137        return (size_t) (frames << FRAME_WIDTH);
    137138}
    138139
    139 static inline bool zone_flags_available(zone_flags_t flags)
     140NO_TRACE static inline bool zone_flags_available(zone_flags_t flags)
    140141{
    141142        return ((flags & (ZONE_RESERVED | ZONE_FIRMWARE)) == 0);
    … …  
    166167extern void frame_set_parent(pfn_t, void *, size_t);
    167168extern void frame_mark_unavailable(pfn_t, size_t);
    168 extern uintptr_t zone_conf_size(size_t);
     169extern size_t zone_conf_size(size_t);
    169170extern bool zone_merge(size_t, size_t);
    170171extern void zone_merge_all(void);

  • kernel/generic/include/security/cap.h

    re2ea4ab1 r09b859c  
    2727 */
    2828
    29 /** @addtogroup generic 
     29/** @addtogroup generic
    3030 * @{
    3131 */
    … …  
    3535/**
    3636 * @file
    37  * @brief       Capabilities definitions.
     37 * @brief Capabilities definitions.
    3838 *
    3939 * Capabilities represent virtual rights that entitle their

  • kernel/generic/include/smp/smp.h

    re2ea4ab1 r09b859c  
    2727 */
    2828
    29 /** @addtogroup generic 
     29/** @addtogroup generic
    3030 * @{
    3131 */
    … …  
    4141
    4242#ifdef CONFIG_SMP
     43
    4344extern void smp_init(void);
    4445extern void kmp(void *arg);
    45 #else
     46
     47#else /* CONFIG_SMP */
     48
    4649#define smp_init()
     50
    4751#endif /* CONFIG_SMP */
    4852

  • kernel/generic/include/synch/spinlock.h

    re2ea4ab1 r09b859c  
    124124 *
    125125 */
    126 static inline void spinlock_unlock_nondebug(spinlock_t *lock)
     126NO_TRACE static inline void spinlock_unlock_nondebug(spinlock_t *lock)
    127127{
    128128        /*

  • kernel/generic/include/syscall/sysarg64.h

    re2ea4ab1 r09b859c  
    3333/**
    3434 * @file
    35  * @brief       Wrapper for explicit 64-bit arguments passed to syscalls.
     35 * @brief Wrapper for explicit 64-bit arguments passed to syscalls.
    3636 */
    3737

  • kernel/generic/include/udebug/udebug_ipc.h

    re2ea4ab1 r09b859c  
    2727 */
    2828
    29 /** @addtogroup generic 
     29/** @addtogroup generic
    3030 * @{
    3131 */
    … …  
    4141void udebug_call_receive(call_t *call);
    4242
    43 
    4443#endif
    4544

  • kernel/generic/include/udebug/udebug_ops.h

    re2ea4ab1 r09b859c  
    2727 */
    2828
    29 /** @addtogroup generic 
     29/** @addtogroup generic
    3030 * @{
    3131 */

  • kernel/generic/src/adt/btree.c

    re2ea4ab1 r09b859c  
    5353#include <panic.h>
    5454#include <print.h>
     55#include <trace.h>
    5556
    5657static slab_cache_t *btree_node_slab;
    … …  
    7980 *
    8081 */
    81 static void node_initialize(btree_node_t *node)
     82NO_TRACE static void node_initialize(btree_node_t *node)
    8283{
    8384        unsigned int i;
    … …  
    118119 *
    119120 */
    120 static void btree_destroy_subtree(btree_node_t *root)
     121NO_TRACE static void btree_destroy_subtree(btree_node_t *root)
    121122{
    122123        size_t i;
    … …  
    151152 *
    152153 */
    153 static void node_insert_key_and_rsubtree(btree_node_t *node, btree_key_t key,
    154     void *value, btree_node_t *rsubtree)
     154NO_TRACE static void node_insert_key_and_rsubtree(btree_node_t *node,
     155    btree_key_t key, void *value, btree_node_t *rsubtree)
    155156{
    156157        size_t i;
    … …  
    186187 *
    187188 */
    188 static size_t find_key_by_subtree(btree_node_t *node, btree_node_t *subtree,
    189     bool right)
     189NO_TRACE static size_t find_key_by_subtree(btree_node_t *node,
     190    btree_node_t *subtree, bool right)
    190191{
    191192        size_t i;
    … …  
    209210 *
    210211 */
    211 static void node_remove_key_and_lsubtree(btree_node_t *node, btree_key_t key)
     212NO_TRACE static void node_remove_key_and_lsubtree(btree_node_t *node,
     213    btree_key_t key)
    212214{
    213215        size_t i;
    … …  
    242244 *
    243245 */
    244 static void node_remove_key_and_rsubtree(btree_node_t *node, btree_key_t key)
     246NO_TRACE static void node_remove_key_and_rsubtree(btree_node_t *node,
     247    btree_key_t key)
    245248{
    246249        size_t i, j;
    … …  
    273276 *
    274277 */
    275 static void node_insert_key_and_lsubtree(btree_node_t *node, btree_key_t key,
    276     void *value, btree_node_t *lsubtree)
     278NO_TRACE static void node_insert_key_and_lsubtree(btree_node_t *node,
     279    btree_key_t key, void *value, btree_node_t *lsubtree)
    277280{
    278281        size_t i;
    … …  
    313316 *
    314317 */
    315 static void rotate_from_left(btree_node_t *lnode, btree_node_t *rnode, size_t idx)
     318NO_TRACE static void rotate_from_left(btree_node_t *lnode, btree_node_t *rnode,
     319    size_t idx)
    316320{
    317321        btree_key_t key = lnode->key[lnode->keys - 1];
    … …  
    348352 *
    349353 */
    350 static void rotate_from_right(btree_node_t *lnode, btree_node_t *rnode, size_t idx)
     354NO_TRACE static void rotate_from_right(btree_node_t *lnode, btree_node_t *rnode,
     355    size_t idx)
    351356{
    352357        btree_key_t key = rnode->key[0];
    … …  
    385390 *
    386391 */
    387 static bool try_insert_by_rotation_to_left(btree_node_t *node,
     392NO_TRACE static bool try_insert_by_rotation_to_left(btree_node_t *node,
    388393    btree_key_t inskey, void *insvalue, btree_node_t *rsubtree)
    389394{
    … …  
    434439 *
    435440 */
    436 static bool try_insert_by_rotation_to_right(btree_node_t *node,
     441NO_TRACE static bool try_insert_by_rotation_to_right(btree_node_t *node,
    437442    btree_key_t inskey, void *insvalue, btree_node_t *rsubtree)
    438443{
    … …  
    488493 *
    489494 */
    490 static btree_node_t *node_split(btree_node_t *node, btree_key_t key,
     495NO_TRACE static btree_node_t *node_split(btree_node_t *node, btree_key_t key,
    491496    void *value, btree_node_t *rsubtree, btree_key_t *median)
    492497{
    … …  
    552557 *
    553558 */
    554 static void _btree_insert(btree_t *t, btree_key_t key, void *value,
     559NO_TRACE static void _btree_insert(btree_t *t, btree_key_t key, void *value,
    555560    btree_node_t *rsubtree, btree_node_t *node)
    556561{
    … …  
    639644 *
    640645 */
    641 static bool try_rotation_from_left(btree_node_t *rnode)
     646NO_TRACE static bool try_rotation_from_left(btree_node_t *rnode)
    642647{
    643648        size_t idx;
    … …  
    676681 *
    677682 */
    678 static bool try_rotation_from_right(btree_node_t *lnode)
     683NO_TRACE static bool try_rotation_from_right(btree_node_t *lnode)
    679684{
    680685        size_t idx;
    … …  
    714719 *
    715720 */
    716 static btree_node_t *node_combine(btree_node_t *node)
     721NO_TRACE static btree_node_t *node_combine(btree_node_t *node)
    717722{
    718723        size_t idx;
    … …  
    764769 *
    765770 */
    766 static void _btree_remove(btree_t *t, btree_key_t key, btree_node_t *node)
     771NO_TRACE static void _btree_remove(btree_t *t, btree_key_t key,
     772    btree_node_t *node)
    767773{
    768774        if (ROOT_NODE(node)) {

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

    re2ea4ab1 r09b859c  
    160160
    161161/** Print count times a character */
    162 static void print_cc(wchar_t ch, size_t count)
     162NO_TRACE static void print_cc(wchar_t ch, size_t count)
    163163{
    164164        size_t i;
    … …  
    168168
    169169/** Try to find a command beginning with prefix */
    170 static const char *cmdtab_search_one(const char *name, link_t **startpos)
     170NO_TRACE static const char *cmdtab_search_one(const char *name,
     171    link_t **startpos)
    171172{
    172173        size_t namelen = str_length(name);
    … …  
    202203 *
    203204 */
    204 static int cmdtab_compl(char *input, size_t size)
     205NO_TRACE static int cmdtab_compl(char *input, size_t size)
    205206{
    206207        const char *name = input;
    … …  
    237238}
    238239
    239 static wchar_t *clever_readline(const char *prompt, indev_t *indev)
     240NO_TRACE static wchar_t *clever_readline(const char *prompt, indev_t *indev)
    240241{
    241242        printf("%s> ", prompt);
    … …  
    422423}
    423424
    424 static bool parse_int_arg(const char *text, size_t len, unative_t *result)
     425NO_TRACE static bool parse_int_arg(const char *text, size_t len,
     426    unative_t *result)
    425427{
    426428        bool isaddr = false;
    … …  
    507509 *
    508510 */
    509 static bool parse_argument(const char *cmdline, size_t size, size_t *start, size_t *end)
     511NO_TRACE static bool parse_argument(const char *cmdline, size_t size,
     512    size_t *start, size_t *end)
    510513{
    511514        ASSERT(start != NULL);
    … …  
    543546 *
    544547 */
    545 static cmd_info_t *parse_cmdline(const char *cmdline, size_t size)
     548NO_TRACE static cmd_info_t *parse_cmdline(const char *cmdline, size_t size)
    546549{
    547550        size_t start = 0;

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

    re2ea4ab1 r09b859c  
    5252#include <align.h>
    5353#include <errno.h>
     54#include <trace.h>
    5455
    5556/** This lock protects the parea_btree. */
    … …  
    99100 *
    100101 */
    101 static int ddi_physmem_map(uintptr_t pf, uintptr_t vp, size_t pages,
     102NO_TRACE static int ddi_physmem_map(uintptr_t pf, uintptr_t vp, size_t pages,
    102103    unsigned int flags)
    103104{
    … …  
    187188 *
    188189 */
    189 static int ddi_iospace_enable(task_id_t id, uintptr_t ioaddr, size_t size)
     190NO_TRACE static int ddi_iospace_enable(task_id_t id, uintptr_t ioaddr,
     191    size_t size)
    190192{
    191193        /*

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

    re2ea4ab1 r09b859c  
    5555#include <arch/cycle.h>
    5656#include <str.h>
     57#include <trace.h>
    5758
    5859exc_table_t exc_table[IVT_ITEMS];
    … …  
    9798 *
    9899 */
    99 void exc_dispatch(unsigned int n, istate_t *istate)
    100 {
    101         ASSERT(CPU);
    102        
     100NO_TRACE void exc_dispatch(unsigned int n, istate_t *istate)
     101{
    103102#if (IVT_ITEMS > 0)
    104103        ASSERT(n < IVT_ITEMS);
    … …  
    113112       
    114113        /* Account CPU usage if it has waked up from sleep */
    115         irq_spinlock_lock(&CPU->lock, false);
    116         if (CPU->idle) {
    117                 uint64_t now = get_cycle();
    118                 CPU->idle_cycles += now - CPU->last_cycle;
    119                 CPU->last_cycle = now;
    120                 CPU->idle = false;
    121         }
    122         irq_spinlock_unlock(&CPU->lock, false);
     114        if (CPU) {
     115                irq_spinlock_lock(&CPU->lock, false);
     116                if (CPU->idle) {
     117                        uint64_t now = get_cycle();
     118                        CPU->idle_cycles += now - CPU->last_cycle;
     119                        CPU->last_cycle = now;
     120                        CPU->idle = false;
     121                }
     122                irq_spinlock_unlock(&CPU->lock, false);
     123        }
    123124       
    124125        uint64_t begin_cycle = get_cycle();
    … …  
    159160 *
    160161 */
    161 static void exc_undef(unsigned int n, istate_t *istate)
     162NO_TRACE static void exc_undef(unsigned int n, istate_t *istate)
    162163{
    163164        fault_if_from_uspace(istate, "Unhandled exception %u.", n);
    … …  
    168169 *
    169170 */
    170 void fault_if_from_uspace(istate_t *istate, const char *fmt, ...)
     171NO_TRACE void fault_if_from_uspace(istate_t *istate, const char *fmt, ...)
    171172{
    172173        if (!istate_from_uspace(istate))
    … …  
    215216 *
    216217 */
    217 static int cmd_exc_print(cmd_arg_t *argv)
     218NO_TRACE static int cmd_exc_print(cmd_arg_t *argv)
    218219{
    219220        bool excs_all;

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

    re2ea4ab1 r09b859c  
    131131 *
    132132 */
    133 void __attribute__((no_instrument_function)) main_bsp(void)
     133NO_TRACE void main_bsp(void)
    134134{
    135135        config.cpu_count = 1;

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

    re2ea4ab1 r09b859c  
    116116as_t *AS_KERNEL = NULL;
    117117
    118 static int as_constructor(void *obj, unsigned int flags)
     118NO_TRACE static int as_constructor(void *obj, unsigned int flags)
    119119{
    120120        as_t *as = (as_t *) obj;
    … …  
    128128}
    129129
    130 static size_t as_destructor(void *obj)
     130NO_TRACE static size_t as_destructor(void *obj)
    131131{
    132132        as_t *as = (as_t *) obj;
    … …  
    274274 *
    275275 */
    276 void as_hold(as_t *as)
     276NO_TRACE void as_hold(as_t *as)
    277277{
    278278        atomic_inc(&as->refcount);
    … …  
    287287 *
    288288 */
    289 void as_release(as_t *as)
     289NO_TRACE void as_release(as_t *as)
    290290{
    291291        if (atomic_predec(&as->refcount) == 0)
    … …  
    303303 *
    304304 */
    305 static bool check_area_conflicts(as_t *as, uintptr_t va, size_t size,
     305NO_TRACE static bool check_area_conflicts(as_t *as, uintptr_t va, size_t size,
    306306    as_area_t *avoid_area)
    307307{
    … …  
    463463 *
    464464 */
    465 static as_area_t *find_area_and_lock(as_t *as, uintptr_t va)
     465NO_TRACE static as_area_t *find_area_and_lock(as_t *as, uintptr_t va)
    466466{
    467467        ASSERT(mutex_locked(&as->lock));
    … …  
    717717 *
    718718 */
    719 static void sh_info_remove_reference(share_info_t *sh_info)
     719NO_TRACE static void sh_info_remove_reference(share_info_t *sh_info)
    720720{
    721721        bool dealloc = false;
    … …  
    987987 *
    988988 */
    989 bool as_area_check_access(as_area_t *area, pf_access_t access)
     989NO_TRACE bool as_area_check_access(as_area_t *area, pf_access_t access)
    990990{
    991991        int flagmap[] = {
    … …  
    10101010 *
    10111011 */
    1012 static unsigned int area_flags_to_page_flags(unsigned int aflags)
     1012NO_TRACE static unsigned int area_flags_to_page_flags(unsigned int aflags)
    10131013{
    10141014        unsigned int flags = PAGE_USER | PAGE_PRESENT;
    … …  
    13851385}
    13861386
    1387 
    1388 
    13891387/** Compute flags for virtual address translation subsytem.
    13901388 *
    … …  
    13941392 *
    13951393 */
    1396 unsigned int as_area_get_flags(as_area_t *area)
     1394NO_TRACE unsigned int as_area_get_flags(as_area_t *area)
    13971395{
    13981396        ASSERT(mutex_locked(&area->lock));
    … …  
    14121410 *
    14131411 */
    1414 pte_t *page_table_create(unsigned int flags)
     1412NO_TRACE pte_t *page_table_create(unsigned int flags)
    14151413{
    14161414        ASSERT(as_operations);
    … …  
    14271425 *
    14281426 */
    1429 void page_table_destroy(pte_t *page_table)
     1427NO_TRACE void page_table_destroy(pte_t *page_table)
    14301428{
    14311429        ASSERT(as_operations);
    … …  
    14481446 *
    14491447 */
    1450 void page_table_lock(as_t *as, bool lock)
     1448NO_TRACE void page_table_lock(as_t *as, bool lock)
    14511449{
    14521450        ASSERT(as_operations);
    … …  
    14621460 *
    14631461 */
    1464 void page_table_unlock(as_t *as, bool unlock)
     1462NO_TRACE void page_table_unlock(as_t *as, bool unlock)
    14651463{
    14661464        ASSERT(as_operations);
    … …  
    14771475 *         are locked, otherwise false.
    14781476 */
    1479 bool page_table_locked(as_t *as)
     1477NO_TRACE bool page_table_locked(as_t *as)
    14801478{
    14811479        ASSERT(as_operations);

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

    re2ea4ab1 r09b859c  
    7575/********************/
    7676
    77 static inline size_t frame_index(zone_t *zone, frame_t *frame)
     77NO_TRACE static inline size_t frame_index(zone_t *zone, frame_t *frame)
    7878{
    7979        return (size_t) (frame - zone->frames);
    8080}
    8181
    82 static inline size_t frame_index_abs(zone_t *zone, frame_t *frame)
     82NO_TRACE static inline size_t frame_index_abs(zone_t *zone, frame_t *frame)
    8383{
    8484        return (size_t) (frame - zone->frames) + zone->base;
    8585}
    8686
    87 static inline bool frame_index_valid(zone_t *zone, size_t index)
     87NO_TRACE static inline bool frame_index_valid(zone_t *zone, size_t index)
    8888{
    8989        return (index < zone->count);
    9090}
    9191
    92 static inline size_t make_frame_index(zone_t *zone, frame_t *frame)
     92NO_TRACE static inline size_t make_frame_index(zone_t *zone, frame_t *frame)
    9393{
    9494        return (frame - zone->frames);
    … …  
    100100 *
    101101 */
    102 static void frame_initialize(frame_t *frame)
     102NO_TRACE static void frame_initialize(frame_t *frame)
    103103{
    104104        frame->refcount = 1;
    … …  
    121121 *
    122122 */
    123 static size_t zones_insert_zone(pfn_t base, size_t count)
     123NO_TRACE static size_t zones_insert_zone(pfn_t base, size_t count)
    124124{
    125125        if (zones.count + 1 == ZONES_MAX) {
    … …  
    133133                if (overlaps(base, count,
    134134                    zones.info[i].base, zones.info[i].count)) {
    135                         printf("Zones overlap!\n");
     135                        printf("Zone (%p, %p) overlaps with zone (%p, %p)!\n",
     136                            PFN2ADDR(base), PFN2ADDR(base + count),
     137                            PFN2ADDR(zones.info[i].base),
     138                            PFN2ADDR(zones.info[i].base + zones.info[i].count));
    136139                        return (size_t) -1;
    137140                }
    … …  
    162165 */
    163166#ifdef CONFIG_DEBUG
    164 static size_t total_frames_free(void)
     167NO_TRACE static size_t total_frames_free(void)
    165168{
    166169        size_t total = 0;
    … …  
    185188 *
    186189 */
    187 size_t find_zone(pfn_t frame, size_t count, size_t hint)
     190NO_TRACE size_t find_zone(pfn_t frame, size_t count, size_t hint)
    188191{
    189192        if (hint >= zones.count)
    … …  
    206209
    207210/** @return True if zone can allocate specified order */
    208 static bool zone_can_alloc(zone_t *zone, uint8_t order)
     211NO_TRACE static bool zone_can_alloc(zone_t *zone, uint8_t order)
    209212{
    210213        return (zone_flags_available(zone->flags)
    … …  
    222225 *
    223226 */
    224 static size_t find_free_zone(uint8_t order, zone_flags_t flags, size_t hint)
     227NO_TRACE static size_t find_free_zone(uint8_t order, zone_flags_t flags,
     228    size_t hint)
    225229{
    226230        if (hint >= zones.count)
    … …  
    262266 *
    263267 */
    264 static link_t *zone_buddy_find_block(buddy_system_t *buddy, link_t *child,
    265     uint8_t order)
     268NO_TRACE static link_t *zone_buddy_find_block(buddy_system_t *buddy,
     269    link_t *child, uint8_t order)
    266270{
    267271        frame_t *frame = list_get_instance(child, frame_t, buddy_link);
    … …  
    285289 *
    286290 */
    287 static link_t *zone_buddy_find_buddy(buddy_system_t *buddy, link_t *block)
     291NO_TRACE static link_t *zone_buddy_find_buddy(buddy_system_t *buddy,
     292    link_t *block)
    288293{
    289294        frame_t *frame = list_get_instance(block, frame_t, buddy_link);
    … …  
    321326 *
    322327 */
    323 static link_t *zone_buddy_bisect(buddy_system_t *buddy, link_t *block)
     328NO_TRACE static link_t *zone_buddy_bisect(buddy_system_t *buddy, link_t *block)
    324329{
    325330        frame_t *frame_l = list_get_instance(block, frame_t, buddy_link);
    … …  
    339344 *
    340345 */
    341 static link_t *zone_buddy_coalesce(buddy_system_t *buddy, link_t *block_1,
    342     link_t *block_2)
     346NO_TRACE static link_t *zone_buddy_coalesce(buddy_system_t *buddy,
     347    link_t *block_1, link_t *block_2)
    343348{
    344349        frame_t *frame1 = list_get_instance(block_1, frame_t, buddy_link);
    … …  
    355360 *
    356361 */
    357 static void zone_buddy_set_order(buddy_system_t *buddy, link_t *block,
     362NO_TRACE static void zone_buddy_set_order(buddy_system_t *buddy, link_t *block,
    358363    uint8_t order)
    359364{
    … …  
    369374 *
    370375 */
    371 static uint8_t zone_buddy_get_order(buddy_system_t *buddy, link_t *block)
     376NO_TRACE static uint8_t zone_buddy_get_order(buddy_system_t *buddy,
     377    link_t *block)
    372378{
    373379        return list_get_instance(block, frame_t, buddy_link)->buddy_order;
    … …  
    380386 *
    381387 */
    382 static void zone_buddy_mark_busy(buddy_system_t *buddy, link_t * block)
     388NO_TRACE static void zone_buddy_mark_busy(buddy_system_t *buddy, link_t *block)
    383389{
    384390        list_get_instance(block, frame_t, buddy_link)->refcount = 1;
    … …  
    389395 * @param buddy Buddy system.
    390396 * @param block Buddy system block.
    391  */
    392 static void zone_buddy_mark_available(buddy_system_t *buddy, link_t *block)
     397 *
     398 */
     399NO_TRACE static void zone_buddy_mark_available(buddy_system_t *buddy,
     400    link_t *block)
    393401{
    394402        list_get_instance(block, frame_t, buddy_link)->refcount = 0;
    … …  
    421429 *
    422430 */
    423 static pfn_t zone_frame_alloc(zone_t *zone, uint8_t order)
     431NO_TRACE static pfn_t zone_frame_alloc(zone_t *zone, uint8_t order)
    424432{
    425433        ASSERT(zone_flags_available(zone->flags));
    … …  
    449457 *
    450458 */
    451 static void zone_frame_free(zone_t *zone, size_t frame_idx)
     459NO_TRACE static void zone_frame_free(zone_t *zone, size_t frame_idx)
    452460{
    453461        ASSERT(zone_flags_available(zone->flags));
    … …  
    470478
    471479/** Return frame from zone. */
    472 static frame_t *zone_get_frame(zone_t *zone, size_t frame_idx)
     480NO_TRACE static frame_t *zone_get_frame(zone_t *zone, size_t frame_idx)
    473481{
    474482        ASSERT(frame_idx < zone->count);
    … …  
    477485
    478486/** Mark frame in zone unavailable to allocation. */
    479 static void zone_mark_unavailable(zone_t *zone, size_t frame_idx)
     487NO_TRACE static void zone_mark_unavailable(zone_t *zone, size_t frame_idx)
    480488{
    481489        ASSERT(zone_flags_available(zone->flags));
    … …  
    506514 *
    507515 */
    508 static void zone_merge_internal(size_t z1, size_t z2, zone_t *old_z1, buddy_system_t *buddy)
     516NO_TRACE static void zone_merge_internal(size_t z1, size_t z2, zone_t *old_z1,
     517    buddy_system_t *buddy)
    509518{
    510519        ASSERT(zone_flags_available(zones.info[z1].flags));
    … …  
    602611 *
    603612 */
    604 static void return_config_frames(size_t znum, pfn_t pfn, size_t count)
     613NO_TRACE static void return_config_frames(size_t znum, pfn_t pfn, size_t count)
    605614{
    606615        ASSERT(zone_flags_available(zones.info[znum].flags));
    … …  
    637646 *
    638647 */
    639 static void zone_reduce_region(size_t znum, pfn_t frame_idx, size_t count)
     648NO_TRACE static void zone_reduce_region(size_t znum, pfn_t frame_idx,
     649    size_t count)
    640650{
    641651        ASSERT(zone_flags_available(zones.info[znum].flags));
    … …  
    777787 *
    778788 */
    779 static void zone_construct(zone_t *zone, buddy_system_t *buddy, pfn_t start,
    780     size_t count, zone_flags_t flags)
     789NO_TRACE static void zone_construct(zone_t *zone, buddy_system_t *buddy,
     790    pfn_t start, size_t count, zone_flags_t flags)
    781791{
    782792        zone->base = start;
    … …  
    821831 *
    822832 */
    823 uintptr_t zone_conf_size(size_t count)
     833size_t zone_conf_size(size_t count)
    824834{
    825835        return (count * sizeof(frame_t) + buddy_conf_size(fnzb(count)));
    … …  
    11081118 *
    11091119 */
    1110 void frame_reference_add(pfn_t pfn)
     1120NO_TRACE void frame_reference_add(pfn_t pfn)
    11111121{
    11121122        irq_spinlock_lock(&zones.lock, true);
    … …  
    11271137 *
    11281138 */
    1129 void frame_mark_unavailable(pfn_t start, size_t count)
     1139NO_TRACE void frame_mark_unavailable(pfn_t start, size_t count)
    11301140{
    11311141        irq_spinlock_lock(&zones.lock, true);

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

    re2ea4ab1 r09b859c  
    115115 *
    116116 */
    117 void page_mapping_insert(as_t *as, uintptr_t page, uintptr_t frame,
     117NO_TRACE void page_mapping_insert(as_t *as, uintptr_t page, uintptr_t frame,
    118118    unsigned int flags)
    119119{
    … …  
    139139 *
    140140 */
    141 void page_mapping_remove(as_t *as, uintptr_t page)
     141NO_TRACE void page_mapping_remove(as_t *as, uintptr_t page)
    142142{
    143143        ASSERT(page_table_locked(as));
    … …  
    163163 *
    164164 */
    165 pte_t *page_mapping_find(as_t *as, uintptr_t page)
     165NO_TRACE pte_t *page_mapping_find(as_t *as, uintptr_t page)
    166166{
    167167        ASSERT(page_table_locked(as));

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

    re2ea4ab1 r09b859c  
    177177 *
    178178 */
    179 static slab_t *slab_space_alloc(slab_cache_t *cache, unsigned int flags)
     179NO_TRACE static slab_t *slab_space_alloc(slab_cache_t *cache,
     180    unsigned int flags)
    180181{
    181182       
    … …  
    224225 *
    225226 */
    226 static size_t slab_space_free(slab_cache_t *cache, slab_t *slab)
     227NO_TRACE static size_t slab_space_free(slab_cache_t *cache, slab_t *slab)
    227228{
    228229        frame_free(KA2PA(slab->start));
    … …  
    236237
    237238/** Map object to slab structure */
    238 static slab_t *obj2slab(void *obj)
     239NO_TRACE static slab_t *obj2slab(void *obj)
    239240{
    240241        return (slab_t *) frame_get_parent(ADDR2PFN(KA2PA(obj)), 0);
    … …  
    252253 *
    253254 */
    254 static size_t slab_obj_destroy(slab_cache_t *cache, void *obj, slab_t *slab)
     255NO_TRACE static size_t slab_obj_destroy(slab_cache_t *cache, void *obj,
     256    slab_t *slab)
    255257{
    256258        if (!slab)
    … …  
    293295 *
    294296 */
    295 static void *slab_obj_create(slab_cache_t *cache, int flags)
     297NO_TRACE static void *slab_obj_create(slab_cache_t *cache, unsigned int flags)
    296298{
    297299        spinlock_lock(&cache->slablock);
    … …  
    349351 *
    350352 */
    351 static slab_magazine_t *get_mag_from_cache(slab_cache_t *cache, bool first)
     353NO_TRACE static slab_magazine_t *get_mag_from_cache(slab_cache_t *cache,
     354    bool first)
    352355{
    353356        slab_magazine_t *mag = NULL;
    … …  
    373376 *
    374377 */
    375 static void put_mag_to_cache(slab_cache_t *cache, slab_magazine_t *mag)
     378NO_TRACE static void put_mag_to_cache(slab_cache_t *cache,
     379    slab_magazine_t *mag)
    376380{
    377381        spinlock_lock(&cache->maglock);
    … …  
    388392 *
    389393 */
    390 static size_t magazine_destroy(slab_cache_t *cache, slab_magazine_t *mag)
     394NO_TRACE static size_t magazine_destroy(slab_cache_t *cache,
     395    slab_magazine_t *mag)
    391396{
    392397        size_t i;
    … …  
    406411 *
    407412 */
    408 static slab_magazine_t *get_full_current_mag(slab_cache_t *cache)
     413NO_TRACE static slab_magazine_t *get_full_current_mag(slab_cache_t *cache)
    409414{
    410415        slab_magazine_t *cmag = cache->mag_cache[CPU->id].current;
    411416        slab_magazine_t *lastmag = cache->mag_cache[CPU->id].last;
    412 
     417       
    413418        ASSERT(spinlock_locked(&cache->mag_cache[CPU->id].lock));
    414419       
    … …  
    443448 *
    444449 */
    445 static void *magazine_obj_get(slab_cache_t *cache)
     450NO_TRACE static void *magazine_obj_get(slab_cache_t *cache)
    446451{
    447452        if (!CPU)
    … …  
    473478 *
    474479 */
    475 static slab_magazine_t *make_empty_current_mag(slab_cache_t *cache)
     480NO_TRACE static slab_magazine_t *make_empty_current_mag(slab_cache_t *cache)
    476481{
    477482        slab_magazine_t *cmag = cache->mag_cache[CPU->id].current;
    … …  
    479484       
    480485        ASSERT(spinlock_locked(&cache->mag_cache[CPU->id].lock));
    481 
     486       
    482487        if (cmag) {
    483488                if (cmag->busy < cmag->size)
    … …  
    523528 *
    524529 */
    525 static int magazine_obj_put(slab_cache_t *cache, void *obj)
     530NO_TRACE static int magazine_obj_put(slab_cache_t *cache, void *obj)
    526531{
    527532        if (!CPU)
    … …  
    552557 *
    553558 */
    554 static size_t comp_objects(slab_cache_t *cache)
     559NO_TRACE static size_t comp_objects(slab_cache_t *cache)
    555560{
    556561        if (cache->flags & SLAB_CACHE_SLINSIDE)
    … …  
    564569 *
    565570 */
    566 static size_t badness(slab_cache_t *cache)
     571NO_TRACE static size_t badness(slab_cache_t *cache)
    567572{
    568573        size_t objects = comp_objects(cache);
    … …  
    578583 *
    579584 */
    580 static bool make_magcache(slab_cache_t *cache)
     585NO_TRACE static bool make_magcache(slab_cache_t *cache)
    581586{
    582587        ASSERT(_slab_initialized >= 2);
    … …  
    600605 *
    601606 */
    602 static void _slab_cache_create(slab_cache_t *cache, const char *name,
     607NO_TRACE static void _slab_cache_create(slab_cache_t *cache, const char *name,
    603608    size_t size, size_t align, int (*constructor)(void *obj,
    604609    unsigned int kmflag), size_t (*destructor)(void *obj), unsigned int flags)
    … …  
    676681 *
    677682 */
    678 static size_t _slab_reclaim(slab_cache_t *cache, unsigned int flags)
     683NO_TRACE static size_t _slab_reclaim(slab_cache_t *cache, unsigned int flags)
    679684{
    680685        if (cache->flags & SLAB_CACHE_NOMAGAZINE)
    … …  
    781786 *
    782787 */
    783 static void _slab_free(slab_cache_t *cache, void *obj, slab_t *slab)
     788NO_TRACE static void _slab_free(slab_cache_t *cache, void *obj, slab_t *slab)
    784789{
    785790        ipl_t ipl = interrupts_disable();

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

    re2ea4ab1 r09b859c  
    4949 *
    5050 * @param the THE structure to be initialized.
     51 *
    5152 */
    5253void the_initialize(the_t *the)
    … …  
    6566 * @param src The source THE structure.
    6667 * @param dst The destination THE structure.
     68 *
    6769 */
    68 void the_copy(the_t *src, the_t *dst)
     70NO_TRACE void the_copy(the_t *src, the_t *dst)
    6971{
    7072        *dst = *src;

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

    re2ea4ab1 r09b859c  
    5858 *
    5959 */
    60 static int sysinfo_item_constructor(void *obj, unsigned int kmflag)
     60NO_TRACE static int sysinfo_item_constructor(void *obj, unsigned int kmflag)
    6161{
    6262        sysinfo_item_t *item = (sysinfo_item_t *) obj;
    … …  
    7878 *
    7979 */
    80 static size_t sysinfo_item_destructor(void *obj)
     80NO_TRACE static size_t sysinfo_item_destructor(void *obj)
    8181{
    8282        sysinfo_item_t *item = (sysinfo_item_t *) obj;
    … …  
    120120 *
    121121 */
    122 static sysinfo_item_t *sysinfo_find_item(const char *name,
     122NO_TRACE static sysinfo_item_t *sysinfo_find_item(const char *name,
    123123    sysinfo_item_t *subtree, sysinfo_return_t **ret, bool dry_run)
    124124{
    … …  
    180180 *
    181181 */
    182 static sysinfo_item_t *sysinfo_create_path(const char *name,
     182NO_TRACE static sysinfo_item_t *sysinfo_create_path(const char *name,
    183183    sysinfo_item_t **psubtree)
    184184{
    … …  
    458458 *
    459459 */
    460 static void sysinfo_indent(unsigned int depth)
     460NO_TRACE static void sysinfo_indent(unsigned int depth)
    461461{
    462462        unsigned int i;
    … …  
    473473 *
    474474 */
    475 static void sysinfo_dump_internal(sysinfo_item_t *root, unsigned int depth)
     475NO_TRACE static void sysinfo_dump_internal(sysinfo_item_t *root, unsigned int depth)
    476476{
    477477        sysinfo_item_t *cur = root;
    … …  
    567567 *
    568568 */
    569 static sysinfo_return_t sysinfo_get_item(const char *name,
     569NO_TRACE static sysinfo_return_t sysinfo_get_item(const char *name,
    570570    sysinfo_item_t **root, bool dry_run)
    571571{
    … …  
    622622 *
    623623 */
    624 static sysinfo_return_t sysinfo_get_item_uspace(void *ptr, size_t size,
     624NO_TRACE static sysinfo_return_t sysinfo_get_item_uspace(void *ptr, size_t size,
    625625    bool dry_run)
    626626{
Note: See TracChangeset for help on using the changeset viewer.