Changeset 8df5f20 in mainline for kernel/generic/src/mm/as.c

Timestamp:

2019-02-11T14:56:26Z (5 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.

File:

• kernel/generic/src/mm/as.c (modified) (24 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);