HelenOS-historicHelenOSHelenOS-doc

Català-Valencià – Catalan中文 – Chinese (Simplified)中文 – Chinese (Traditional)Česky – CzechDansk – DanishNederlands – DutchEnglish – EnglishSuomi – FinnishFrançais – FrenchDeutsch – Germanעברית – Hebrewहिंदी – HindiMagyar – HungarianBahasa Indonesia – IndonesianItaliano – Italian日本語 – Japanese한국어 – KoreanМакедонски – Macedonianमराठी – MarathiNorsk – NorwegianPolski – PolishPortuguês – PortuguesePortuguês – Portuguese (Brazil)Русский – RussianSlovenčina – SlovakSlovenščina – SlovenianEspañol – SpanishSvenska – SwedishTürkçe – TurkishУкраїнська – UkrainianOëzbekcha – Uzbek

Compare Revisions

• This comparison shows the changes necessary to convert path

  → / @ 1358

  → / @ 1357

  ↔ Reverse comparison

• Compare Path:	Rev

  With Path:	Rev

Ignore whitespace Rev 1358 → Rev 1357

/kernel/trunk/generic/src/mm/as.c
960,3 → 960,4
{
return (__native) as_area_destroy(AS, address);
}

/kernel/trunk/generic/src/proc/task.c
36,6 → 36,7
#include <proc/task.h>
#include <proc/uarg.h>
#include <mm/as.h>
#include <mm/as_arg.h>
#include <mm/slab.h>
#include <synch/spinlock.h>
#include <arch.h>
103,6 → 104,8
ipc_phone_connect(&ta->phones[0], ipc_phone_0);
atomic_set(&ta->active_calls, 0);
memsetb((__address) &ta->accept_arg, sizeof(as_area_acptsnd_arg_t), 0);
ipl = interrupts_disable();
spinlock_lock(&tasks_lock);

/kernel/trunk/generic/include/mm/as.h
38,6 → 38,7
#ifdef KERNEL
#include <mm/as_arg.h>
#include <arch/mm/page.h>
#include <arch/mm/as.h>
#include <arch/mm/asid.h>
127,11 → 128,12
extern as_area_t *as_area_create(as_t *as, int flags, size_t size, __address base, int attrs);
extern int as_area_resize(as_t *as, __address address, size_t size, int flags);
extern int as_area_destroy(as_t *as, __address address);
int as_area_send(task_id_t dst_id, __address base);
extern void as_set_mapping(as_t *as, __address page, __address frame);
extern int as_page_fault(__address page, istate_t *istate);
extern void as_switch(as_t *old, as_t *new);
extern void as_free(as_t *as);
extern int as_area_steal(task_t *src_task, __address src_base, size_t acc_size, __address dst_base);
int as_area_steal(task_t *src_task, __address src_base, size_t acc_size, __address dst_base);
extern size_t as_get_size(__address base);
/* Interface to be implemented by architectures. */

/kernel/trunk/generic/include/mm/as_arg.h
0,0 → 1,55
/*
* Copyright (C) 2006 Jakub Jermar
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* - The name of the author may not be used to endorse or promote products
* derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef __AS_ARG_H__
#define __AS_ARG_H__
/** Structure passed by SYS_AS_AREA_ACCEPT and SYS_AS_AREA_SEND syscalls. */
typedef struct {
/**
* Task ID of the allowed sender in case of SYS_AS_AREA_ACCEPT
* or task ID of the recipient in case of SYS_AS_AREA_SEND.
* @task_id must be different for corresponding SYS_AS_AREA_ACCEPT
* and SYS_AS_AREA_SEND.
*/
unsigned long long task_id;
/**
* Destination address in case of SYS_AS_AREA_ACCEPT,
* source address in case of SYS_AS_AREA_SEND.
*/
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. */
} as_area_acptsnd_arg_t;
#endif

/kernel/trunk/generic/include/proc/task.h
35,6 → 35,7
#include <adt/list.h>
#include <ipc/ipc.h>
#include <security/cap.h>
#include <mm/as_arg.h>
#include <arch/proc/task.h>
/** Task structure. */
52,6 → 53,9
phone_t phones[IPC_MAX_PHONES];
atomic_t active_calls; /**< Active asynchronous messages */
/** Accept argument of SYS_AS_AREA_ACCEPT. */
as_area_acptsnd_arg_t accept_arg;
task_arch_t arch; /**< Architecture specific task data. */
};