Changeset ab936440 in mainline for kernel/generic/include

Timestamp:

2019-02-12T20:42:42Z (7 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Branches:

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

Children:

f31ca47

Parents:

7f7817a9 (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.

git-author:

Matthieu Riolo <matthieu.riolo@…> (2019-02-12 20:26:18)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-02-12 20:42:42)

Message:

Merge branch 'master' into bdsh_alias

Conflicts:

uspace/app/bdsh/Makefile
uspace/app/bdsh/cmds/modules/modules.h

Ccheck correction and removing header which includes itself

Location:

kernel/generic/include

Files:

• adt/btree.h (deleted)
• adt/list.h (modified) (10 diffs)
• adt/odict.h (modified) (1 diff)
• bitops.h (modified) (2 diffs)
• context.h (modified) (1 diff)
• lib/refcount.h (modified) (1 diff)
• macros.h (modified) (2 diffs)
• mm/as.h (modified) (5 diffs)
• str.h (modified) (5 diffs)
• synch/spinlock.h (modified) (2 diffs)
• trace.h (modified) (1 diff)
• types/adt/odict.h (modified) (1 diff)

kernel/generic/include/adt/list.h

@@ -150 +150 @@
  *
  */
-NO_TRACE static inline void link_initialize(link_t *link)
+_NO_TRACE static inline void link_initialize(link_t *link)
 {
         link->prev = NULL;
@@ -163 +163 @@
  *
  */
-NO_TRACE static inline void list_initialize(list_t *list)
+_NO_TRACE static inline void list_initialize(list_t *list)
 {
         list->head.prev = &list->head;
@@ -199 +199 @@
  *
  */
-NO_TRACE static inline void list_prepend(link_t *link, list_t *list)
+_NO_TRACE static inline void list_prepend(link_t *link, list_t *list)
 {
         list_insert_after(link, &list->head);
@@ -212 +212 @@
  *
  */
-NO_TRACE static inline void list_append(link_t *link, list_t *list)
+_NO_TRACE static inline void list_append(link_t *link, list_t *list)
 {
         list_insert_before(link, &list->head);
@@ -225 +225 @@
  *
  */
-NO_TRACE static inline void list_remove(link_t *link)
+_NO_TRACE static inline void list_remove(link_t *link)
 {
         if ((link->prev != NULL) && (link->next != NULL)) {
@@ -242 +242 @@
  *
  */
-NO_TRACE static inline bool list_empty(const list_t *list)
+_NO_TRACE static inline bool list_empty(const list_t *list)
 {
         return (list->head.next == &list->head);
@@ -310 +310 @@
  *
  */
-NO_TRACE static inline void headless_list_split_or_concat(link_t *part1, link_t *part2)
+_NO_TRACE static inline void headless_list_split_or_concat(link_t *part1, link_t *part2)
 {
         part1->prev->next = part2;
@@ -331 +331 @@
  *
  */
-NO_TRACE static inline void headless_list_split(link_t *part1, link_t *part2)
+_NO_TRACE static inline void headless_list_split(link_t *part1, link_t *part2)
 {
         headless_list_split_or_concat(part1, part2);
@@ -346 +346 @@
  *
  */
-NO_TRACE static inline void headless_list_concat(link_t *part1, link_t *part2)
+_NO_TRACE static inline void headless_list_concat(link_t *part1, link_t *part2)
 {
         headless_list_split_or_concat(part1, part2);
@@ -361 +361 @@
  *
  */
-NO_TRACE static inline void list_concat(list_t *list1, list_t *list2)
+_NO_TRACE static inline void list_concat(list_t *list1, list_t *list2)
 {
         list_splice(list2, list1->head.prev);

kernel/generic/include/adt/odict.h

@@ -33 +33 @@
  */
 
-#ifndef LIBC_ODICT_H_
-#define LIBC_ODICT_H_
+#ifndef _LIBC_ODICT_H_
+#define _LIBC_ODICT_H_
 
 #include <errno.h>

kernel/generic/include/bitops.h

@@ -52 +52 @@
  *
  */
-NO_TRACE static inline uint8_t fnzb32(uint32_t arg)
+_NO_TRACE static inline uint8_t fnzb32(uint32_t arg)
 {
         uint8_t n = 0;
@@ -87 +87 @@
  *
  */
-NO_TRACE static inline uint8_t fnzb64(uint64_t arg)
+_NO_TRACE static inline uint8_t fnzb64(uint64_t arg)
 {
         uint8_t n = 0;

kernel/generic/include/context.h

@@ -91 +91 @@
  *
  */
-NO_TRACE static inline void context_restore(context_t *ctx)
+_NO_TRACE static inline void context_restore(context_t *ctx)
 {
         context_restore_arch(ctx);

kernel/generic/include/lib/refcount.h

@@ -37 +37 @@
  */
 
-#ifndef LIBC_REFCOUNT_H_
-#define LIBC_REFCOUNT_H_
+#ifndef _LIBC_REFCOUNT_H_
+#define _LIBC_REFCOUNT_H_
 
 #include <assert.h>

kernel/generic/include/macros.h

@@ -49 +49 @@
  *
  */
-NO_TRACE static inline int overlaps(uint64_t s1, uint64_t sz1, uint64_t s2,
+_NO_TRACE static inline int overlaps(uint64_t s1, uint64_t sz1, uint64_t s2,
     uint64_t sz2)
 {
@@ -78 +78 @@
  *
  */
-NO_TRACE static inline int iswithin(uint64_t s1, uint64_t sz1, uint64_t s2,
+_NO_TRACE static inline int iswithin(uint64_t s1, uint64_t sz1, uint64_t s2,
     uint64_t sz2)
 {

kernel/generic/include/mm/as.h

@@ -45 +45 @@
 #include <synch/mutex.h>
 #include <adt/list.h>
-#include <adt/btree.h>
 #include <adt/odict.h>
 #include <lib/elf.h>
@@ -137 +136 @@
 } as_operations_t;
 
+/** Single anonymous page mapping. */
+typedef struct {
+        /** Containing pagemap structure */
+        struct as_pagemap *pagemap;
+        /** Link to @c shinfo->pagemap ordered dictionary */
+        odlink_t lpagemap;
+        /** Virtual address */
+        uintptr_t vaddr;
+        /** Physical frame address */
+        uintptr_t frame;
+} as_page_mapping_t;
+
+/** Map of anonymous pages in a shared area. */
+typedef struct as_pagemap {
+        /**
+         * Dictionary ordered by virtual address. Members are of type
+         * as_page_mapping_t
+         */
+        odict_t map;
+} as_pagemap_t;
+
+/** Used space interval */
+typedef struct {
+        /** Containing used_space structure */
+        struct used_space *used_space;
+        /** Link to @c used_space->ivals */
+        odlink_t lused_space;
+        /** First page address */
+        uintptr_t page;
+        /** Count of pages */
+        size_t count;
+} used_space_ival_t;
+
+/** Map of used space in an address space area */
+typedef struct used_space {
+        /**
+         * Dictionary of intervals by start address.
+         * Members are of type @c used_space_ival_t.
+         */
+        odict_t ivals;
+        /** Total number of used pages. */
+        size_t pages;
+} used_space_t;
+
 /**
  * This structure contains information associated with the shared address space
@@ -150 +193 @@
         bool shared;
 
-        /**
-         * B+tree containing complete map of anonymous pages of the shared area.
-         */
-        btree_t pagemap;
+        /** Complete map of anonymous pages of the shared area. */
+        as_pagemap_t pagemap;
 
         /** Address space area backend. */
@@ -221 +262 @@
         size_t pages;
 
-        /** Number of resident pages in the area. */
-        size_t resident;
-
         /** Base address of this area. */
         uintptr_t base;
 
         /** Map of used space. */
-        btree_t used_space;
+        used_space_t used_space;
 
         /**
@@ -283 +321 @@
 extern as_area_t *as_area_next(as_area_t *);
 
+extern void as_pagemap_initialize(as_pagemap_t *);
+extern void as_pagemap_finalize(as_pagemap_t *);
+extern as_page_mapping_t *as_pagemap_first(as_pagemap_t *);
+extern as_page_mapping_t *as_pagemap_next(as_page_mapping_t *);
+extern errno_t as_pagemap_find(as_pagemap_t *, uintptr_t, uintptr_t *);
+extern void as_pagemap_insert(as_pagemap_t *, uintptr_t, uintptr_t);
+extern void as_pagemap_remove(as_page_mapping_t *);
+
 extern unsigned int as_area_get_flags(as_area_t *);
 extern bool as_area_check_access(as_area_t *, pf_access_t);
 extern size_t as_area_get_size(uintptr_t);
-extern bool used_space_insert(as_area_t *, uintptr_t, size_t);
-extern bool used_space_remove(as_area_t *, uintptr_t, size_t);
+extern used_space_ival_t *used_space_first(used_space_t *);
+extern used_space_ival_t *used_space_next(used_space_ival_t *);
+extern used_space_ival_t *used_space_find_gteq(used_space_t *, uintptr_t);
+extern bool used_space_insert(used_space_t *, uintptr_t, size_t);
 
 /* Interface to be implemented by architectures. */

kernel/generic/include/str.h

@@ -1 +1 @@
 /*
  * Copyright (c) 2001-2004 Jakub Jermar
+ * Copyright (c) 2005 Martin Decky
+ * Copyright (c) 2011 Oleg Romanenko
  * All rights reserved.
  *
@@ -36 +38 @@
 #define KERN_STR_H_
 
+#include <errno.h>
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
-#include <errno.h>
 
-/**< Common Unicode characters */
+/* Common Unicode characters */
 #define U_SPECIAL      '?'
 
@@ -61 +63 @@
 #define U_CURSOR       0x2588
 
-/**< No size limit constant */
+/** No size limit constant */
 #define STR_NO_LIMIT  ((size_t) -1)
 
-/**< Maximum size of a string containing cnt characters */
-#define STR_BOUNDS(cnt)  ((cnt) << 2)
+/** Maximum size of a string containing @c length characters */
+#define STR_BOUNDS(length)  ((length) << 2)
 
 extern wchar_t str_decode(const char *str, size_t *offset, size_t sz);
@@ -92 +94 @@
 extern void wstr_to_str(char *dest, size_t size, const wchar_t *src);
 
-extern char *str_dup(const char *src);
-extern char *str_ndup(const char *src, size_t n);
-
 extern char *str_chr(const char *str, wchar_t ch);
 
@@ -100 +99 @@
 extern bool wstr_remove(wchar_t *str, size_t pos);
 
-extern errno_t str_uint64_t(const char *, char **, unsigned int, bool, uint64_t *);
+extern char *str_dup(const char *src);
+extern char *str_ndup(const char *src, size_t n);
+
+extern errno_t str_uint64_t(const char *, char **, unsigned int, bool,
+    uint64_t *);
 
 extern void order_suffix(const uint64_t, uint64_t *, char *);

kernel/generic/include/synch/spinlock.h

@@ -103 +103 @@
  * @param lock  Pointer to spinlock_t structure.
  */
-NO_TRACE static inline void spinlock_lock(spinlock_t *lock)
+_NO_TRACE static inline void spinlock_lock(spinlock_t *lock)
 {
         preemption_disable();
@@ -115 +115 @@
  * @param lock  Pointer to spinlock_t structure.
  */
-NO_TRACE static inline void spinlock_unlock(spinlock_t *lock)
+_NO_TRACE static inline void spinlock_unlock(spinlock_t *lock)
 {
         atomic_flag_clear_explicit(&lock->flag, memory_order_release);

kernel/generic/include/trace.h

@@ -36 +36 @@
 #define KERN_TRACE_H_
 
-#define NO_TRACE  __attribute__((no_instrument_function))
+#define _NO_TRACE  __attribute__((no_instrument_function))
 
 #endif

kernel/generic/include/types/adt/odict.h

@@ -33 +33 @@
  */
 
-#ifndef LIBC_TYPES_ODICT_H_
-#define LIBC_TYPES_ODICT_H_
+#ifndef _LIBC_TYPES_ODICT_H_
+#define _LIBC_TYPES_ODICT_H_
 
 #include <adt/list.h>