Changeset bb252ca in mainline for kernel/generic/include

Timestamp:

2010-05-02T20:58:27Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4872160

Parents:

4ce914d4 (diff), 1624aae (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 the scheduler fix.

Location:

kernel/generic/include

Files:

• mm/as.h (modified) (3 diffs)
• proc/task.h (modified) (2 diffs)

kernel/generic/include/mm/as.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2001-2004 Jakub Jermar
+ * Copyright (c) 2010 Jakub Jermar
  * All rights reserved.
  *
@@ -227 +227 @@
 extern void as_init(void);
 
-extern as_t *as_create(int flags);
-extern void as_destroy(as_t *as);
-extern void as_switch(as_t *old_as, as_t *new_as);
-extern int as_page_fault(uintptr_t page, pf_access_t access, istate_t *istate);
-
-extern as_area_t *as_area_create(as_t *as, int flags, size_t size,
-    uintptr_t base, int attrs, mem_backend_t *backend,
-    mem_backend_data_t *backend_data);
-extern int as_area_destroy(as_t *as, uintptr_t address);        
-extern int as_area_resize(as_t *as, uintptr_t address, size_t size, int flags);
-int as_area_share(as_t *src_as, uintptr_t src_base, size_t acc_size,
-    as_t *dst_as, uintptr_t dst_base, int dst_flags_mask);
-extern int as_area_change_flags(as_t *as, int flags, uintptr_t address);
-
-extern int as_area_get_flags(as_area_t *area);
-extern bool as_area_check_access(as_area_t *area, pf_access_t access);
-extern size_t as_area_get_size(uintptr_t base);
-extern int used_space_insert(as_area_t *a, uintptr_t page, size_t count);
-extern int used_space_remove(as_area_t *a, uintptr_t page, size_t count);
+extern as_t *as_create(int);
+extern void as_destroy(as_t *);
+extern void as_hold(as_t *);
+extern void as_release(as_t *);
+extern void as_switch(as_t *, as_t *);
+extern int as_page_fault(uintptr_t, pf_access_t, istate_t *);
+
+extern as_area_t *as_area_create(as_t *, int, size_t, uintptr_t, int,
+    mem_backend_t *, mem_backend_data_t *);
+extern int as_area_destroy(as_t *, uintptr_t);
+extern int as_area_resize(as_t *, uintptr_t, size_t, int);
+extern int as_area_share(as_t *, uintptr_t, size_t, as_t *, uintptr_t, int);
+extern int as_area_change_flags(as_t *, int, uintptr_t);
+
+extern 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 int used_space_insert(as_area_t *, uintptr_t, size_t);
+extern int used_space_remove(as_area_t *, uintptr_t, size_t);
 
 
 /* Interface to be implemented by architectures. */
 #ifndef as_constructor_arch
-extern int as_constructor_arch(as_t *as, int flags);
+extern int as_constructor_arch(as_t *, int);
 #endif /* !def as_constructor_arch */
 #ifndef as_destructor_arch
-extern int as_destructor_arch(as_t *as);
+extern int as_destructor_arch(as_t *);
 #endif /* !def as_destructor_arch */
 #ifndef as_create_arch
-extern int as_create_arch(as_t *as, int flags);
+extern int as_create_arch(as_t *, int);
 #endif /* !def as_create_arch */
 #ifndef as_install_arch
-extern void as_install_arch(as_t *as);
+extern void as_install_arch(as_t *);
 #endif /* !def as_install_arch */
 #ifndef as_deinstall_arch
-extern void as_deinstall_arch(as_t *as);
+extern void as_deinstall_arch(as_t *);
 #endif /* !def as_deinstall_arch */
 
@@ -277 +277 @@
 #define ELD_F_LOADER    1
 
-extern unsigned int elf_load(elf_header_t *header, as_t *as, int flags);
+extern unsigned int elf_load(elf_header_t *, as_t *, int);
 
 /* Address space area related syscalls. */
-extern unative_t sys_as_area_create(uintptr_t address, size_t size, int flags);
-extern unative_t sys_as_area_resize(uintptr_t address, size_t size, int flags);
-extern unative_t sys_as_area_change_flags(uintptr_t address, int flags);
-extern unative_t sys_as_area_destroy(uintptr_t address);
+extern unative_t sys_as_area_create(uintptr_t, size_t, int);
+extern unative_t sys_as_area_resize(uintptr_t, size_t, int);
+extern unative_t sys_as_area_change_flags(uintptr_t, int);
+extern unative_t sys_as_area_destroy(uintptr_t);
 
 /* Introspection functions. */
-extern void as_get_area_info(as_t *as, as_area_info_t **obuf, size_t *osize);
-extern void as_print(as_t *as);
+extern void as_get_area_info(as_t *, as_area_info_t **, size_t *);
+extern void as_print(as_t *);
 
 #endif /* KERNEL */

kernel/generic/include/proc/task.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2001-2004 Jakub Jermar
+ * Copyright (c) 2010 Jakub Jermar
  * All rights reserved.
  *
@@ -131 +131 @@
 extern void task_init(void);
 extern void task_done(void);
-extern task_t *task_create(as_t *as, const char *name);
-extern void task_destroy(task_t *t);
-extern task_t *task_find_by_id(task_id_t id);
-extern int task_kill(task_id_t id);
-extern void task_get_accounting(task_t *t, uint64_t *ucycles, uint64_t *kcycles);
+extern task_t *task_create(as_t *, const char *);
+extern void task_destroy(task_t *);
+extern void task_hold(task_t *);
+extern void task_release(task_t *);
+extern task_t *task_find_by_id(task_id_t);
+extern int task_kill(task_id_t);
+extern void task_get_accounting(task_t *, uint64_t *, uint64_t *);
 extern void task_print_list(void);
 
-extern void cap_set(task_t *t, cap_t caps);
-extern cap_t cap_get(task_t *t);
+extern void cap_set(task_t *, cap_t);
+extern cap_t cap_get(task_t *);
 
 #ifndef task_create_arch
-extern void task_create_arch(task_t *t);
+extern void task_create_arch(task_t *);
 #endif
 
 #ifndef task_destroy_arch
-extern void task_destroy_arch(task_t *t);
+extern void task_destroy_arch(task_t *);
 #endif
 
-extern unative_t sys_task_get_id(task_id_t *uspace_task_id);
-extern unative_t sys_task_set_name(const char *uspace_name, size_t name_len);
+extern unative_t sys_task_get_id(task_id_t *);
+extern unative_t sys_task_set_name(const char *, size_t);
 
 #endif