Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replaced the MAX_PORTS constant with the gMaxPorts variable, so that it

Browse Source 
could be changed at startup (adapted to system properties).


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@6955 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2004-03-12 05:09:29 +00:00
parent b672b21619
commit 85b89008bd
1 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/kernel/core/port.c
View File

@ -55,8 +55,9 @@ static int dump_port_info(int argc, char **argv);
static void _dump_port_info(struct port_entry *port);
// MAX_PORTS must be power of 2
#define MAX_PORTS 4096
// gMaxPorts must be power of 2
int32 gMaxPorts = 4096;
#define MAX_QUEUE_LENGTH 4096
#define PORT_MAX_MESSAGE_SIZE 65536
@ -77,7 +78,7 @@ status_t
port_init(kernel_args *ka)
{
int i;
int size = sizeof(struct port_entry) * MAX_PORTS;
int size = sizeof(struct port_entry) * gMaxPorts;
// create and initialize ports table
sPortArea = create_area("port_table", (void **)&sPorts, B_ANY_KERNEL_ADDRESS,
@ -91,7 +92,7 @@ port_init(kernel_args *ka)
// might do it as well, though :-)
memset(sPorts, 0, size);
for (i = 0; i < MAX_PORTS; i++)
for (i = 0; i < gMaxPorts; i++)
sPorts[i].id = -1;
// add debugger commands
@ -212,7 +213,7 @@ dump_port_list(int argc, char **argv)
{
int i;
for (i = 0; i < MAX_PORTS; i++) {
for (i = 0; i < gMaxPorts; i++) {
if (sPorts[i].id >= 0)
dprintf("%p\tid: 0x%lx\t\tname: '%s'\n", &sPorts[i], sPorts[i].id, sPorts[i].name);
}
@ -251,11 +252,11 @@ dump_port_info(int argc, char **argv)
if (num > KERNEL_BASE && num <= (KERNEL_BASE + (KERNEL_SIZE - 1))) {
// XXX semi-hack
// one can use either address or a port_id, since KERNEL_BASE > MAX_PORTS assumed
// one can use either address or a port_id, since KERNEL_BASE > gMaxPorts assumed
_dump_port_info((struct port_entry *)num);
return 0;
} else {
unsigned slot = num % MAX_PORTS;
unsigned slot = num % gMaxPorts;
if(sPorts[slot].id != (int)num) {
dprintf("port 0x%lx doesn't exist!\n", num);
return 0;
@ -266,7 +267,7 @@ dump_port_info(int argc, char **argv)
}
// walk through the ports list, trying to match name
for (i = 0; i < MAX_PORTS; i++) {
for (i = 0; i < gMaxPorts; i++) {
if (sPorts[i].name != NULL
&& strcmp(argv[1], sPorts[i].name) == 0) {
_dump_port_info(&sPorts[i]);
@ -296,7 +297,7 @@ delete_owned_ports(team_id owner)
state = disable_interrupts();
GRAB_PORT_LIST_LOCK();
for (i = 0; i < MAX_PORTS; i++) {
for (i = 0; i < gMaxPorts; i++) {
if (sPorts[i].id != -1 && sPorts[i].owner == owner) {
port_id id = sPorts[i].id;
@ -407,13 +408,13 @@ create_port(int32 queueLength, const char *name)
GRAB_PORT_LIST_LOCK();
// find the first empty spot
for (i = 0; i < MAX_PORTS; i++) {
for (i = 0; i < gMaxPorts; i++) {
if (sPorts[i].id == -1) {
// make the port_id be a multiple of the slot it's in
if (i >= sNextPort % MAX_PORTS)
sNextPort += i - sNextPort % MAX_PORTS;
if (i >= sNextPort % gMaxPorts)
sNextPort += i - sNextPort % gMaxPorts;
else
sNextPort += MAX_PORTS - (sNextPort % MAX_PORTS - i);
sNextPort += gMaxPorts - (sNextPort % gMaxPorts - i);
GRAB_PORT_LOCK(sPorts[i]);
sPorts[i].id = sNextPort++;
@ -461,7 +462,7 @@ close_port(port_id id)
if (!sPortsActive || id < 0)
return B_BAD_PORT_ID;
slot = id % MAX_PORTS;
slot = id % gMaxPorts;
// walk through the sem list, trying to match name
state = disable_interrupts();
@ -497,7 +498,7 @@ delete_port(port_id id)
if (!sPortsActive || id < 0)
return B_BAD_PORT_ID;
slot = id % MAX_PORTS;
slot = id % gMaxPorts;
state = disable_interrupts();
GRAB_PORT_LOCK(sPorts[slot]);
@ -553,7 +554,7 @@ find_port(const char *name)
// the port lock in question, not the port list lock
// loop over list
for (i = 0; i < MAX_PORTS && portFound < B_OK; i++) {
for (i = 0; i < gMaxPorts && portFound < B_OK; i++) {
// lock every individual port before comparing
state = disable_interrupts();
GRAB_PORT_LOCK(sPorts[i]);
@ -605,7 +606,7 @@ _get_port_info(port_id id, port_info *info, size_t size)
if (!sPortsActive || id < 0)
return B_BAD_PORT_ID;
slot = id % MAX_PORTS;
slot = id % gMaxPorts;
state = disable_interrupts();
GRAB_PORT_LOCK(sPorts[slot]);
@ -639,7 +640,7 @@ _get_next_port_info(team_id team, int32 *_cookie, struct port_info *info, size_t
return B_BAD_PORT_ID;
slot = *_cookie;
if (slot >= MAX_PORTS)
if (slot >= gMaxPorts)
return B_BAD_PORT_ID;
if (team == B_CURRENT_TEAM)
@ -651,7 +652,7 @@ _get_next_port_info(team_id team, int32 *_cookie, struct port_info *info, size_t
state = disable_interrupts();
GRAB_PORT_LIST_LOCK();
while (slot < MAX_PORTS) {
while (slot < gMaxPorts) {
GRAB_PORT_LOCK(sPorts[slot]);
if (sPorts[slot].id != -1 && sPorts[slot].owner == team) {
// found one!
@ -695,7 +696,7 @@ port_buffer_size_etc(port_id id, uint32 flags, bigtime_t timeout)
if (!sPortsActive || id < 0)
return B_BAD_PORT_ID;
slot = id % MAX_PORTS;
slot = id % gMaxPorts;
state = disable_interrupts();
GRAB_PORT_LOCK(sPorts[slot]);
@ -761,7 +762,7 @@ port_count(port_id id)
if (!sPortsActive || id < 0)
return B_BAD_PORT_ID;
slot = id % MAX_PORTS;
slot = id % gMaxPorts;
state = disable_interrupts();
GRAB_PORT_LOCK(sPorts[slot]);
@ -814,7 +815,7 @@ read_port_etc(port_id id, int32 *_msgCode, void *msgBuffer, size_t bufferSize,
return B_BAD_VALUE;
flags = flags & (B_CAN_INTERRUPT | B_TIMEOUT);
slot = id % MAX_PORTS;
slot = id % gMaxPorts;
state = disable_interrupts();
GRAB_PORT_LOCK(sPorts[slot]);
@ -922,7 +923,7 @@ write_port_etc(port_id id, int32 msgCode, const void *msgBuffer,
// mask irrelevant flags (for acquire_sem() usage)
flags = flags & (B_CAN_INTERRUPT | B_TIMEOUT);
slot = id % MAX_PORTS;
slot = id % gMaxPorts;
if (bufferSize > PORT_MAX_MESSAGE_SIZE)
return EINVAL;
@ -1020,7 +1021,7 @@ set_port_owner(port_id id, team_id team)
if (!sPortsActive || id < 0)
return B_BAD_PORT_ID;
slot = id % MAX_PORTS;
slot = id % gMaxPorts;
state = disable_interrupts();
GRAB_PORT_LOCK(sPorts[slot]);