Changeset 8df5f20 in mainline for kernel/generic/src/mm

Timestamp:

2019-02-11T14:56:26Z (7 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

4805495

Parents:

391996b

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-02-01 23:26:21)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-02-11 14:56:26)

Message:

Rename NO_TRACE to _NO_TRACE

<trace.h> may end up transitively included from standard headers,
so it needs to be a reserved identifier.

Location:

kernel/generic/src/mm

Files:

• as.c (modified) (24 diffs)
• frame.c (modified) (19 diffs)
• page.c (modified) (4 diffs)
• slab.c (modified) (18 diffs)

kernel/generic/src/mm/as.c

@@ -127 +127 @@
 static void used_space_shorten_ival(used_space_ival_t *, size_t);
 
-NO_TRACE static errno_t as_constructor(void *obj, unsigned int flags)
+_NO_TRACE static errno_t as_constructor(void *obj, unsigned int flags)
 {
         as_t *as = (as_t *) obj;
@@ -137 +137 @@
 }
 
-NO_TRACE static size_t as_destructor(void *obj)
+_NO_TRACE static size_t as_destructor(void *obj)
 {
         return as_destructor_arch((as_t *) obj);
@@ -281 +281 @@
  *
  */
-NO_TRACE void as_hold(as_t *as)
+_NO_TRACE void as_hold(as_t *as)
 {
         refcount_up(&as->refcount);
@@ -294 +294 @@
  *
  */
-NO_TRACE void as_release(as_t *as)
+_NO_TRACE void as_release(as_t *as)
 {
         if (refcount_down(&as->refcount))
@@ -340 +340 @@
  * @return True if the two areas conflict, false otherwise.
  */
-NO_TRACE static bool area_is_conflicting(uintptr_t addr,
+_NO_TRACE static bool area_is_conflicting(uintptr_t addr,
     size_t count, bool guarded, as_area_t *area)
 {
@@ -380 +380 @@
  *
  */
-NO_TRACE static bool check_area_conflicts(as_t *as, uintptr_t addr,
+_NO_TRACE static bool check_area_conflicts(as_t *as, uintptr_t addr,
     size_t count, bool guarded, as_area_t *avoid)
 {
@@ -474 +474 @@
  *
  */
-NO_TRACE static uintptr_t as_get_unmapped_area(as_t *as, uintptr_t bound,
+_NO_TRACE static uintptr_t as_get_unmapped_area(as_t *as, uintptr_t bound,
     size_t size, bool guarded)
 {
@@ -580 +580 @@
  * @param pagemap Pagemap
  */
-NO_TRACE void as_pagemap_initialize(as_pagemap_t *pagemap)
+_NO_TRACE void as_pagemap_initialize(as_pagemap_t *pagemap)
 {
         odict_initialize(&pagemap->map, as_pagemap_getkey, as_pagemap_cmp);
@@ -591 +591 @@
  * @param pagemap Pagemap
  */
-NO_TRACE void as_pagemap_finalize(as_pagemap_t *pagemap)
+_NO_TRACE void as_pagemap_finalize(as_pagemap_t *pagemap)
 {
         as_page_mapping_t *mapping = as_pagemap_first(pagemap);
@@ -606 +606 @@
  * @return First mapping or @c NULL if there is none
  */
-NO_TRACE as_page_mapping_t *as_pagemap_first(as_pagemap_t *pagemap)
+_NO_TRACE as_page_mapping_t *as_pagemap_first(as_pagemap_t *pagemap)
 {
         odlink_t *odlink;
@@ -622 +622 @@
  * @return Next mapping or @c NULL if @a cur is the last one
  */
-NO_TRACE as_page_mapping_t *as_pagemap_next(as_page_mapping_t *cur)
+_NO_TRACE as_page_mapping_t *as_pagemap_next(as_page_mapping_t *cur)
 {
         odlink_t *odlink;
@@ -640 +640 @@
  * @return EOK on succcess or ENOENT if no mapping found
  */
-NO_TRACE errno_t as_pagemap_find(as_pagemap_t *pagemap, uintptr_t vaddr,
+_NO_TRACE errno_t as_pagemap_find(as_pagemap_t *pagemap, uintptr_t vaddr,
     uintptr_t *rframe)
 {
@@ -663 +663 @@
  * @param frame Physical frame address
  */
-NO_TRACE void as_pagemap_insert(as_pagemap_t *pagemap, uintptr_t vaddr,
+_NO_TRACE void as_pagemap_insert(as_pagemap_t *pagemap, uintptr_t vaddr,
     uintptr_t frame)
 {
@@ -680 +680 @@
  * @param mapping Mapping
  */
-NO_TRACE void as_pagemap_remove(as_page_mapping_t *mapping)
+_NO_TRACE void as_pagemap_remove(as_page_mapping_t *mapping)
 {
         odict_remove(&mapping->lpagemap);
@@ -693 +693 @@
  *
  */
-NO_TRACE static void sh_info_remove_reference(share_info_t *sh_info)
+_NO_TRACE static void sh_info_remove_reference(share_info_t *sh_info)
 {
         bool dealloc = false;
@@ -861 +861 @@
  *
  */
-NO_TRACE static as_area_t *find_area_and_lock(as_t *as, uintptr_t va)
+_NO_TRACE static as_area_t *find_area_and_lock(as_t *as, uintptr_t va)
 {
         assert(mutex_locked(&as->lock));
@@ -1305 +1305 @@
  *
  */
-NO_TRACE bool as_area_check_access(as_area_t *area, pf_access_t access)
+_NO_TRACE bool as_area_check_access(as_area_t *area, pf_access_t access)
 {
         assert(mutex_locked(&area->lock));
@@ -1328 +1328 @@
  *
  */
-NO_TRACE static unsigned int area_flags_to_page_flags(unsigned int aflags)
+_NO_TRACE static unsigned int area_flags_to_page_flags(unsigned int aflags)
 {
         unsigned int flags = PAGE_USER | PAGE_PRESENT;
@@ -1698 +1698 @@
  *
  */
-NO_TRACE unsigned int as_area_get_flags(as_area_t *area)
+_NO_TRACE unsigned int as_area_get_flags(as_area_t *area)
 {
         assert(mutex_locked(&area->lock));
@@ -1746 +1746 @@
  *
  */
-NO_TRACE pte_t *page_table_create(unsigned int flags)
+_NO_TRACE pte_t *page_table_create(unsigned int flags)
 {
         assert(as_operations);
@@ -1761 +1761 @@
  *
  */
-NO_TRACE void page_table_destroy(pte_t *page_table)
+_NO_TRACE void page_table_destroy(pte_t *page_table)
 {
         assert(as_operations);
@@ -1782 +1782 @@
  *
  */
-NO_TRACE void page_table_lock(as_t *as, bool lock)
+_NO_TRACE void page_table_lock(as_t *as, bool lock)
 {
         assert(as_operations);
@@ -1796 +1796 @@
  *
  */
-NO_TRACE void page_table_unlock(as_t *as, bool unlock)
+_NO_TRACE void page_table_unlock(as_t *as, bool unlock)
 {
         assert(as_operations);
@@ -1811 +1811 @@
  *         are locked, otherwise false.
  */
-NO_TRACE bool page_table_locked(as_t *as)
+_NO_TRACE bool page_table_locked(as_t *as)
 {
         assert(as_operations);

kernel/generic/src/mm/frame.c

@@ -79 +79 @@
  *
  */
-NO_TRACE static void frame_initialize(frame_t *frame)
+_NO_TRACE static void frame_initialize(frame_t *frame)
 {
         frame->refcount = 0;
@@ -100 +100 @@
  *
  */
-NO_TRACE static size_t zones_insert_zone(pfn_t base, size_t count,
+_NO_TRACE static size_t zones_insert_zone(pfn_t base, size_t count,
     zone_flags_t flags)
 {
@@ -156 +156 @@
  *
  */
-NO_TRACE static size_t frame_total_free_get_internal(void)
+_NO_TRACE static size_t frame_total_free_get_internal(void)
 {
         size_t total = 0;
@@ -167 +167 @@
 }
 
-NO_TRACE size_t frame_total_free_get(void)
+_NO_TRACE size_t frame_total_free_get(void)
 {
         size_t total;
@@ -190 +190 @@
  *
  */
-NO_TRACE size_t find_zone(pfn_t frame, size_t count, size_t hint)
+_NO_TRACE size_t find_zone(pfn_t frame, size_t count, size_t hint)
 {
         if (hint >= zones.count)
@@ -211 +211 @@
 
 /** @return True if zone can allocate specified number of frames */
-NO_TRACE static bool zone_can_alloc(zone_t *zone, size_t count,
+_NO_TRACE static bool zone_can_alloc(zone_t *zone, size_t count,
     pfn_t constraint)
 {
@@ -239 +239 @@
  *
  */
-NO_TRACE static size_t find_free_zone_all(size_t count, zone_flags_t flags,
+_NO_TRACE static size_t find_free_zone_all(size_t count, zone_flags_t flags,
     pfn_t constraint, size_t hint)
 {
@@ -265 +265 @@
  *
  */
-NO_TRACE static bool is_high_priority(pfn_t base, size_t count)
+_NO_TRACE static bool is_high_priority(pfn_t base, size_t count)
 {
         return (base + count <= FRAME_LOWPRIO);
@@ -285 +285 @@
  *
  */
-NO_TRACE static size_t find_free_zone_lowprio(size_t count, zone_flags_t flags,
+_NO_TRACE static size_t find_free_zone_lowprio(size_t count, zone_flags_t flags,
     pfn_t constraint, size_t hint)
 {
@@ -322 +322 @@
  *
  */
-NO_TRACE static size_t find_free_zone(size_t count, zone_flags_t flags,
+_NO_TRACE static size_t find_free_zone(size_t count, zone_flags_t flags,
     pfn_t constraint, size_t hint)
 {
@@ -346 +346 @@
 
 /** Return frame from zone. */
-NO_TRACE static frame_t *zone_get_frame(zone_t *zone, size_t index)
+_NO_TRACE static frame_t *zone_get_frame(zone_t *zone, size_t index)
 {
         assert(index < zone->count);
@@ -366 +366 @@
  *
  */
-NO_TRACE static size_t zone_frame_alloc(zone_t *zone, size_t count,
+_NO_TRACE static size_t zone_frame_alloc(zone_t *zone, size_t count,
     pfn_t constraint)
 {
@@ -405 +405 @@
  *
  */
-NO_TRACE static size_t zone_frame_free(zone_t *zone, size_t index)
+_NO_TRACE static size_t zone_frame_free(zone_t *zone, size_t index)
 {
         assert(zone->flags & ZONE_AVAILABLE);
@@ -427 +427 @@
 
 /** Mark frame in zone unavailable to allocation. */
-NO_TRACE static void zone_mark_unavailable(zone_t *zone, size_t index)
+_NO_TRACE static void zone_mark_unavailable(zone_t *zone, size_t index)
 {
         assert(zone->flags & ZONE_AVAILABLE);
@@ -453 +453 @@
  *
  */
-NO_TRACE static void zone_merge_internal(size_t z1, size_t z2, zone_t *old_z1,
+_NO_TRACE static void zone_merge_internal(size_t z1, size_t z2, zone_t *old_z1,
     void *confdata)
 {
@@ -507 +507 @@
  *
  */
-NO_TRACE static void return_config_frames(size_t znum, pfn_t pfn, size_t count)
+_NO_TRACE static void return_config_frames(size_t znum, pfn_t pfn, size_t count)
 {
         assert(zones.info[znum].flags & ZONE_AVAILABLE);
@@ -623 +623 @@
  *
  */
-NO_TRACE static void zone_construct(zone_t *zone, pfn_t start, size_t count,
+_NO_TRACE static void zone_construct(zone_t *zone, pfn_t start, size_t count,
     zone_flags_t flags, void *confdata)
 {
@@ -1037 +1037 @@
  *
  */
-NO_TRACE void frame_reference_add(pfn_t pfn)
+_NO_TRACE void frame_reference_add(pfn_t pfn)
 {
         irq_spinlock_lock(&zones.lock, true);
@@ -1056 +1056 @@
  *
  */
-NO_TRACE void frame_mark_unavailable(pfn_t start, size_t count)
+_NO_TRACE void frame_mark_unavailable(pfn_t start, size_t count)
 {
         irq_spinlock_lock(&zones.lock, true);

kernel/generic/src/mm/page.c

@@ -95 +95 @@
  *
  */
-NO_TRACE void page_mapping_insert(as_t *as, uintptr_t page, uintptr_t frame,
+_NO_TRACE void page_mapping_insert(as_t *as, uintptr_t page, uintptr_t frame,
     unsigned int flags)
 {
@@ -120 +120 @@
  *
  */
-NO_TRACE void page_mapping_remove(as_t *as, uintptr_t page)
+_NO_TRACE void page_mapping_remove(as_t *as, uintptr_t page)
 {
         assert(page_table_locked(as));
@@ -144 +144 @@
  *         the PTE is not guaranteed to be present.
  */
-NO_TRACE bool page_mapping_find(as_t *as, uintptr_t page, bool nolock,
+_NO_TRACE bool page_mapping_find(as_t *as, uintptr_t page, bool nolock,
     pte_t *pte)
 {
@@ -165 +165 @@
  * @param pte      New PTE.
  */
-NO_TRACE void page_mapping_update(as_t *as, uintptr_t page, bool nolock,
+_NO_TRACE void page_mapping_update(as_t *as, uintptr_t page, bool nolock,
     pte_t *pte)
 {

kernel/generic/src/mm/slab.c

@@ -158 +158 @@
  *
  */
-NO_TRACE static slab_t *slab_space_alloc(slab_cache_t *cache,
+_NO_TRACE static slab_t *slab_space_alloc(slab_cache_t *cache,
     unsigned int flags)
 {
@@ -206 +206 @@
  *
  */
-NO_TRACE static size_t slab_space_free(slab_cache_t *cache, slab_t *slab)
+_NO_TRACE static size_t slab_space_free(slab_cache_t *cache, slab_t *slab)
 {
         frame_free(KA2PA(slab->start), slab->cache->frames);
@@ -218 +218 @@
 
 /** Map object to slab structure */
-NO_TRACE static slab_t *obj2slab(void *obj)
+_NO_TRACE static slab_t *obj2slab(void *obj)
 {
         return (slab_t *) frame_get_parent(ADDR2PFN(KA2PA(obj)), 0);
@@ -234 +234 @@
  *
  */
-NO_TRACE static size_t slab_obj_destroy(slab_cache_t *cache, void *obj,
+_NO_TRACE static size_t slab_obj_destroy(slab_cache_t *cache, void *obj,
     slab_t *slab)
 {
@@ -276 +276 @@
  *
  */
-NO_TRACE static void *slab_obj_create(slab_cache_t *cache, unsigned int flags)
+_NO_TRACE static void *slab_obj_create(slab_cache_t *cache, unsigned int flags)
 {
         irq_spinlock_lock(&cache->slablock, true);
@@ -332 +332 @@
  *
  */
-NO_TRACE static slab_magazine_t *get_mag_from_cache(slab_cache_t *cache,
+_NO_TRACE static slab_magazine_t *get_mag_from_cache(slab_cache_t *cache,
     bool first)
 {
@@ -357 +357 @@
  *
  */
-NO_TRACE static void put_mag_to_cache(slab_cache_t *cache,
+_NO_TRACE static void put_mag_to_cache(slab_cache_t *cache,
     slab_magazine_t *mag)
 {
@@ -373 +373 @@
  *
  */
-NO_TRACE static size_t magazine_destroy(slab_cache_t *cache,
+_NO_TRACE static size_t magazine_destroy(slab_cache_t *cache,
     slab_magazine_t *mag)
 {
@@ -392 +392 @@
  *
  */
-NO_TRACE static slab_magazine_t *get_full_current_mag(slab_cache_t *cache)
+_NO_TRACE static slab_magazine_t *get_full_current_mag(slab_cache_t *cache)
 {
         slab_magazine_t *cmag = cache->mag_cache[CPU->id].current;
@@ -429 +429 @@
  *
  */
-NO_TRACE static void *magazine_obj_get(slab_cache_t *cache)
+_NO_TRACE static void *magazine_obj_get(slab_cache_t *cache)
 {
         if (!CPU)
@@ -459 +459 @@
  *
  */
-NO_TRACE static slab_magazine_t *make_empty_current_mag(slab_cache_t *cache)
+_NO_TRACE static slab_magazine_t *make_empty_current_mag(slab_cache_t *cache)
 {
         slab_magazine_t *cmag = cache->mag_cache[CPU->id].current;
@@ -509 +509 @@
  *
  */
-NO_TRACE static int magazine_obj_put(slab_cache_t *cache, void *obj)
+_NO_TRACE static int magazine_obj_put(slab_cache_t *cache, void *obj)
 {
         if (!CPU)
@@ -538 +538 @@
  *
  */
-NO_TRACE static size_t comp_objects(slab_cache_t *cache)
+_NO_TRACE static size_t comp_objects(slab_cache_t *cache)
 {
         if (cache->flags & SLAB_CACHE_SLINSIDE)
@@ -550 +550 @@
  *
  */
-NO_TRACE static size_t badness(slab_cache_t *cache)
+_NO_TRACE static size_t badness(slab_cache_t *cache)
 {
         size_t objects = comp_objects(cache);
@@ -564 +564 @@
  *
  */
-NO_TRACE static bool make_magcache(slab_cache_t *cache)
+_NO_TRACE static bool make_magcache(slab_cache_t *cache)
 {
         assert(_slab_initialized >= 2);
@@ -585 +585 @@
  *
  */
-NO_TRACE static void _slab_cache_create(slab_cache_t *cache, const char *name,
+_NO_TRACE static void _slab_cache_create(slab_cache_t *cache, const char *name,
     size_t size, size_t align, errno_t (*constructor)(void *obj,
     unsigned int kmflag), size_t (*destructor)(void *obj), unsigned int flags)
@@ -660 +660 @@
  *
  */
-NO_TRACE static size_t _slab_reclaim(slab_cache_t *cache, unsigned int flags)
+_NO_TRACE static size_t _slab_reclaim(slab_cache_t *cache, unsigned int flags)
 {
         if (cache->flags & SLAB_CACHE_NOMAGAZINE)
@@ -707 +707 @@
  *
  */
-NO_TRACE static void _slab_free(slab_cache_t *cache, void *obj, slab_t *slab)
+_NO_TRACE static void _slab_free(slab_cache_t *cache, void *obj, slab_t *slab)
 {
         if (!obj)