Changeset 6fa476f7 in mainline

Timestamp:

2006-04-26T17:03:15Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

a9e8b39

Parents:

f3ac636

Message:

Rename SYS_AS_AREA_SHARE_APPROVE and SYS_AS_AREA_SHARE_PERFORM, resp., to
SYS_AS_AREA_ACCEPT and SYS_AS_AREA_SEND, resp. in syscall_t.

Fix prototype of as_area_send() to take only base address of the address
space area as a parameter and read size and flags from the address space
area found at this base address.

Location:

generic

Files:

• include/mm/as.h (modified) (1 diff)
• include/mm/as_arg.h (modified) (1 diff)
• include/syscall/syscall.h (modified) (1 diff)
• src/mm/as.c (modified) (5 diffs)

generic/include/mm/as.h

@@ -115 +115 @@
 extern as_area_t *as_area_create(as_t *as, int flags, size_t size, __address base);
 extern __address as_area_resize(as_t *as, __address address, size_t size, int flags);
-int as_area_send(task_id_t id, __address base, size_t size, int flags);
+int as_area_send(task_id_t id, __address base);
 extern void as_set_mapping(as_t *as, __address page, __address frame);
 extern int as_page_fault(__address page);

generic/include/mm/as_arg.h

@@ -46 +46 @@
         void *base;
         
+        /*
+         * The following members are filled only by acceptor.
+         */
         unsigned long size;     /**< Size of memory being sent/accepted must match. */
         int flags;              /**< Address space area flags of sender and acceptor must match. */

generic/include/syscall/syscall.h

@@ -41 +41 @@
         SYS_AS_AREA_CREATE,
         SYS_AS_AREA_RESIZE,
-        SYS_AS_AREA_SHARE_APPROVE,
-        SYS_AS_AREA_SHARE_PERFORM,
+        SYS_AS_AREA_ACCEPT,
+        SYS_AS_AREA_SEND,
         SYS_IPC_CALL_SYNC_FAST,
         SYS_IPC_CALL_SYNC,

generic/src/mm/as.c

@@ -292 +292 @@
  * @param id Task ID of the accepting task.
  * @param base Base address of the source address space area.
- * @param size Size of the source address space area.
- * @param flags Flags of the source address space area.
  *
  * @return 0 on success or ENOENT if there is no such task or
@@ -301 +299 @@
  *         address space area.
  */
-int as_area_send(task_id_t id, __address base, size_t size, int flags)
+int as_area_send(task_id_t id, __address base)
 {
         ipl_t ipl;
@@ -308 +306 @@
         as_t *as;
         __address dst_base;
+        int flags;
+        size_t size;
+        as_area_t *area;
         
         ipl = interrupts_disable();
@@ -334 +335 @@
                 return EPERM;
         }
+        
+        spinlock_lock(&AS->lock);
+        area = find_area_and_lock(AS, base);
+        if (!area) {
+                /*
+                 * Could not find the source address space area.
+                 */
+                spinlock_unlock(&t->lock);
+                spinlock_unlock(&AS->lock);
+                interrupts_restore(ipl);
+                return ENOENT;
+        }
+        size = area->pages * PAGE_SIZE;
+        flags = area->flags;
+        spinlock_unlock(&area->lock);
+        spinlock_unlock(&AS->lock);
 
         if ((t->accept_arg.task_id != TASK->taskid) || (t->accept_arg.size != size) ||
@@ -880 +897 @@
         }
 
-        return (__native) as_area_send(arg.task_id, (__address) arg.base, arg.size, arg.flags);
-}
+        return (__native) as_area_send(arg.task_id, (__address) arg.base);
+}