Changeset b7fd2a0 in mainline for kernel/generic/src/mm

Timestamp:

2018-01-13T03:10:29Z (8 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:

a53ed3a

Parents:

36f0738

Message:

Use errno_t in all uspace and kernel code.

Change type of every variable, parameter and return value that holds an
<errno.h> constant to either errno_t (the usual case), or sys_errno_t
(some places in kernel). This is for the purpose of self-documentation,
as well as for type-checking with a bit of type definition hackery.

Although this is a massive commit, it is a simple text replacement, and thus
is very easy to verify. Simply do the following:

`
git checkout <this commit's hash>
git reset HEAD
<sup>git add .
tools/srepl '\berrno_t\b' int
git add .
tools/srepl '\bsys_errno_t\b' sysarg_t
git reset
git diff
`</sup>

While this doesn't ensure that the replacements are correct, it does ensure
that the commit doesn't do anything except those replacements. Since errno_t
is typedef'd to int in the usual case (and sys_errno_t to sysarg_t), even if
incorrect, this commit cannot change behavior.

Location:

kernel/generic/src/mm

Files:

• as.c (modified) (6 diffs)
• backend_user.c (modified) (1 diff)
• page.c (modified) (2 diffs)
• slab.c (modified) (2 diffs)

kernel/generic/src/mm/as.c

@@ -111 +111 @@
 as_t *AS_KERNEL = NULL;
 
-NO_TRACE static int 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;
@@ -760 +760 @@
  *
  */
-int as_area_resize(as_t *as, uintptr_t address, size_t size, unsigned int flags)
+errno_t as_area_resize(as_t *as, uintptr_t address, size_t size, unsigned int flags)
 {
         if (!IS_ALIGNED(address, PAGE_SIZE))
@@ -969 +969 @@
  *
  */
-int as_area_destroy(as_t *as, uintptr_t address)
+errno_t as_area_destroy(as_t *as, uintptr_t address)
 {
         mutex_lock(&as->lock);
@@ -1085 +1085 @@
  *
  */
-int as_area_share(as_t *src_as, uintptr_t src_base, size_t acc_size,
+errno_t as_area_share(as_t *src_as, uintptr_t src_base, size_t acc_size,
     as_t *dst_as, unsigned int dst_flags_mask, uintptr_t *dst_base,
     uintptr_t bound)
@@ -1248 +1248 @@
  *
  */
-int as_area_change_flags(as_t *as, unsigned int flags, uintptr_t address)
+errno_t as_area_change_flags(as_t *as, unsigned int flags, uintptr_t address)
 {
         /* Flags for the new memory mapping */
@@ -2208 +2208 @@
 }
 
-sysarg_t sys_as_area_resize(uintptr_t address, size_t size, unsigned int flags)
-{
-        return (sysarg_t) as_area_resize(AS, address, size, 0);
-}
-
-sysarg_t sys_as_area_change_flags(uintptr_t address, unsigned int flags)
-{
-        return (sysarg_t) as_area_change_flags(AS, flags, address);
-}
-
-sysarg_t sys_as_area_destroy(uintptr_t address)
-{
-        return (sysarg_t) as_area_destroy(AS, address);
+sys_errno_t sys_as_area_resize(uintptr_t address, size_t size, unsigned int flags)
+{
+        return (sys_errno_t) as_area_resize(AS, address, size, 0);
+}
+
+sys_errno_t sys_as_area_change_flags(uintptr_t address, unsigned int flags)
+{
+        return (sys_errno_t) as_area_change_flags(AS, flags, address);
+}
+
+sys_errno_t sys_as_area_destroy(uintptr_t address)
+{
+        return (sys_errno_t) as_area_destroy(AS, address);
 }
 

kernel/generic/src/mm/backend_user.c

@@ -126 +126 @@
         IPC_SET_ARG5(data, pager_info->id3);
 
-        int rc = ipc_req_internal(pager_info->pager, &data, (sysarg_t) true);
+        errno_t rc = ipc_req_internal(pager_info->pager, &data, (sysarg_t) true);
 
         if (rc != EOK) {

kernel/generic/src/mm/page.c

@@ -190 +190 @@
 }
 
-int page_find_mapping(uintptr_t virt, uintptr_t *phys)
+errno_t page_find_mapping(uintptr_t virt, uintptr_t *phys)
 {
         page_table_lock(AS, true);
@@ -215 +215 @@
  *
  */
-sysarg_t sys_page_find_mapping(uintptr_t virt, uintptr_t *phys_ptr)
+sys_errno_t sys_page_find_mapping(uintptr_t virt, uintptr_t *phys_ptr)
 {
         uintptr_t phys;
-        int rc = page_find_mapping(virt, &phys);
+        errno_t rc = page_find_mapping(virt, &phys);
         if (rc != EOK)
                 return rc;
         
         rc = copy_to_uspace(phys_ptr, &phys, sizeof(phys));
-        return (sysarg_t) rc;
+        return (sys_errno_t) rc;
 }
 

kernel/generic/src/mm/slab.c

@@ -608 +608 @@
  */
 NO_TRACE static void _slab_cache_create(slab_cache_t *cache, const char *name,
-    size_t size, size_t align, int (*constructor)(void *obj,
+    size_t size, size_t align, errno_t (*constructor)(void *obj,
     unsigned int kmflag), size_t (*destructor)(void *obj), unsigned int flags)
 {
@@ -662 +662 @@
  */
 slab_cache_t *slab_cache_create(const char *name, size_t size, size_t align,
-    int (*constructor)(void *obj, unsigned int kmflag),
+    errno_t (*constructor)(void *obj, unsigned int kmflag),
     size_t (*destructor)(void *obj), unsigned int flags)
 {