Changeset 97bdb4a in mainline

Timestamp:

2010-07-06T23:21:36Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

22c3444

Parents:

04e3d9f

Message:

avoid tracing of several memory-related functions which are called from tight loops
make the reporting of overlaping zones more informative

Location:

kernel/generic/src/mm

Files:

• as.c (modified) (8 diffs)
• frame.c (modified) (4 diffs)
• page.c (modified) (3 diffs)

kernel/generic/src/mm/as.c

@@ -987 +987 @@
  *
  */
-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)
 {
         int flagmap[] = {
@@ -1385 +1385 @@
 }
 
-
-
 /** Compute flags for virtual address translation subsytem.
  *
@@ -1394 +1392 @@
  *
  */
-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));
@@ -1412 +1410 @@
  *
  */
-pte_t *page_table_create(unsigned int flags)
+NO_TRACE pte_t *page_table_create(unsigned int flags)
 {
         ASSERT(as_operations);
@@ -1427 +1425 @@
  *
  */
-void page_table_destroy(pte_t *page_table)
+NO_TRACE void page_table_destroy(pte_t *page_table)
 {
         ASSERT(as_operations);
@@ -1448 +1446 @@
  *
  */
-void page_table_lock(as_t *as, bool lock)
+NO_TRACE void page_table_lock(as_t *as, bool lock)
 {
         ASSERT(as_operations);
@@ -1462 +1460 @@
  *
  */
-void page_table_unlock(as_t *as, bool unlock)
+NO_TRACE void page_table_unlock(as_t *as, bool unlock)
 {
         ASSERT(as_operations);
@@ -1477 +1475 @@
  *         are locked, otherwise false.
  */
-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

@@ -133 +133 @@
                 if (overlaps(base, count,
                     zones.info[i].base, zones.info[i].count)) {
-                        printf("Zones overlap!\n");
+                        printf("Zone (%p, %p) overlaps with zone (%p, %p)!\n",
+                            PFN2ADDR(base), PFN2ADDR(base + count),
+                            PFN2ADDR(zones.info[i].base),
+                            PFN2ADDR(zones.info[i].base + zones.info[i].count));
                         return (size_t) -1;
                 }
@@ -185 +188 @@
  *
  */
-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)
@@ -1115 +1118 @@
  *
  */
-void frame_reference_add(pfn_t pfn)
+NO_TRACE void frame_reference_add(pfn_t pfn)
 {
         irq_spinlock_lock(&zones.lock, true);
@@ -1134 +1137 @@
  *
  */
-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

@@ -115 +115 @@
  *
  */
-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)
 {
@@ -139 +139 @@
  *
  */
-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));
@@ -163 +163 @@
  *
  */
-pte_t *page_mapping_find(as_t *as, uintptr_t page)
+NO_TRACE pte_t *page_mapping_find(as_t *as, uintptr_t page)
 {
         ASSERT(page_table_locked(as));