Changeset b0b4592e in mainline for kernel/generic/include

Timestamp:

2014-03-15T19:21:53Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

c773adc

Parents:

2034f98 (diff), 8cffdf5 (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 mainline changes

Location:

kernel/generic/include

Files:

• console/console.h (modified) (2 diffs)
• debug.h (modified) (1 diff)
• log.h (added)
• mm/as.h (modified) (3 diffs)
• synch/spinlock.h (modified) (2 diffs)

kernel/generic/include/console/console.h

@@ -39 +39 @@
 #include <print.h>
 #include <console/chardev.h>
+#include <synch/spinlock.h>
 
 #define PAGING(counter, increment, before, after) \
@@ -62 +63 @@
 extern void console_init(void);
 
-extern void klog_init(void);
-extern void klog_update(void *);
+extern void kio_init(void);
+extern void kio_update(void *);
+extern void kio_flush(void);
+extern void kio_push_char(const wchar_t);
+SPINLOCK_EXTERN(kio_lock);
 
 extern wchar_t getc(indev_t *indev);
 extern size_t gets(indev_t *indev, char *buf, size_t buflen);
-extern sysarg_t sys_klog(int cmd, const void *buf, size_t size);
+extern sysarg_t sys_kio(int cmd, const void *buf, size_t size);
 
 extern void grab_console(void);

kernel/generic/include/debug.h

@@ -107 +107 @@
 #define LOG(format, ...) \
         do { \
-                printf("%s() from %s at %s:%u: " format "\n", __func__, \
+                log(LF_OTHER, LVL_DEBUG, \
+                    "%s() from %s at %s:%u: " format,__func__, \
                     symtab_fmt_name_lookup(CALLER), __FILE__, __LINE__, \
                     ##__VA_ARGS__); \

kernel/generic/include/mm/as.h

@@ -140 +140 @@
         /** This structure can be deallocated if refcount drops to 0. */
         size_t refcount;
-        
+        /** True if the area has been ever shared. */
+        bool shared;
+
         /**
          * B+tree containing complete map of anonymous pages of the shared area.
          */
         btree_t pagemap;
+
+        /** Address space area backend. */
+        struct mem_backend *backend;
+        /** Address space area shared data. */
+        void *backend_shared_data;
 } share_info_t;
 
@@ -169 +176 @@
                 uintptr_t base;
                 size_t frames;
+                bool anonymous;
         };
 } mem_backend_data_t;
@@ -226 +234 @@
         int (* page_fault)(as_area_t *, uintptr_t, pf_access_t);
         void (* frame_free)(as_area_t *, uintptr_t, uintptr_t);
+
+        bool (* create_shared_data)(as_area_t *);
+        void (* destroy_shared_data)(void *);
 } mem_backend_t;
 

kernel/generic/include/synch/spinlock.h

@@ -137 +137 @@
 #ifdef CONFIG_DEBUG_SPINLOCK
 
-#include <print.h>
+#include <log.h>
 
 #define DEADLOCK_THRESHOLD  100000000
@@ -146 +146 @@
         if ((pname)++ > (value)) { \
                 (pname) = 0; \
-                printf("Deadlock probe %s: exceeded threshold %u\n" \
+                log(LF_OTHER, LVL_WARN, \
+                    "Deadlock probe %s: exceeded threshold %u\n" \
                     "cpu%u: function=%s, line=%u\n", \
                     #pname, (value), CPU->id, __func__, __LINE__); \