ehmry/genode
ehmry
/
genode
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't memcpy the parent capability. Fix #144. 

To give the platform developer more freedom in how the Native_capability
class is internally implemented (e.g. turning it into a smart-pointer),
this patch removes the memcpy operation, when transfering the parent-capability
to a new process from the generic code, and let the implementation of the
platform-specific Native_capability decide how the transfer has to be done.
Please refer to issue #144.
This commit is contained in:
Stefan Kalkowski 2012-03-07 11:58:40 +01:00 committed by Norman Feske
parent fa377f0df5
commit 9992efed03
10 changed files with 71 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
base-codezero/include/base/native_types.h
View File

@ -14,6 +14,8 @@
#ifndef _INCLUDE__BASE__NATIVE_TYPES_H_
#define _INCLUDE__BASE__NATIVE_TYPES_H_
#include <util/string.h>
namespace Codezero {
struct l4_mutex;
@ -140,6 +142,12 @@ namespace Genode {
int dst() const { return _tid.tid; }
Native_thread_id tid() const { return _tid; }
/**
* Copy this capability to another pd.
*/
void copy_to(void* dst) {
memcpy(dst, this, sizeof(Native_capability)); }
};
typedef int Native_connection_state;

8
base-fiasco/include/base/native_types.h
View File

@ -14,6 +14,8 @@
#ifndef _INCLUDE__BASE__NATIVE_TYPES_H_
#define _INCLUDE__BASE__NATIVE_TYPES_H_
#include <util/string.h>
namespace Fiasco {
#include <l4/sys/types.h>
@ -114,6 +116,12 @@ namespace Genode {
* Access raw capability data
*/
Fiasco::l4_threadid_t tid() const { return _tid; }
/**
* Copy this capability to another pd.
*/
void copy_to(void* dst) {
memcpy(dst, this, sizeof(Native_capability)); }
};
typedef Fiasco::l4_threadid_t Native_connection_state;

7
base-foc/include/base/native_types.h
View File

@ -1,6 +1,8 @@
#ifndef _INCLUDE__BASE__NATIVE_TYPES_H_
#define _INCLUDE__BASE__NATIVE_TYPES_H_
#include <util/string.h>
namespace Fiasco {
#include <l4/sys/consts.h>
#include <l4/sys/types.h>
@ -84,6 +86,11 @@ namespace Genode {
bool valid() const { return _cap_sel.valid() && _unique_id != 0; }
/**
* Copy this capability to another pd.
*/
void copy_to(void* dst) {
memcpy(dst, this, sizeof(Native_capability)); }
};
typedef int Native_connection_state;

8
base-host/include/base/native_types.h
View File

@ -14,6 +14,8 @@
#ifndef _INCLUDE__BASE__NATIVE_TYPES_H_
#define _INCLUDE__BASE__NATIVE_TYPES_H_
#include <util/string.h>
namespace Genode {
typedef volatile int Native_lock;
@ -42,6 +44,12 @@ namespace Genode {
void* local() const { return (void*)_local_name; }
int dst() const { return 0; }
Native_thread_id tid() const { return 0; }
/**
* Copy this capability to another pd.
*/
void copy_to(void* dst) {
memcpy(dst, this, sizeof(Native_capability)); }
};
typedef int Native_connection_state;

8
base-linux/include/base/native_types.h
View File

@ -14,6 +14,8 @@
#ifndef _INCLUDE__BASE__NATIVE_TYPES_H_
#define _INCLUDE__BASE__NATIVE_TYPES_H_
#include <util/string.h>
/*
* We cannot just include <semaphore.h> and <pthread.h> here
* because this would impy the nested inclusion of a myriad
@ -145,6 +147,12 @@ namespace Genode {
*/
long dst() const { return _tid; }
long tid() const { return _tid; }
/**
* Copy this capability to another pd.
*/
void copy_to(void* dst) {
memcpy(dst, this, sizeof(Native_capability)); }
};
typedef int Native_connection_state; /* socket descriptor */

7
base-mb/include/base/native_types.h
View File

@ -14,6 +14,7 @@
#ifndef _INCLUDE__BASE__NATIVE_TYPES_H_
#define _INCLUDE__BASE__NATIVE_TYPES_H_
#include <util/string.h>
#include <kernel/types.h>
namespace Genode {
@ -56,6 +57,12 @@ namespace Genode {
int dst() const { return (int)_tid; }
Native_thread_id tid() const { return _tid; }
/**
* Copy this capability to another pd.
*/
void copy_to(void* dst) {
memcpy(dst, this, sizeof(Native_capability)); }
};
typedef int Native_connection_state;

8
base-nova/include/base/native_types.h
View File

@ -14,6 +14,8 @@
#ifndef _INCLUDE__BASE__NATIVE_TYPES_H_
#define _INCLUDE__BASE__NATIVE_TYPES_H_
#include <util/string.h>
namespace Genode {
typedef volatile int Native_lock;
@ -85,6 +87,12 @@ namespace Genode {
int unique_id() const { return _unique_id; }
int pt_sel() const { return _pt_sel; }
/**
* Copy this capability to another pd.
*/
void copy_to(void* dst) {
memcpy(dst, this, sizeof(Native_capability)); }
};
typedef int Native_connection_state;

8
base-okl4/include/base/native_types.h
View File

@ -14,6 +14,8 @@
#ifndef _INCLUDE__BASE__NATIVE_TYPES_H_
#define _INCLUDE__BASE__NATIVE_TYPES_H_
#include <util/string.h>
namespace Okl4 { extern "C" {
#include <l4/types.h>
} }
@ -125,6 +127,12 @@ namespace Genode {
* Access raw capability data
*/
Okl4::L4_ThreadId_t tid() const { return _tid; };
/**
* Copy this capability to another pd.
*/
void copy_to(void* dst) {
memcpy(dst, this, sizeof(Native_capability)); }
};
typedef Okl4::L4_ThreadId_t Native_connection_state;

8
base-pistachio/include/base/native_types.h
View File

@ -14,6 +14,8 @@
#ifndef _INCLUDE__BASE__NATIVE_TYPES_H_
#define _INCLUDE__BASE__NATIVE_TYPES_H_
#include <util/string.h>
namespace Pistachio {
#include <l4/types.h>
}
@ -109,6 +111,12 @@ namespace Genode {
* Access raw capability data
*/
Pistachio::L4_ThreadId_t tid() const { return _tid; };
/**
* Copy this capability to another pd.
*/
void copy_to(void* dst) {
memcpy(dst, this, sizeof(Native_capability)); }
};
typedef Pistachio::L4_ThreadId_t Native_connection_state;

2
base/src/base/process/process.cc
View File

@ -122,7 +122,7 @@ static addr_t _setup_elf(Parent_capability parent_cap,
* data segment
*/
if (!parent_info) {
memcpy(ptr, &parent_cap, sizeof(parent_cap));
parent_cap.copy_to(ptr);
parent_info = true;
}